diff --git a/.bettercodehub.yml b/.bettercodehub.yml
index d7be51695..349f7675a 100644
--- a/.bettercodehub.yml
+++ b/.bettercodehub.yml
@@ -1,3 +1,3 @@
-component_depth: 10
+component_depth: 8
 languages:
 - kotlin
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cb2f41195..d66c3361f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,16 +4,7 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <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" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/.travis.yml b/.travis.yml
index 688dd0006..514e37c0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.20.2
+    - 0.17.4
 
 android:
  licenses:
@@ -48,15 +48,20 @@ before_script:
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  - ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew -Pcoverage testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
   - ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
   - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
+  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
+      git fetch --unshallow;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+    fi
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
+      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
     fi
 
 after_success:
diff --git a/README.en.md b/README.en.md
index 28cce1c34..7444cccae 100644
--- a/README.en.md
+++ b/README.en.md
@@ -47,6 +47,7 @@ You can also download a [development version](https://wulkanowy.github.io/#downl
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
 * [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
diff --git a/README.md b/README.md
index 02e1900c8..61b13444a 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 ## Zbudowana za pomocą
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/SDK)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
 * [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
diff --git a/app/build.gradle b/app/build.gradle
index b046834a6..45d20f96d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
@@ -18,18 +18,18 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 66
-        versionName "0.20.2"
+        versionCode 57
+        versionName "0.17.4"
         multiDexEnabled true
-        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase")
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
+                crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments += [
+                arguments = [
                         "room.schemaLocation": "$projectDir/schemas".toString(),
                         "room.incremental"   : "true"
                 ]
@@ -52,17 +52,18 @@ android {
 
     buildTypes {
         release {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
             testCoverageEnabled = project.hasProperty('coverage')
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
+            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
         }
     }
 
@@ -74,27 +75,22 @@ android {
         }
 
         fdroid {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
             dimension "platform"
         }
     }
 
-    buildFeatures {
-        viewBinding = true
-    }
-
     lintOptions {
         disable 'HardwareIds'
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
         jvmTarget = "1.8"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
@@ -107,6 +103,10 @@ android {
     }
 }
 
+androidExtensions {
+    experimental = true
+}
+
 play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
@@ -115,10 +115,12 @@ play {
 }
 
 ext {
-    work_manager = "2.4.0"
+    work_manager = "2.3.4"
     room = "2.2.5"
+    dagger = "2.27"
+    // don't update https://github.com/ChuckerTeam/chucker/issues/242
     chucker = "3.2.0"
-    mockk = "1.10.0"
+    mockk = "1.9.2"
 }
 
 configurations.all {
@@ -126,65 +128,69 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.20.2"
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    implementation "io.github.wulkanowy:sdk:0.17.4"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
-
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.2.0"
     implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.appcompat:appcompat-resources:1.2.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation "androidx.appcompat:appcompat:1.2.0-beta01"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.annotation:annotation:1.1.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.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.1"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.2.0"
-    implementation "com.github.wulkanowy:material-chips-input:2.1.1"
+    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
 
     implementation "androidx.room:room-runtime:$room"
+    implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
     kapt "androidx.room:room-compiler:$room"
 
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    implementation 'androidx.hilt:hilt-work:1.0.0-alpha02'
-    kapt 'androidx.hilt:hilt-compiler:1.0.0-alpha02'
+    implementation "com.google.dagger:dagger-android-support:$dagger"
+    kapt "com.google.dagger:dagger-compiler:$dagger"
+    kapt "com.google.dagger:dagger-android-processor:$dagger"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
+    implementation "eu.davidea:flexible-adapter:5.1.0"
+    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.2.2"
+    implementation "com.github.YarikSOffice:lingver:1.2.1"
+
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
 
     implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.3"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation "fr.bipi.treessence:treessence:0.3.2"
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation "io.coil-kt:coil:1.0.0-rc1"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
+    implementation "io.coil-kt:coil:0.9.5"
 
-    playImplementation 'com.google.firebase:firebase-analytics:17.5.0'
-    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.1.1'
-    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.1.1"
-    playImplementation 'com.google.firebase:firebase-messaging:20.2.4'
-    playImplementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    playImplementation 'com.google.firebase:firebase-analytics:17.3.0'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.5'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.5"
+    playImplementation "com.google.firebase:firebase-messaging:20.1.0"
+    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
     playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
@@ -194,14 +200,16 @@ dependencies {
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9'
+    testImplementation "org.threeten:threetenbp:1.4.3"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
 
-    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.2.0"
+    androidTestImplementation "androidx.test:runner:1.2.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    androidTestImplementation "org.mockito:mockito-android:3.3.3"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7c7962575..1a8b8c329 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,6 +30,13 @@
 -dontwarn javax.annotation.**
 
 
+#Config for ReactiveNetwork
+-dontwarn com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+-dontwarn io.reactivex.functions.Function
+-dontwarn rx.internal.util.**
+-dontwarn sun.misc.Unsafe
+
+
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
index 474824df6..e99a11d4a 100644
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
@@ -1741,4 +1741,4 @@
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd101f5a26a024f62e6fee161e421b882')"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
deleted file mode 100644
index 21005f9c6..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
+++ /dev/null
@@ -1,1768 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 26,
-    "identityHash": "43f8777ffe95a5a2850ee981db3dbe2e",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT 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, `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": "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": "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, `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": "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": "GradesStatistics",
-        "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, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` 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": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "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": "Messages",
-        "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, `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, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` 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": "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": "content",
-            "columnName": "content",
-            "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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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, `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": "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": "realId",
-            "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": "studentId",
-            "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": []
-      }
-    ],
-    "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, '43f8777ffe95a5a2850ee981db3dbe2e')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
deleted file mode 100644
index 46b777513..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
+++ /dev/null
@@ -1,1774 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 27,
-    "identityHash": "b24d2d9662e26dd31f2eea78a297558c",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT 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": "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, `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": "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": "GradesStatistics",
-        "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, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` 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": "grade",
-            "columnName": "grade",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "amount",
-            "columnName": "amount",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "semester",
-            "columnName": "is_semester",
-            "affinity": "INTEGER",
-            "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": "Messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` 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, `unread_by` INTEGER NOT NULL, `read_by` 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": "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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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, `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": "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": "realId",
-            "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": "studentId",
-            "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": []
-      }
-    ],
-    "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, 'b24d2d9662e26dd31f2eea78a297558c')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt b/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt
deleted file mode 100644
index 8c4354d9a..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data
-
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-class TestDispatchersProvider : DispatchersProvider() {
-
-    override val backgroundThread: CoroutineDispatcher
-        get() = Dispatchers.Unconfined
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
index b312048d5..0bbcc4271 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -4,7 +4,6 @@ import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
@@ -30,7 +29,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(2, students.size)
 
@@ -59,7 +58,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(1, students.size)
 
@@ -85,7 +84,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(3, students.size)
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index 15e99f5f9..6f9406f6d 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -5,11 +5,10 @@ import android.database.sqlite.SQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import io.github.wulkanowy.data.db.Converters
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -27,7 +26,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(3, students.size)
 
@@ -61,7 +60,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(2, students.size)
 
@@ -121,23 +120,23 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, first.diaryId)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
-            assertTrue { semesters.single { it.second }.second }
-            assertEquals(1970, semesters[0].first.schoolYear)
-            assertEquals(of(1970, 1, 1), semesters[0].first.end)
-            assertEquals(of(1970, 1, 1), semesters[0].first.start)
-            assertFalse(semesters[0].second)
-            assertFalse(semesters[1].second)
-            assertFalse(semesters[2].second)
-            assertTrue(semesters[3].second)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertEquals(1970, it[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].first.end)
+            assertEquals(of(1970, 1, 1), it[0].first.start)
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
-            assertTrue { semesters.single { it.second }.second }
-            assertFalse(semesters[0].second)
-            assertFalse(semesters[1].second)
-            assertFalse(semesters[2].second)
-            assertTrue(semesters[3].second)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
     }
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
deleted file mode 100644
index 759552589..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import kotlin.random.Random
-
-class Migration27Test : AbstractMigrationTest() {
-
-    @Test
-    fun userWithoutCorrespondingUnit() {
-        with(helper.createDatabase(dbName, 26)) {
-            createStudent(this, 321, 123, "Jan Student")
-            createUnit(this, 9999, "Unit Jan")
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(1, students.size)
-
-        with(students[0]) {
-            assertEquals(321, id)
-            assertEquals(123, userLoginId)
-            assertEquals("Student Jan", userName)
-        }
-    }
-
-    @Test
-    fun userWithCorrespondingUnit() {
-        with(helper.createDatabase(dbName, 26)) {
-            createStudent(this, 1, 2, "Jan Kowalski Student")
-            createUnit(this, 2, "Unit Jan")
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(1, students.size)
-
-        with(students[0]) {
-            assertEquals(1, id)
-            assertEquals(2, userLoginId)
-            assertEquals("Unit Jan", userName)
-        }
-    }
-
-    @Test
-    fun studentAccountAndParentAccountWithCorrespondingUnits() {
-        with(helper.createDatabase(dbName, 26)) {
-            createStudent(this, 1, 222, "Jan Student")
-            createStudent(this, 2, 333, "Jan Parent")
-            createUnit(this, 222, "Unit Jan")
-            createUnit(this, 333, "Unit Tomasz")
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(2, students.size)
-
-        with(students[0]) {
-            assertEquals(1, id)
-            assertEquals(222, userLoginId)
-            assertEquals("Unit Jan", userName)
-        }
-        with(students[1]) {
-            assertEquals(2, id)
-            assertEquals(333, userLoginId)
-            assertEquals("Unit Tomasz", userName)
-        }
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, id: Long, userLoginId: Int, studentName: String) {
-        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("id", id)
-            put("scrapper_base_url", "https://fakelog.cf")
-            put("mobile_base_url", "")
-            put("login_mode", "SCRAPPER")
-            put("login_type", "STANDARD")
-            put("certificate_key", "")
-            put("private_key", "")
-            put("is_parent", false)
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("school_short", "")
-            put("class_name", "")
-            put("student_id", Random.nextInt())
-            put("class_id", Random.nextInt())
-            put("school_id", "123")
-            put("school_name", "Wulkan first class school")
-            put("is_current", false)
-            put("registration_date", "0")
-
-            put("user_login_id", userLoginId)
-            put("student_name", studentName)
-        })
-    }
-
-    private fun createUnit(db: SupportSQLiteDatabase, senderId: Int, senderName: String) {
-        db.insert("ReportingUnits", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", Random.nextInt())
-            put("real_id", Random.nextInt())
-            put("short", "SHORT")
-            put("roles", "[0]")
-
-            put("sender_id", senderId)
-            put("sender_name", senderName)
-        })
-    }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
index 04d13be4b..bbbfd83dd 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
@@ -1,9 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import java.time.LocalDate.now
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDateTime
 
 fun getStudent(): Student {
     return Student(
@@ -13,7 +11,6 @@ fun getStudent(): Student {
         scrapperBaseUrl = "fakelog.cf",
         loginType = "AUTO",
         isCurrent = true,
-        userName = "",
         studentName = "",
         schoolShortName = "",
         schoolName = "",
@@ -30,16 +27,3 @@ fun getStudent(): Student {
         isParent = false
     )
 }
-
-fun getSemester() = Semester(
-    semesterId = 1,
-    studentId = 1,
-    classId = 1,
-    diaryId = 2,
-    diaryName = "",
-    end = now(),
-    schoolYear = 2019,
-    semesterName = 1,
-    start = now(),
-    unitId = 1
-)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
new file mode 100644
index 000000000..7dc93c4a4
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class TestInternetObservingStrategy : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(true)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(true)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index fa1289869..c7ede6ae5 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -6,15 +6,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -37,47 +34,20 @@ class AttendanceLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
-            getAttendanceEntity(
-                of(2018, 9, 10),
-                SentExcuseStatus.ACCEPTED
-            ),
-            getAttendanceEntity(
-                of(2018, 9, 14),
-                SentExcuseStatus.WAITING
-            ),
-            getAttendanceEntity(
-                of(2018, 9, 17),
-                SentExcuseStatus.ACCEPTED
-            )
-        )
-        runBlocking { attendanceLocal.saveAttendance(list) }
+        attendanceLocal.saveAttendance(listOf(
+            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
+        ))
 
-        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
-        val attendance = runBlocking { attendanceLocal.getAttendance(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
+        val attendance = attendanceLocal
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, attendance.size)
         assertEquals(attendance[0].date, of(2018, 9, 10))
         assertEquals(attendance[1].date, of(2018, 9, 14))
     }
-
-    private fun getAttendanceEntity(
-        date: LocalDate,
-        excuseStatus: SentExcuseStatus
-    ) = Attendance(
-        studentId = 1,
-        diaryId = 2,
-        timeId = 3,
-        date = date,
-        number = 0,
-        subject = "",
-        name = "",
-        presence = false,
-        absence = false,
-        exemption = false,
-        lateness = false,
-        excused = false,
-        deleted = false,
-        excusable = false,
-        excuseStatus = excuseStatus.name
-    )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
index ca7d0b1be..50badc468 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -6,15 +6,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -26,8 +24,7 @@ class CompletedLessonsLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room
-            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
     }
@@ -39,15 +36,18 @@ class CompletedLessonsLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        completedLessonsLocal.saveCompletedLessons(listOf(
             getCompletedLesson(of(2018, 9, 10), 1),
             getCompletedLesson(of(2018, 9, 14), 2),
             getCompletedLesson(of(2018, 9, 17), 3)
-        )
-        runBlocking { completedLessonsLocal.saveCompletedLessons(list) }
+        ))
 
-        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
-        val completed = runBlocking { completedLessonsLocal.getCompletedLessons(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
+        val completed = completedLessonsLocal
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, completed.size)
         assertEquals(completed[0].date, of(2018, 9, 10))
         assertEquals(completed[1].date, of(2018, 9, 14))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index 14b29c9f6..98dfc88eb 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -6,14 +6,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate.now
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,15 +34,18 @@ class ExamLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        examLocal.saveExams(listOf(
             Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
             Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
             Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
-        )
-        runBlocking { examLocal.saveExams(list) }
+        ))
 
-        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
-        val exams = runBlocking { examLocal.getExams(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
+        val exams = examLocal
+            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, of(2018, 9, 10))
         assertEquals(exams[1].date, of(2018, 9, 14))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
index 946ebf8ea..7233c306a 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -5,14 +5,12 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -24,10 +22,9 @@ class GradeLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room
-            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeLocal = GradeLocal(testDb.gradeDao)
     }
 
     @After
@@ -37,16 +34,17 @@ class GradeLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
             createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
         val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
 
-        val grades = runBlocking { gradeLocal.getGradesDetails(semester).first() }
+        val grades = gradeLocal
+            .getGrades(semester)
+            .blockingGet()
 
         assertEquals(2, grades.size)
         assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
index 5cf9c2196..f3c6b7a17 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -5,25 +5,22 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import io.github.wulkanowy.data.Status
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate.of
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -33,11 +30,18 @@ import kotlin.test.assertTrue
 class GradeRepositoryTest {
 
     @MockK
-    private lateinit var semesterMock: Semester
+    private lateinit var mockSdk: Sdk
 
-    private lateinit var studentMock: Student
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
 
     @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var studentMock: Student
+
     private lateinit var gradeRemote: GradeRemote
 
     private lateinit var gradeLocal: GradeLocal
@@ -48,13 +52,15 @@ class GradeRepositoryTest {
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
-        studentMock = getStudentMock()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeRemote = GradeRemote(mockSdk)
 
+        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -64,18 +70,15 @@ class GradeRepositoryTest {
 
     @Test
     fun markOlderThanRegisterDateAsRead() {
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
-            createGradeLocal(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
-            createGradeLocal(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
-            createGradeLocal(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
-        ) to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
+            createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
+            createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
+            createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
+        ))
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -85,25 +88,21 @@ class GradeRepositoryTest {
 
     @Test
     fun mitigateOldGradesNotifications() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
             createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
             createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
-            createGradeLocal(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
-            createGradeLocal(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
-            createGradeLocal(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
-        ) to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
+            createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
+            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
+            createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
+        ))
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -113,109 +112,70 @@ class GradeRepositoryTest {
 
     @Test
     fun subtractLocaleDuplicateGrades() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(2, grades.first.size)
+        assertEquals(2, grades.size)
     }
 
     @Test
     fun subtractRemoteDuplicateGrades() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.first.size)
+        assertEquals(3, grades.size)
     }
 
     @Test
     fun emptyLocal() {
-        runBlocking { gradeLocal.saveGrades(listOf()) }
+        gradeLocal.saveGrades(listOf())
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ) to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.first.size)
+        assertEquals(3, grades.size)
     }
 
     @Test
     fun emptyRemote() {
-        val list = listOf(
+        gradeLocal.saveGrades(listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        runBlocking { gradeLocal.saveGrades(list) }
+        ))
 
-        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (emptyList<Grade>() to emptyList())
+        every { mockSdk.getGrades(1) } returns Single.just(listOf())
 
-        val grades = runBlocking {
-            GradeRepository(gradeLocal, gradeRemote)
-                .getGrades(studentMock, semesterMock, true)
-                .filter { it.status == Status.SUCCESS }.first().data!!
-        }
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(0, grades.first.size)
+        assertEquals(0, grades.size)
     }
-
-    private fun getStudentMock() = Student(
-        scrapperBaseUrl = "http://fakelog.cf",
-        email = "jan@fakelog.cf",
-        certificateKey = "",
-        classId = 0,
-        className = "",
-        isCurrent = false,
-        isParent = false,
-        loginMode = Sdk.Mode.SCRAPPER.name,
-        loginType = "STANDARD",
-        mobileBaseUrl = "",
-        password = "",
-        privateKey = "",
-        registrationDate = LocalDateTime.of(2019, 2, 27, 12, 0),
-        schoolName = "",
-        schoolShortName = "test",
-        schoolSymbol = "",
-        studentId = 0,
-        studentName = "",
-        symbol = "",
-        userLoginId = 0,
-        userName = ""
-    )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
index 629c24321..9146934bf 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
 import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
index 197d2d0ec..bd3635fea 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -7,13 +7,11 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -37,44 +35,40 @@ class GradeStatisticsLocalTest {
 
     @Test
     fun saveAndRead_subject() {
-        val list = listOf(
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
             getGradeStatistics("Matematyka", 2, 1),
             getGradeStatistics("Fizyka", 1, 2)
-        )
-        runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
+        ))
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
 
     @Test
     fun saveAndRead_all() {
-        val list = listOf(
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
             getGradeStatistics("Matematyka", 2, 1),
             getGradeStatistics("Chemia", 2, 1),
             getGradeStatistics("Fizyka", 1, 2)
-        )
-        runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
+        ))
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
-        assertEquals(2, stats.size)
-//        assertEquals(3, stats.size)
-//        assertEquals(stats[0].subject, "Wszystkie") // now in main repo
-        assertEquals(stats[0].subject, "Matematyka")
-        assertEquals(stats[1].subject, "Chemia")
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
+        assertEquals(3, stats.size)
+        assertEquals(stats[0].subject, "Wszystkie")
+        assertEquals(stats[1].subject, "Matematyka")
+        assertEquals(stats[2].subject, "Chemia")
     }
 
     @Test
     fun saveAndRead_points() {
-        val list = listOf(
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
             getGradePointsStatistics("Matematyka", 2, 1),
             getGradePointsStatistics("Chemia", 2, 1),
             getGradePointsStatistics("Fizyka", 1, 2)
-        )
-        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(list) }
+        ))
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
         with(stats[0]) {
             assertEquals(subject, "Matematyka")
             assertEquals(others, 5.0)
@@ -84,18 +78,18 @@ class GradeStatisticsLocalTest {
 
     @Test
     fun saveAndRead_subjectEmpty() {
-        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
-        assertEquals(emptyList(), stats)
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        assertEquals(null, stats)
     }
 
     @Test
     fun saveAndRead_allEmpty() {
-        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
 
-        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
-        assertEquals(emptyList(), stats)
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        assertEquals(null, stats)
     }
 
     private fun getSemester(): Semester {
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
index ca38b1fee..65ef1fcbf 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -5,15 +5,14 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 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 kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -25,8 +24,7 @@ class LuckyNumberLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room
-            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
     }
@@ -38,14 +36,14 @@ class LuckyNumberLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val number = LuckyNumber(1, LocalDate.of(2019, 1, 20), 14)
-        runBlocking { luckyNumberLocal.saveLuckyNumber(number) }
+        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
 
-        val student = Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", "", 1, false, now())
-        val luckyNumber = runBlocking { luckyNumberLocal.getLuckyNumber(student, LocalDate.of(2019, 1, 20)).first() }
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
 
-        assertEquals(1, luckyNumber?.studentId)
-        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber?.date)
-        assertEquals(14, luckyNumber?.luckyNumber)
+        assertEquals(1, luckyNumber.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
+        assertEquals(14, luckyNumber.luckyNumber)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
index 6bd1959bd..22578e41e 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -7,12 +7,11 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDateTime
+import org.threeten.bp.LocalDateTime
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,21 +35,17 @@ class RecipientLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        recipientLocal.saveRecipients(listOf(
             Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
             Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
             Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
-        )
-        runBlocking { recipientLocal.saveRecipients(list) }
+        ))
 
-        val student = Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
-        val recipients = runBlocking {
-            recipientLocal.getRecipients(
-                student = student,
-                role = 2,
-                unit = ReportingUnit(1, 4, "", 0, "", emptyList())
-            )
-        }
+        val recipients = recipientLocal.getRecipients(
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
+            2,
+            ReportingUnit(1, 4, "", 0, "", emptyList())
+        ).blockingGet()
 
         assertEquals(2, recipients.size)
         assertEquals(1, recipients[0].studentId)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index d68f15a80..530bfb3f7 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -4,10 +4,8 @@ import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.TestDispatchersProvider
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.repositories.getStudent
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -28,7 +26,7 @@ class StudentLocalTest {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        studentLocal = StudentLocal(testDb.studentDao, TestDispatchersProvider(), context)
+        studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
     @After
@@ -38,9 +36,9 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        runBlocking { studentLocal.saveStudents(listOf(student)) }
+        studentLocal.saveStudents(listOf(student)).blockingGet()
 
-        val student = runBlocking { studentLocal.getCurrentStudent(true) }
-        assertEquals("23", student?.schoolSymbol)
+        val student = studentLocal.getCurrentStudent(true).blockingGet()
+        assertEquals("23", student.schoolSymbol)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index dddf6464c..aa35fe790 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
 import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index e793212e6..a66e5843c 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -5,14 +5,12 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,21 +34,17 @@ class TimetableLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        val list = listOf(
+        timetableDb.saveTimetable(listOf(
             createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
             createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
             createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
-        )
-        runBlocking { timetableDb.saveTimetable(list) }
+        ))
 
-        val semester = Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1)
-        val exams = runBlocking {
-            timetableDb.getTimetable(
-                semester = semester,
-                startDate = LocalDate.of(2018, 9, 10),
-                endDate = LocalDate.of(2018, 9, 14)
-            ).first()
-        }
+        val exams = timetableDb.getTimetable(
+            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 14)
+        ).blockingGet()
 
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 1bd3c4679..fdf193a26 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -5,48 +5,58 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import io.github.wulkanowy.data.Status
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.getSemester
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.data.repositories.getStudent
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @SdkSuppress(minSdkVersion = P)
 @RunWith(AndroidJUnit4::class)
 class TimetableRepositoryTest {
 
-    @MockK(relaxed = true)
-    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
+    @MockK
+    private lateinit var mockSdk: Sdk
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    private val student = getStudent()
 
     @MockK
+    private lateinit var semesterMock: Semester
+
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
 
     private lateinit var testDb: AppDatabase
 
-    private val student = getStudent()
-
-    private val semester = getSemester()
-
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         timetableLocal = TimetableLocal(testDb.timetableDao)
+        timetableRemote = TimetableRemote(mockSdk)
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 2
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -56,31 +66,23 @@ class TimetableRepositoryTest {
 
     @Test
     fun copyRoomToCompletedFromPrevious() {
-        runBlocking {
-            timetableLocal.saveTimetable(listOf(
-                createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
-                createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
-                createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
-                createTimetableLocal(of(2019, 3, 5, 10, 30), 3, "213", "W-F", "Jan Kowalski")
-            ))
-        }
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
+            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
+            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
+            createTimetableLocal(of(2019, 3, 5, 10, 30),3, "213", "W-F", "Jan Kowalski")
+        ))
 
-        coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
-            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
-            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
-            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
-            createTimetableLocal(of(2019, 3, 5, 10, 30), 4, "", "W-F")
-        )
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
+            createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
+            createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
+            createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
+        ))
 
-        val lessons = runBlocking {
-            TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
-                student = student,
-                semester = semester,
-                start = LocalDate.of(2019, 3, 5),
-                end = LocalDate.of(2019, 3, 5),
-                forceRefresh = true
-            ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
-        }
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
 
         assertEquals(4, lessons.size)
         assertEquals("123", lessons[0].room)
@@ -90,7 +92,7 @@ class TimetableRepositoryTest {
 
     @Test
     fun copyTeacherToCompletedFromPrevious() {
-        val list = listOf(
+        timetableLocal.saveTimetable(listOf(
             createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
             createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
             createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
@@ -105,35 +107,28 @@ class TimetableRepositoryTest {
             createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
             createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
             createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
-        )
-        runBlocking { timetableLocal.saveTimetable(list) }
+        ))
 
-        coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
-            createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
-            createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
-            createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
-            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
+            createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
+            createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
 
-            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
-            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
-            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
-            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
 
-            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
-            createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
-            createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
-            createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
-        )
+            createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
+            createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
+        ))
 
-        val lessons = runBlocking {
-            TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
-                student = student,
-                semester = semester,
-                start = LocalDate.of(2019, 12, 23),
-                end = LocalDate.of(2019, 12, 25),
-                forceRefresh = true
-            ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
-        }
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+            .blockingGet()
 
         assertEquals(12, lessons.size)
 
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 000000000..c90641ddb
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Wulkanowy DEV</string>
+</resources>
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index d03a319a2..60dc6b56a 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -2,8 +2,11 @@
 
 package io.github.wulkanowy.utils
 
+import android.content.Context
 import timber.log.Timber
 
+fun initCrashlytics(context: Context, appInfo: AppInfo) {}
+
 open class TimberTreeNoOp : Timber.Tree() {
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
 }
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index f23645bc3..0b1274f15 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -1,18 +1,13 @@
 package io.github.wulkanowy.utils
 
-import android.app.Activity
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-@Suppress("UNUSED_PARAMETER")
 class FirebaseAnalyticsHelper @Inject constructor() {
 
+    @Suppress("UNUSED_PARAMETER")
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         // do nothing
     }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        // do nothing
-    }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ec2f7816..42c754756 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,8 +39,7 @@
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
@@ -92,8 +91,6 @@
                 android:resource="@xml/provider_widget_lucky_number" />
         </receiver>
 
-        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
-
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
@@ -110,33 +107,12 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
-        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
-        <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:enabled="${firebase_enabled}"
-            android:exported="false" />
-
         <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="${firebase_enabled}" />
-
+            android:name="io.fabric.ApiKey"
+            android:value="${fabric_api_key}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="firebase_messaging_auto_init_enabled"
-            android:value="${firebase_enabled}" />
-
-        <meta-data
-            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
-            android:value="${firebase_enabled}" />
+            android:value="${crashlytics_enabled}" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
diff --git a/app/src/main/assets/message-print-page.html b/app/src/main/assets/message-print-page.html
deleted file mode 100644
index 8da7dec6e..000000000
--- a/app/src/main/assets/message-print-page.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html>
-<html lang="pl">
-<head>
-    <meta charset="UTF-8">
-    <title>%SUBJECT% | Wulkanowy</title>
-    <style>
-        @page {
-            margin: 2.5cm;
-            size: A4;
-        }
-
-        body {
-            margin: 0;
-            font-family: sans-serif;
-        }
-
-        .title {
-            line-height: 1.5;
-            letter-spacing: 1pt;
-            font-size: 24pt;
-            font-weight: 200;
-            margin: 0 0 0.5cm;
-        }
-
-        .info {
-            margin: 0.5cm 0;
-        }
-
-        .info div {
-            font-size: 14pt;
-            font-weight: 400;
-            margin: 0.5cm 0;
-        }
-
-        h4 {
-            font-weight: 200;
-            text-transform: uppercase;
-            letter-spacing: 1pt;
-            font-size: 10pt;
-            margin: 0;
-            margin-bottom: 0.25cm;
-            font-family: sans-serif;
-        }
-
-        .content {
-            margin-top: 0.5cm;
-            font-size: 14pt;
-            font-weight: 400;
-            text-align: justify;
-            font-family: serif;
-            line-height: 1.5;
-        }
-
-        .content p {
-            page-break-after: auto;
-            page-break-inside: auto;
-            margin-bottom: 0.6cm;
-        }
-
-        .footer {
-            font-size: 11pt;
-            font-weight: 200;
-            display: flex;
-            align-items: center;
-            color: rgba(0, 0, 0, 0.5)
-            margin: 0;
-            margin-bottom: 0.5cm;
-        }
-        
-        .footer .logo {
-            height: 0.5cm;
-            width: 0.5cm;
-            display: block;
-            margin-right: 0.2cm;
-        }
-    </style>
-</head>
-<body>
-<h1 class="title">%SUBJECT%</h1>
-<hr>
-<div class="info">
-    %INFO%
-</div>
-<div class="footer">
-    <img src="wulkanowy-logo-black.svg" class="logo">
-    Wulkanowy Dzienniczek
-</div>
-<hr>
-<div class="content">
-    <h4>Treść wiadomości</h4>
-    %CONTENT%
-</div>
-</body>
-</html>
diff --git a/app/src/main/assets/wulkanowy-logo-black.svg b/app/src/main/assets/wulkanowy-logo-black.svg
deleted file mode 100644
index 9bfbe2c02..000000000
--- a/app/src/main/assets/wulkanowy-logo-black.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 1024 1024"
-   xml:space="preserve"
-   width="1024"
-   height="1024"><metadata
-     id="metadata15"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs13" /><style
-     type="text/css"
-     id="style2">
-	.st0{fill:#D32F2F;}
-	.st1{fill:#AD2A2A;}
-	.st2{fill:#FFFFFF;}
-</style><g
-     id="layer4"
-     style="display:none;fill:#808080"><rect
-       id="XMLID_57_"
-       x="0"
-       y="0"
-       class="st0"
-       width="3584"
-       height="1024"
-       style="display:inline;fill:#808080;stroke-width:1.02195609" /></g><g
-     id="layer3"
-     style="display:none;fill:#808080"><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 3046.8164,390.66602 3134.3164,542 v 91.33398 L 3524.9824,1024 H 3584 V 732.18359 L 3242.4824,390.66602 h -23.666 l -53.0352,94.63086 -94.6308,-94.63086 z"
-       id="path18992" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 2746.9824,390.66602 62,242.66796 L 3199.6484,1024 H 3584 V 940.68359 L 3033.9824,390.66602 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
-       id="path18990" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 2620.8164,387.33398 c -18.6667,0 -35.1667,4.60982 -49.5,13.83204 -14.3333,9.11111 -25.4451,22.22287 -33.334,39.33398 -7.7778,17 -11.666,36.5549 -11.666,58.66602 v 25 c 0,34.44444 8.7216,61.83463 26.166,82.16796 L 2970.1484,1024 h 323.168 l -623.166,-623.16602 c -14.2222,-9 -30.6673,-13.5 -49.334,-13.5 z"
-       id="path18988" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 2293.4824,390.66602 V 633.33398 L 2684.1484,1024 h 423.336 l -633.334,-633.33398 h -20.334 v 139.66601 l -139.666,-139.66601 z"
-       id="path18984" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 1864.8164,390.66602 V 633.33398 L 2255.4824,1024 h 413.334 l -633.334,-633.33398 h -25.832 l -60.584,63.75 -63.75,-63.75 z"
-       id="path18978" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 1684.8164,390.66602 V 633.33398 L 2075.4824,1024 h 263.334 l -633.334,-633.33398 z"
-       id="path18976" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 1133.6504,390.66602 62,242.66796 L 1586.3164,1024 h 467.668 l -633.334,-633.33398 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
-       id="path19059" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="m 1456.4824,390.66602 v 167.16796 c 0.5556,24.66667 8.5007,44 23.834,58 L 1888.4824,1024 h 372.168 l -633.334,-633.33398 h -20.666 V 520.5 l -129.834,-129.83398 z"
-       id="path18966" /><path
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
-       d="M 2146.3164,390.66602 2054.4824,633.33398 2445.1484,1024 h 354.002 l -633.334,-633.33398 z"
-       id="path18982" /><path
-       style="display:inline;fill:#808080;stroke-width:0.78179646"
-       d="M 637.15234,214.95703 487.75,364.35742 466.01562,386.0918 c 0.31273,0.31271 0.54872,0.54666 0.70508,0.85937 0.0782,0.23454 0.23432,0.54671 0.3125,0.78125 0.31272,0.54726 0.47071,1.17339 0.47071,1.79883 0.0782,0.54726 -0.0799,1.01725 -0.31446,1.48633 -0.23454,0.54725 -0.70285,1.40597 -1.09375,1.79687 l 150.8086,149.71485 -23.68946,23.6875 -12.74414,-12.74219 -13.44726,-13.44727 -78.80469,-78.80664 -11.17969,-11.17968 -7.5039,-7.50391 -35.41602,-35.17969 -3.08984,-0.98047 -4.33594,4.26367 v 0.46876 c 0,7.34888 0.38998,15.00865 -1.48633,22.20117 -0.85998,3.28355 -2.34444,6.25595 -4.14258,8.91406 -0.15636,0.15636 -0.23627,0.23426 -0.31445,0.39062 -1.87631,2.57993 -4.06471,4.84619 -6.48828,6.95704 -5.3944,4.53442 -11.25752,8.67896 -17.27734,12.50976 -0.15637,0.0782 -0.23427,0.1562 -0.39063,0.23438 -2.11085,1.40723 -4.3012,2.7354 -6.49023,4.06445 -8.91248,5.39439 -18.37192,10.08772 -28.37891,13.13672 -1.25087,0.31272 -2.42317,-0.001 -3.36133,-0.70508 l -6.01953,5.94141 c 1.25087,0.62543 2.03136,1.87776 1.875,3.51953 -10e-6,0.15636 -0.0762,0.23231 -0.0762,0.38867 0,0.0782 -0.0781,0.23628 -0.0781,0.31445 -1.32905,4.45624 -2.34505,8.98897 -3.2832,13.60156 -0.15636,0.70363 -0.23622,1.33154 -0.39258,2.03516 -0.85997,4.37806 -1.64209,8.83288 -2.3457,13.21094 0.23453,5.3944 0.39263,11.0234 0.31445,16.65234 v 0.39258 c -0.0782,7.66161 -0.78373,15.32114 -2.8164,22.51367 -2.26721,8.28704 -6.64376,15.63728 -10.55274,23.22071 -0.0782,0.15636 -0.15815,0.23426 -0.23633,0.39062 -1.25088,2.42357 -2.49924,4.92399 -3.59375,7.50391 -4.84714,11.33605 -7.42749,23.92328 -10.55468,35.88476 -0.23454,0.70362 -0.39046,1.48578 -0.625,2.26758 0,0.15636 -0.0801,0.23427 -0.0801,0.39063 -2.97082,11.10151 -6.09819,22.28173 -10.94532,32.75781 -1.40724,2.97082 -2.81531,5.86322 -4.3789,8.75586 -0.15636,0.23454 -0.23231,0.46858 -0.38867,0.70312 -0.62544,1.09451 -1.25152,2.26871 -1.87696,3.44141 -0.0782,0.15636 -0.15619,0.23426 -0.23437,0.39062 -3.51809,6.25438 -7.27098,12.43118 -10.78906,18.68555 -5.0035,8.8343 -8.99075,18.13635 -13.83789,27.04883 -0.0782,0.15636 -0.1562,0.23426 -0.23438,0.39062 -0.70362,1.32905 -1.48579,2.65728 -2.26758,3.98633 -5.0035,8.20887 -10.63256,16.0279 -16.57422,23.61133 -0.15635,0.15636 -0.23426,0.3124 -0.39062,0.46875 -0.7818,1.01634 -1.48578,1.95443 -2.26758,2.89258 -3.90898,4.92532 -7.97378,9.85009 -11.96094,14.77539 -0.0782,0.15637 -0.23432,0.23622 -0.3125,0.39258 -8.75612,10.71061 -17.35628,21.49761 -24.54883,33.30273 0,0.70362 -0.15602,1.33159 -0.46874,1.95703 -1.25087,2.42357 -2.65734,4.68971 -3.90821,7.11328 -0.0782,0.15636 0.62511,1.24989 0.46875,1.40625 L 429.86133,1024 H 1463.0215 L 661.85547,222.92969 c -0.93816,2.11087 -5.23681,1.40935 -7.34766,-0.23242 -1.71995,-1.32906 -3.12603,-3.05147 -4.45508,-4.84961 -0.62544,-0.31271 -1.25168,-0.62288 -1.64257,-0.85743 -2.89265,-1.40723 -6.09933,-1.48632 -9.30469,-1.48632 -0.7818,-0.0782 -1.40588,-0.23416 -1.95313,-0.54688 z m -206.12304,191.41992 0.11914,-0.11523 -0.23438,0.0781 z"
-       id="XMLID_64_" /></g><g
-     id="layer2"
-     style="display:inline;fill:#000000;fill-opacity:0.49803922"><path
-       id="XMLID_42_"
-       d="m 295.17362,965.05417 c 1.0692,3.47527 0.5346,7.21786 -1.3367,10.29214 l -25.7972,41.83679 c -2.5396,4.1436 -7.2178,6.8169 -12.297,6.8169 H 14.345318 C 3.1176178,1024 -3.6991822,1012.2376 2.3157178,1003.4158 L 157.76692,774.44928 c 0.9356,-1.33663 1.4704,-2.80694 1.8713,-4.27723 l 71.2428,-304.21933 c 0.8021,-3.60893 3.2081,-6.6832 6.6833,-8.55449 l 96.5054,-52.93096 c 3.4753,-1.8713 5.8812,-4.94557 6.6832,-8.68816 l 12.9654,-56.53988 c 2.6733,-11.76242 19.5151,-14.30205 26.1981,-4.00991 l 4.6783,7.48519 c 2.0049,3.20793 2.5396,7.21785 1.2031,10.82678 l -87.9511,254.22895 c -0.6683,2.00497 -0.9355,4.1436 -0.5346,6.28223 l 21.9209,121.63426 c 0.401,2.40595 0.1334,4.94556 -0.9357,7.21785 l -52.2625,117.357 c -1.203,2.80696 -1.4704,5.88123 -0.5347,8.68817 z M 1009.7413,1024 H 843.46322 c -4.8117,0 -9.2228,-2.4059 -11.8959,-6.1485 L 719.69042,860.52891 c -0.6683,-1.0693 -1.3366,-2.13861 -1.7375,-3.3416 l -55.4707,-162.00078 c -1.0692,-3.20793 -3.6088,-6.01489 -6.8169,-7.61886 l -135.8026,-68.56965 c -3.7426,-1.87127 -6.4159,-5.34655 -7.2179,-9.22281 l -20.0495,-99.44603 c -0.2674,-1.60396 -0.9357,-3.20793 -2.005,-4.67824 l -46.1141,-67.76766 c -2.5396,-3.74259 -2.9405,-8.28717 -1.0693,-12.2971 l 28.0694,-60.01513 c 2.1387,-4.54457 6.817,-7.61886 12.1634,-7.88619 l 52.129,-3.07427 c 3.0742,-0.1337 5.8812,-1.20296 8.1536,-3.07427 l 38.3615,-29.80707 c 7.2178,-5.61388 18.1784,-3.20794 22.0546,4.67824 l 132.1937,268.93201 c 0.5346,1.20297 0.9357,2.40595 1.2029,3.60894 l 16.3072,108.13418 c 0.4009,2.53963 1.4701,4.8119 3.2079,6.6832 l 263.31808,288.17958 c 7.7525,8.5545 1.203,22.0546 -10.8269,22.0546 z M 363.20852,182.58501 c 0,-30.60907 19.3812,-56.94088 47.1834,-69.23798 -2.005,-3.3416 -3.2079,-6.95052 -3.2079,-10.82678 0,-14.836705 17.109,-26.866465 38.0942,-26.866465 0.5346,0 0.9356,0 1.4704,0 8.688,-14.43572 25.2624,-24.19318 44.2426,-24.19318 1.3367,0 2.6733,0 4.01,0.1337 1.7377,0.13369 3.4753,-0.66833 4.4109,-2.00497 14.0347,-21.38624 49.5894,-36.62394 91.159,-36.62394 15.3712,0 29.9406,2.13863 42.906,5.74756 3.0744,-5.07924 9.8911,-8.5545 17.7773,-8.5545 8.9556,0 16.5744,4.54458 18.8466,10.82678 10.9606,-12.69809 29.5398,-20.98524 50.6587,-20.98524 33.6834,0 60.9508,21.25257 60.9508,47.45072 0,3.20793 -0.401,6.2822 -1.203,9.35647 -0.5346,2.13864 0.6683,4.27725 2.9407,5.07924 21.5199,7.88618 36.0893,22.85655 36.0893,39.965535 0,19.51495 -18.8466,36.22296 -45.4458,42.77249 -2.1387,0.53466 -3.4753,2.40595 -3.4753,4.41092 0,0.1337 0,0.26731 0,0.40098 0,15.10404 -14.9704,27.5348 -34.218,28.87144 0.1333,0.66833 0.1333,1.33663 0.1333,2.13862 0,29.00509 -55.2031,52.3963 -123.2382,52.3963 -14.7029,0 -28.7377,-1.06932 -41.7031,-3.07427 0,0.26733 0,0.40099 0,0.66832 0,12.02975 -15.5051,21.78723 -34.4854,21.78723 -1.0692,0 -2.0049,0 -2.9405,-0.13369 1.3367,2.9406 2.005,6.01487 2.005,9.22281 0,18.71296 -23.6586,33.81699 -52.9311,33.81699 -3.2079,0 -6.2821,-0.1337 -9.3563,-0.53466 -2.4061,-0.26731 -4.6783,1.20299 -5.2131,3.47529 -2.5396,9.35647 -10.693,16.17333 -20.4504,16.17333 -11.7625,0 -21.119,-10.0248 -21.119,-22.32189 0,-5.74755 2.005,-10.96045 5.3466,-14.83671 1.203,-1.33663 1.6039,-3.20793 0.8019,-4.81191 -1.8713,-3.47526 -2.6733,-7.08419 -2.6733,-10.96044 v 0 c 0,-2.13862 -1.7376,-3.87626 -3.8763,-4.4109 -36.2228,-8.01985 -63.4903,-38.22792 -63.4903,-74.3172 z m 306.8925,726.06294 c 0.5348,1.60398 0.6683,3.20796 0.6683,4.94558 l -7.7525,97.97577 c -0.5346,6.9505 -6.6832,12.4307 -14.1683,12.4307 h -250.219 c -5.3466,0 -10.2921,-3.0743 -12.6982,-7.4852 l -41.3021,-76.72312 c -0.2673,-0.401 -0.401,-0.80199 -0.5347,-1.20298 l -38.8962,-94.23313 c -1.4702,-3.3416 -1.203,-7.21785 0.4011,-10.42581 l 64.5596,-126.31249 c 1.604,-3.07427 1.8712,-6.6832 0.6683,-9.89114 l -31.5447,-87.41626 c -1.0693,-3.07428 -0.9356,-6.54955 0.4011,-9.49015 l 52.6636,-112.14412 c 5.3464,-11.22778 22.8565,-10.29212 26.5991,1.47031 l 16.4407,51.05965 50.124,134.19868 c 1.3367,3.7426 4.5446,6.6832 8.5545,8.01985 l 106.9312,36.49027 c 4.1435,1.47032 7.3516,4.54458 8.6881,8.42084 z"
-       style="fill:#000000;stroke-width:0.78179646;fill-opacity:0.49803922" /><g
-       aria-label="WULKANOWY"
-       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:0.49803922;stroke:none"
-       id="text4752" /></g></svg>
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 649958582..96ec7cb84 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,30 +1,37 @@
 package io.github.wulkanowy
 
-import android.app.Application
 import android.content.Context
 import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
-import androidx.hilt.work.HiltWorkerFactory
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
+import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
-import dagger.hilt.android.HiltAndroidApp
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.utils.Log
 import fr.bipi.tressence.file.FileLoggerTree
+import io.github.wulkanowy.di.DaggerAppComponent
+import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.github.wulkanowy.utils.initCrashlytics
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject
 
-@HiltAndroidApp
-class WulkanowyApp : Application(), Configuration.Provider {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
-    lateinit var workerFactory: HiltWorkerFactory
+    lateinit var workerFactory: SyncWorkerFactory
 
     @Inject
     lateinit var themeManager: ThemeManager
@@ -39,14 +46,18 @@ class WulkanowyApp : Application(), Configuration.Provider {
 
     override fun onCreate() {
         super.onCreate()
+        AndroidThreeTen.init(this)
+        RxJavaPlugins.setErrorHandler(::onError)
         Lingver.init(this)
         themeManager.applyDefaultTheme()
 
         initLogging()
+        initCrashlytics(this, appInfo)
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
             Timber.plant(DebugLogTree())
             Timber.plant(FileLoggerTree.Builder()
                 .withFileName("wulkanowy.%g.log")
@@ -62,6 +73,18 @@ class WulkanowyApp : Application(), Configuration.Provider {
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
+    private fun onError(error: Throwable) {
+        //RxJava's too deep stack traces may cause SOE on older android devices
+        val cause = error.cause
+        if (error is UndeliverableException && cause is IOException || cause is InterruptedException || cause is StackOverflowError) {
+            Timber.e(cause, "An undeliverable error occurred")
+        } else throw error
+    }
+
+    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
+        return DaggerAppComponent.factory().create(this)
+    }
+
     override fun getWorkManagerConfiguration() = Configuration.Builder()
         .setWorkerFactory(workerFactory)
         .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
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 3370d0ac3..43c27c529 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -5,14 +5,13 @@ import android.content.SharedPreferences
 import android.content.res.AssetManager
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import com.chuckerteam.chucker.api.RetentionManager
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -21,12 +20,19 @@ import timber.log.Timber
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
 internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerCollector: ChuckerCollector, @ApplicationContext context: Context): Sdk {
+    fun provideInternetObservingSettings(): InternetObservingSettings {
+        return InternetObservingSettings.builder()
+            .strategy(WalledGardenInternetObservingStrategy())
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
         return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
@@ -39,7 +45,7 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideChuckerCollector(@ApplicationContext context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
+    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
         return ChuckerCollector(
             context = context,
             showNotification = prefRepository.isDebugNotificationEnable,
@@ -49,19 +55,19 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideDatabase(@ApplicationContext context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
+    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
-    fun provideResources(@ApplicationContext context: Context): Resources = context.resources
+    fun provideResources(context: Context): Resources = context.resources
 
     @Singleton
     @Provides
-    fun provideAssets(@ApplicationContext context: Context): AssetManager = context.assets
+    fun provideAssets(context: Context): AssetManager = context.assets
 
     @Singleton
     @Provides
-    fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
deleted file mode 100644
index ae22832aa..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data
-
-data class Resource<out T>(val status: Status, val data: T?, val error: Throwable?) {
-    companion object {
-        fun <T> success(data: T?): Resource<T> {
-            return Resource(Status.SUCCESS, data, null)
-        }
-
-        fun <T> error(error: Throwable?, data: T? = null): Resource<T> {
-            return Resource(Status.ERROR, data, error)
-        }
-
-        fun <T> loading(data: T? = null): Resource<T> {
-            return Resource(Status.LOADING, data, null)
-        }
-    }
-}
-
-enum class Status {
-    LOADING,
-    SUCCESS,
-    ERROR
-}
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 ebd5119fa..762c52f8f 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
@@ -68,8 +68,6 @@ import io.github.wulkanowy.data.db.migrations.Migration22
 import io.github.wulkanowy.data.db.migrations.Migration23
 import io.github.wulkanowy.data.db.migrations.Migration24
 import io.github.wulkanowy.data.db.migrations.Migration25
-import io.github.wulkanowy.data.db.migrations.Migration26
-import io.github.wulkanowy.data.db.migrations.Migration27
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -112,7 +110,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 27
+        const val VERSION_SCHEMA = 25
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
             return arrayOf(
@@ -139,9 +137,7 @@ abstract class AppDatabase : RoomDatabase() {
                 Migration22(),
                 Migration23(),
                 Migration24(),
-                Migration25(),
-                Migration26(),
-                Migration27(),
+                Migration25()
             )
         }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index b21c4834f..294f73d3d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -3,18 +3,19 @@ package io.github.wulkanowy.data.db
 import androidx.room.TypeConverter
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import java.time.Instant
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.Month
-import java.time.ZoneOffset
+import org.threeten.bp.DateTimeUtils
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month
+import org.threeten.bp.ZoneOffset
 import java.util.Date
 
 class Converters {
 
     @TypeConverter
     fun timestampToDate(value: Long?): LocalDate? = value?.run {
-        Date(value).toInstant().atZone(ZoneOffset.UTC).toLocalDate()
+        DateTimeUtils.toInstant(Date(value)).atZone(ZoneOffset.UTC).toLocalDate()
     }
 
     @TypeConverter
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
index 8ef3fd446..3eb57473d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface AttendanceDao : BaseDao<Attendance> {
 
     @Query("SELECT * FROM Attendance 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<Attendance>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
index 4218855ca..fd58533f1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
 
     @Query("SELECT * FROM AttendanceSummary WHERE diary_id = :diaryId AND student_id = :studentId AND subject_id = :subjectId")
-    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Flow<List<AttendanceSummary>>
+    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<List<AttendanceSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
index 048e9e3cd..32dbadb86 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
@@ -7,11 +7,11 @@ import androidx.room.Update
 interface BaseDao<T> {
 
     @Insert
-    suspend fun insertAll(items: List<T>): List<Long>
+    fun insertAll(items: List<T>): List<Long>
 
     @Update
-    suspend fun updateAll(items: List<T>)
+    fun updateAll(items: List<T>)
 
     @Delete
-    suspend fun deleteAll(items: List<T>)
+    fun deleteAll(items: List<T>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
index 8c03609d6..e13e569b6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface CompletedLessonsDao : BaseDao<CompletedLesson> {
 
     @Query("SELECT * FROM CompletedLesson 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<CompletedLesson>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
index 311eeb9c5..ca6b32dfc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Exam
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface ExamDao : BaseDao<Exam> {
 
     @Query("SELECT * FROM Exams 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<Exam>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index 12e70bde6..c74d1937f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Grade
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,6 @@ import javax.inject.Singleton
 interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<Grade>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
+
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
index e8074f003..da1828666 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +11,8 @@ import javax.inject.Singleton
 interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Flow<List<GradePointsStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<List<GradePointsStatistics>>
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradePointsStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
index b462ad5db..6faa35d0b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeStatistics
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +11,8 @@ import javax.inject.Singleton
 interface GradeStatisticsDao : BaseDao<GradeStatistics> {
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Flow<List<GradeStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
-    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Flow<List<GradeStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Maybe<List<GradeStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index fc9ad66ed..1165ef07f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface GradeSummaryDao : BaseDao<GradeSummary> {
 
     @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradeSummary>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
index 2092de49d..1947a0dfe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Homework
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface HomeworkDao : BaseDao<Homework> {
 
     @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Homework>>
+    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
index 57f3005ad..f16c28d9e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface LuckyNumberDao : BaseDao<LuckyNumber> {
 
     @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
-    fun load(studentId: Int, date: LocalDate): Flow<LuckyNumber?>
+    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
index b69083a1a..3c511a277 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
@@ -9,5 +9,5 @@ import io.github.wulkanowy.data.db.entities.MessageAttachment
 interface MessageAttachmentDao : BaseDao<MessageAttachment> {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAttachments(items: List<MessageAttachment>): List<Long>
+    fun insertAttachments(items: List<MessageAttachment>): List<Long>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 79050de0f..7a69e2707 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -5,15 +5,19 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
+import io.reactivex.Single
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
     @Transaction
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment>
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
+    fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
+
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
+    fun loadDeleted(studentId: Int): Maybe<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
index 8baba2c30..b05b2d9cc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
     @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<MobileDevice>>
+    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
index e89a4135a..ea2fc6eb2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Note
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface NoteDao : BaseDao<Note> {
 
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
-    fun loadAll(studentId: Int): Flow<List<Note>>
+    fun loadAll(studentId: Int): Maybe<List<Note>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
index 419efde0d..afb941b1a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -10,5 +11,5 @@ import javax.inject.Singleton
 interface RecipientDao : BaseDao<Recipient> {
 
     @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
-    suspend fun load(studentId: Int, role: Int, unitId: Int): List<Recipient>
+    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
index ca697eda8..6ddfd4941 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -10,8 +11,8 @@ import javax.inject.Singleton
 interface ReportingUnitDao : BaseDao<ReportingUnit> {
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    suspend fun load(studentId: Int): List<ReportingUnit>
+    fun load(studentId: Int): Maybe<List<ReportingUnit>>
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    suspend fun loadOne(studentId: Int, unitId: Int): ReportingUnit?
+    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
index f39791f63..e9bd67557 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.School
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface SchoolDao : BaseDao<School> {
 
     @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Flow<School?>
+    fun load(studentId: Int, classId: Int): Maybe<School>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
index 4d171907c..654b80f38 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
@@ -1,19 +1,15 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
 interface SemesterDao : BaseDao<Semester> {
 
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    suspend fun insertSemesters(items: List<Semester>): List<Long>
-
     @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
-    suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index d7237ea8a..901ddc73f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -5,9 +5,8 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.ABORT
 import androidx.room.Query
-import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -15,27 +14,23 @@ import javax.inject.Singleton
 interface StudentDao {
 
     @Insert(onConflict = ABORT)
-    suspend fun insertAll(student: List<Student>): List<Long>
+    fun insertAll(student: List<Student>): List<Long>
 
     @Delete
-    suspend fun delete(student: Student)
+    fun delete(student: Student)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
-    suspend fun loadCurrent(): Student?
+    fun loadCurrent(): Maybe<Student>
 
     @Query("SELECT * FROM Students WHERE id = :id")
-    suspend fun loadById(id: Int): Student?
+    fun loadById(id: Int): Maybe<Student>
 
     @Query("SELECT * FROM Students")
-    suspend fun loadAll(): List<Student>
-
-    @Transaction
-    @Query("SELECT * FROM Students")
-    suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
+    fun loadAll(): Maybe<List<Student>>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    suspend fun updateCurrent(id: Long)
+    fun updateCurrent(id: Long)
 
     @Query("UPDATE Students SET is_current = 0")
-    suspend fun resetCurrent()
+    fun resetCurrent()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
index 4cd742b56..525a7129a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Subject
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface SubjectDao : BaseDao<Subject> {
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Subject>>
+    fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
index 6adac220d..5ea237a84 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface TeacherDao : BaseDao<Teacher> {
 
     @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Flow<List<Teacher>>
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
index 5e6eec668..6b62cc82a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Timetable
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Timetable>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index f141d5d52..aa8da8db7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Attendance")
 data class Attendance(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
index 7d628ebaa..d2e1f174e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.Month
 import java.io.Serializable
-import java.time.Month
 
 @Entity(tableName = "AttendanceSummary")
 data class AttendanceSummary(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
index e305d467a..775f3f558 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "CompletedLesson")
 data class CompletedLesson(
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..9ae795e71 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
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Exams")
 data class Exam(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index a0f1c3a6d..3f69c61b1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Grades")
 data class Grade(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index fb7b60bbc..6e29112b2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.time.LocalDateTime
 
 @Entity(tableName = "GradesSummary")
 data class GradeSummary(
@@ -37,16 +36,4 @@ data class GradeSummary(
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    @ColumnInfo(name = "is_predicted_grade_notified")
-    var isPredictedGradeNotified: Boolean = true
-
-    @ColumnInfo(name = "is_final_grade_notified")
-    var isFinalGradeNotified: Boolean = true
-
-    @ColumnInfo(name = "predicted_grade_last_change")
-    var predictedGradeLastChange: LocalDateTime = LocalDateTime.now()
-
-    @ColumnInfo(name = "final_grade_last_change")
-    var finalGradeLastChange: LocalDateTime = LocalDateTime.now()
 }
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..cd7d153e9 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
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Homework")
 data class Homework(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
index 7c24c8f5c..5b9130f5d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "LuckyNumbers")
 data class LuckyNumber (
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 914dc3816..058298415 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDateTime
 
 @Entity(tableName = "Messages")
 data class Message(
@@ -29,6 +29,8 @@ data class Message(
 
     val subject: String,
 
+    var content: String,
+
     val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
@@ -53,6 +55,4 @@ data class Message(
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
-
-    var content: String = ""
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index 9d8f11625..f67ed599f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDateTime
 
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
index cfd549625..6f707a66a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
 import java.io.Serializable
-import java.time.LocalDate
 
 @Entity(tableName = "Notes")
 data class Note(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 3b1f0add5..0641e0b6d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -4,8 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import java.io.Serializable
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
@@ -37,7 +36,7 @@ data class Semester(
 
     @ColumnInfo(name = "unit_id")
     val unitId: Int
-): Serializable {
+) {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index b6c75ff8f..905979f99 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDateTime
 
 @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
@@ -43,9 +43,6 @@ data class Student(
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
-    @ColumnInfo(name = "user_name")
-    val userName: String,
-
     @ColumnInfo(name = "student_name")
     val studentName: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
deleted file mode 100644
index 9362a954e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.Embedded
-import androidx.room.Relation
-import java.io.Serializable
-
-data class StudentWithSemesters(
-    @Embedded
-    val student: Student,
-
-    @Relation(parentColumn = "student_id", entityColumn = "student_id")
-    val semesters: List<Semester>
-) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index 1bf159efd..cad3b7c69 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -3,9 +3,9 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
 import java.io.Serializable
-import java.time.LocalDate
-import java.time.LocalDateTime
 
 @Entity(tableName = "Timetable")
 data class Timetable(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
deleted file mode 100644
index 7130d86d8..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration26 : Migration(25, 26) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_predicted_grade_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_final_grade_notified INTEGER NOT NULL DEFAULT 1")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN predicted_grade_last_change INTEGER NOT NULL DEFAULT 0")
-        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN final_grade_last_change INTEGER NOT NULL DEFAULT 0")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
deleted file mode 100644
index 6592228a1..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration27 : Migration(26, 27) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN user_name TEXT NOT NULL DEFAULT \"\"")
-
-        val students = getStudentsIdsAndNames(database)
-        val units = getReportingUnits(database)
-
-        students.forEach { (id, userLoginId, studentName) ->
-            val userNameFromUnits = units.singleOrNull { (senderId, _) -> senderId == userLoginId }?.second
-            val normalizedStudentName = studentName.split(" ").asReversed().joinToString(" ")
-
-            val userName = userNameFromUnits ?: normalizedStudentName
-            database.execSQL("UPDATE Students SET user_name = '$userName' WHERE id = '$id'")
-        }
-    }
-
-    private fun getStudentsIdsAndNames(database: SupportSQLiteDatabase): MutableList<Triple<Long, Int, String>> {
-        val students = mutableListOf<Triple<Long, Int, String>>()
-        val studentsCursor = database.query("SELECT id, user_login_id, student_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(Triple(studentsCursor.getLong(0), studentsCursor.getInt(1), studentsCursor.getString(2)))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun getReportingUnits(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
-        val units = mutableListOf<Pair<Int, String>>()
-        val unitsCursor = database.query("SELECT sender_id, sender_name FROM ReportingUnits")
-        if (unitsCursor.moveToFirst()) {
-            do {
-                units.add(unitsCursor.getInt(0) to unitsCursor.getString(1))
-            } while (unitsCursor.moveToNext())
-        }
-
-        return units
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
index dbcd916ba..fe0dec48f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.data.db.migrations
 
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import java.time.LocalDateTime.now
-import java.time.ZoneOffset
+import org.threeten.bp.LocalDateTime.now
+import org.threeten.bp.ZoneOffset
 
 class Migration5 : Migration(4, 5) {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
deleted file mode 100644
index acd93a91a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.Semester as SdkSemester
-
-fun List<SdkSemester>.mapToEntities(studentId: Int) = map {
-    Semester(
-        studentId = studentId,
-        diaryId = it.diaryId,
-        diaryName = it.diaryName,
-        schoolYear = it.schoolYear,
-        semesterId = it.semesterId,
-        semesterName = it.semesterNumber,
-        start = it.start,
-        end = it.end,
-        classId = it.classId,
-        unitId = it.unitId
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
deleted file mode 100644
index 67f56c628..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import java.time.LocalDateTime
-import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
-
-fun List<SdkStudent>.mapToEntities(password: String = "") = map {
-    StudentWithSemesters(
-        student = Student(
-            email = it.email,
-            password = password,
-            isParent = it.isParent,
-            symbol = it.symbol,
-            studentId = it.studentId,
-            userLoginId = it.userLoginId,
-            userName = it.userName,
-            studentName = it.studentName + " " + it.studentSurname,
-            schoolSymbol = it.schoolSymbol,
-            schoolShortName = it.schoolShortName,
-            schoolName = it.schoolName,
-            className = it.className,
-            classId = it.classId,
-            scrapperBaseUrl = it.scrapperBaseUrl,
-            loginType = it.loginType.name,
-            isCurrent = false,
-            registrationDate = LocalDateTime.now(),
-            mobileBaseUrl = it.mobileBaseUrl,
-            privateKey = it.privateKey,
-            certificateKey = it.certificateKey,
-            loginMode = it.loginMode.name
-        ),
-        semesters = it.semesters.mapToEntities(it.studentId)
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/AppCreator.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/AppCreator.kt
new file mode 100644
index 000000000..d67aa2a7f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/AppCreator.kt
@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.pojos
+
+class AppCreator(val displayName: String, val githubUsername: String)
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
deleted file mode 100644
index e792bde46..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-class Contributor(val displayName: String, val githubUsername: String)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
index d19565579..fa752ed29 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
@@ -2,22 +2,19 @@ package io.github.wulkanowy.data.repositories.appcreator
 
 import android.content.res.AssetManager
 import com.google.gson.Gson
-import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.withContext
+import io.github.wulkanowy.data.pojos.AppCreator
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AppCreatorRepository @Inject constructor(
-    private val assets: AssetManager,
-    private val dispatchers: DispatchersProvider
-) {
-
-    suspend fun getAppCreators() = withContext(dispatchers.backgroundThread) {
-        Gson().fromJson(
-            assets.open("contributors.json").bufferedReader().use { it.readText() },
-            Array<Contributor>::class.java
-        ).toList()
+class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
+    fun getAppCreators(): Single<List<AppCreator>> {
+        return Single.fromCallable<List<AppCreator>> {
+            Gson().fromJson(
+                assets.open("contributors.json").bufferedReader().use { it.readText() },
+                Array<AppCreator>::class.java
+            ).toList()
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
index 9aaa52304..0f5873766 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.attendance
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
 
-    suspend fun saveAttendance(attendance: List<Attendance>) {
+    fun saveAttendance(attendance: List<Attendance>) {
         attendanceDb.insertAll(attendance)
     }
 
-    suspend fun deleteAttendance(attendance: List<Attendance>) {
+    fun deleteAttendance(attendance: List<Attendance>) {
         attendanceDb.deleteAll(attendance)
     }
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Attendance>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index 870690ec0..f64d920db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -6,40 +6,43 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Attendance> {
+    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getAttendance(startDate, endDate, semester.semesterId)
-            .map {
-                Attendance(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    date = it.date,
-                    timeId = it.timeId,
-                    number = it.number,
-                    subject = it.subject,
-                    name = it.name,
-                    presence = it.presence,
-                    absence = it.absence,
-                    exemption = it.exemption,
-                    lateness = it.lateness,
-                    excused = it.excused,
-                    deleted = it.deleted,
-                    excusable = it.excusable,
-                    excuseStatus = it.excuseStatus?.name
-                )
+            .map { attendance ->
+                attendance.map {
+                    Attendance(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date,
+                        timeId = it.timeId,
+                        number = it.number,
+                        subject = it.subject,
+                        name = it.name,
+                        presence = it.presence,
+                        absence = it.absence,
+                        exemption = it.exemption,
+                        lateness = it.lateness,
+                        excused = it.excused,
+                        deleted = it.deleted,
+                        excusable = it.excusable,
+                        excuseStatus = it.excuseStatus?.name
+                    )
+                }
             }
     }
 
-    suspend fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Boolean {
+    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
             Absent(
                 date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index 60f864f27..22fe7fa51 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -1,34 +1,45 @@
 package io.github.wulkanowy.data.repositories.attendance
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.friday
 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 java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: AttendanceLocal,
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getAttendance(semester, start.monday, end.sunday) },
-        fetch = { remote.getAttendance(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteAttendance(old uniqueSubtract new)
-            local.saveAttendance(new uniqueSubtract old)
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
+        return local.getAttendance(semester, start.monday, end.friday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getAttendance(student, semester, start.monday, end.friday)
+                else Single.error(UnknownHostException())
+            }.flatMap { newAttendance ->
+                local.getAttendance(semester, start.monday, end.friday)
+                    .toSingle(emptyList())
+                    .doOnSuccess { oldAttendance ->
+                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                    }
+            }.flatMap {
+                local.getAttendance(semester, start.monday, end.friday)
+                    .toSingle(emptyList())
+            }).map { list -> list.filter { it.date in start..end } }
+    }
 
-    suspend fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null) {
-        remote.excuseAbsence(student, semester, attendanceList, reason)
+    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(student, semester, attendanceList, reason)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
index 703bc9474..2e9a10067 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
@@ -3,22 +3,22 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
 
-    suspend fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
+    fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.insertAll(attendance)
     }
 
-    suspend fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
+    fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.deleteAll(attendance)
     }
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Flow<List<AttendanceSummary>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId)
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index 29a0b9a7b..8fef5c391 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -5,29 +5,32 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): List<AttendanceSummary> {
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getAttendanceSummary(subjectId)
-            .map {
-                AttendanceSummary(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    subjectId = subjectId,
-                    month = it.month,
-                    presence = it.presence,
-                    absence = it.absence,
-                    absenceExcused = it.absenceExcused,
-                    absenceForSchoolReasons = it.absenceForSchoolReasons,
-                    lateness = it.lateness,
-                    latenessExcused = it.latenessExcused,
-                    exemption = it.exemption
-                )
+            .map { attendance ->
+                attendance.map {
+                    AttendanceSummary(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        subjectId = subjectId,
+                        month = it.month,
+                        presence = it.presence,
+                        absence = it.absence,
+                        absenceExcused = it.absenceExcused,
+                        absenceForSchoolReasons = it.absenceForSchoolReasons,
+                        lateness = it.lateness,
+                        latenessExcused = it.latenessExcused,
+                        exemption = it.exemption
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index 5dbe1ab05..5f0b2b346 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -1,25 +1,35 @@
 package io.github.wulkanowy.data.repositories.attendancesummary
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: AttendanceSummaryLocal,
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getAttendanceSummary(semester, subjectId) },
-        fetch = { remote.getAttendanceSummary(student, semester, subjectId) },
-        saveFetchResult = { old, new ->
-            local.deleteAttendanceSummary(old uniqueSubtract new)
-            local.saveAttendanceSummary(new uniqueSubtract old)
-        }
-    )
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+        return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getAttendanceSummary(student, semester, subjectId)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
+                            local.saveAttendanceSummary(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
index 51a1bdbfc..9b275908e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.completedlessons
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
 
-    suspend fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
+    fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
         completedLessonsDb.insertAll(completedLessons)
     }
 
-    suspend fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
+    fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
         completedLessonsDb.deleteAll(completedLessons)
     }
 
-    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Flow<List<CompletedLesson>> {
-        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end)
+    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>> {
+        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
index d15a27623..bb115111e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -5,31 +5,34 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<CompletedLesson> {
+    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getCompletedLessons(startDate, endDate)
-            .map {
-                it.absence
-                CompletedLesson(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    date = it.date,
-                    number = it.number,
-                    subject = it.subject,
-                    topic = it.topic,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol,
-                    substitution = it.substitution,
-                    absence = it.absence,
-                    resources = it.resources
-                )
+            .map { lessons ->
+                lessons.map {
+                    it.absence
+                    CompletedLesson(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date,
+                        number = it.number,
+                        subject = it.subject,
+                        topic = it.topic,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        substitution = it.substitution,
+                        absence = it.absence,
+                        resources = it.resources
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
index 61268a66a..f31e30552 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -1,29 +1,42 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.friday
 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 java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: CompletedLessonsLocal,
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getCompletedLessons(semester, start.monday, end.sunday) },
-        fetch = { remote.getCompletedLessons(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteCompleteLessons(old uniqueSubtract new)
-            local.saveCompletedLessons(new uniqueSubtract old)
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return local.getCompletedLessons(semester, start.monday, end.friday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getCompletedLessons(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteCompleteLessons(old.uniqueSubtract(new))
+                            local.saveCompletedLessons(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getCompletedLessons(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
index acc55b5ec..0f484d323 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
@@ -3,23 +3,24 @@ package io.github.wulkanowy.data.repositories.exam
 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamLocal @Inject constructor(private val examDb: ExamDao) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Exam>> {
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Exam>> {
         return examDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+                .filter { !it.isEmpty() }
     }
 
-    suspend fun saveExams(exams: List<Exam>) {
+    fun saveExams(exams: List<Exam>) {
         examDb.insertAll(exams)
     }
 
-    suspend fun deleteExams(exams: List<Exam>) {
+    fun deleteExams(exams: List<Exam>) {
         examDb.deleteAll(exams)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index ac4aa93d7..fb105ceee 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -5,29 +5,32 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Exam> {
+    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getExams(startDate, endDate, semester.semesterId)
-            .map {
-                Exam(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    date = it.date,
-                    entryDate = it.entryDate,
-                    subject = it.subject,
-                    group = it.group,
-                    type = it.type,
-                    description = it.description,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol
-                )
+            .map { exams ->
+                exams.map {
+                    Exam(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date,
+                        entryDate = it.entryDate,
+                        subject = it.subject,
+                        group = it.group,
+                        type = it.type,
+                        description = it.description,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index e7f115ac6..452a15510 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -1,29 +1,42 @@
 package io.github.wulkanowy.data.repositories.exam
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+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.utils.friday
 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 java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: ExamLocal,
     private val remote: ExamRemote
 ) {
 
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getExams(semester, start.monday, end.sunday) },
-        fetch = { remote.getExams(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteExams(old uniqueSubtract new)
-            local.saveExams(new uniqueSubtract old)
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return local.getExams(semester, start.monday, end.friday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getExams(student, semester, start.monday, end.friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getExams(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteExams(old.uniqueSubtract(new))
+                            local.saveExams(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getExams(semester, start.monday, end.friday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index ed3635423..4983a4740 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -1,49 +1,28 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeLocal @Inject constructor(
-    private val gradeDb: GradeDao,
-    private val gradeSummaryDb: GradeSummaryDao
-) {
+class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
 
-    suspend fun saveGrades(grades: List<Grade>) {
+    fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
     }
 
-    suspend fun deleteGrades(grades: List<Grade>) {
+    fun deleteGrades(grades: List<Grade>) {
         gradeDb.deleteAll(grades)
     }
 
-    suspend fun updateGrades(grades: List<Grade>) {
+    fun updateGrades(grades: List<Grade>) {
         gradeDb.updateAll(grades)
     }
 
-    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.updateAll(gradesSummary)
-    }
-
-    fun getGradesDetails(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId)
-    }
-
-    suspend fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.insertAll(gradesSummary)
-    }
-
-    suspend fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.deleteAll(gradesSummary)
-    }
-
-    fun getGradesSummary(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
+    fun getGrades(semester: Semester): Maybe<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index 9534a8910..6f19095ba 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -1,53 +1,39 @@
 package io.github.wulkanowy.data.repositories.grade
 
 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.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getGrades(student: Student, semester: Semester): Pair<List<Grade>, List<GradeSummary>> {
-        val (details, summary) = sdk
-            .init(student)
-            .switchDiary(semester.diaryId, semester.schoolYear)
+    fun getGrades(student: Student, semester: Semester): Single<List<Grade>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getGrades(semester.semesterId)
-
-        return details.map {
-            Grade(
-                studentId = semester.studentId,
-                semesterId = semester.semesterId,
-                subject = it.subject,
-                entry = it.entry,
-                value = it.value,
-                modifier = it.modifier,
-                comment = it.comment,
-                color = it.color,
-                gradeSymbol = it.symbol,
-                description = it.description,
-                weight = it.weight,
-                weightValue = it.weightValue,
-                date = it.date,
-                teacher = it.teacher
-            )
-        } to summary.map {
-            GradeSummary(
-                semesterId = semester.semesterId,
-                studentId = semester.studentId,
-                position = 0,
-                subject = it.name,
-                predictedGrade = it.predicted,
-                finalGrade = it.final,
-                pointsSum = it.pointsSum,
-                proposedPoints = it.proposedPoints,
-                finalPoints = it.finalPoints,
-                average = it.average
-            )
-        }
+            .map { grades ->
+                grades.map {
+                    Grade(
+                        studentId = semester.studentId,
+                        semesterId = semester.semesterId,
+                        subject = it.subject,
+                        entry = it.entry,
+                        value = it.value,
+                        modifier = it.modifier,
+                        comment = it.comment,
+                        color = it.color,
+                        gradeSymbol = it.symbol,
+                        description = it.description,
+                        weight = it.weight,
+                        weightValue = it.weightValue,
+                        date = it.date,
+                        teacher = it.teacher
+                    )
+                }
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index 8cbbfdfb0..351ebc392 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -1,98 +1,59 @@
 package io.github.wulkanowy.data.repositories.grade
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 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.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import java.time.LocalDateTime
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: GradeLocal,
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh },
-        query = { local.getGradesDetails(semester).combine(local.getGradesSummary(semester)) { details, summaries -> details to summaries } },
-        fetch = { remote.getGrades(student, semester) },
-        saveFetchResult = { old, new ->
-            refreshGradeDetails(student, old.first, new.first, notify)
-            refreshGradeSummaries(old.second, new.second, notify)
-        }
-    )
-
-    private suspend fun refreshGradeDetails(student: Student, oldGrades: List<Grade>, newDetails: List<Grade>, notify: Boolean) {
-        val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
-        local.deleteGrades(oldGrades uniqueSubtract newDetails)
-        local.saveGrades((newDetails uniqueSubtract oldGrades).onEach {
-            if (it.date >= notifyBreakDate) it.apply {
-                isRead = false
-                if (notify) isNotified = false
-            }
-        })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
+        return local.getGrades(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGrades(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGrades(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                            local.deleteGrades(old.uniqueSubtract(new))
+                            local.saveGrades(new.uniqueSubtract(old)
+                                .onEach {
+                                    if (it.date >= notifyBreakDate) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
+                                })
+                        }
+                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
     }
 
-    private suspend fun refreshGradeSummaries(oldSummaries: List<GradeSummary>, newSummary: List<GradeSummary>, notify: Boolean) {
-        local.deleteGradesSummary(oldSummaries uniqueSubtract newSummary)
-        local.saveGradesSummary((newSummary uniqueSubtract oldSummaries).onEach { summary ->
-            val oldSummary = oldSummaries.find { oldSummary -> oldSummary.subject == summary.subject }
-            summary.isPredictedGradeNotified = when {
-                summary.predictedGrade.isEmpty() -> true
-                notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
-                else -> true
-            }
-            summary.isFinalGradeNotified = when {
-                summary.finalGrade.isEmpty() -> true
-                notify && oldSummary?.finalGrade != summary.finalGrade -> false
-                else -> true
-            }
-
-            summary.predictedGradeLastChange = when {
-                oldSummary == null -> LocalDateTime.now()
-                summary.predictedGrade != oldSummary.predictedGrade -> LocalDateTime.now()
-                else -> oldSummary.predictedGradeLastChange
-            }
-            summary.finalGradeLastChange = when {
-                oldSummary == null -> LocalDateTime.now()
-                summary.finalGrade != oldSummary.finalGrade -> LocalDateTime.now()
-                else -> oldSummary.finalGradeLastChange
-            }
-        })
+    fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
     }
 
-    fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }
+    fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
     }
 
-    fun getNotNotifiedGrades(semester: Semester): Flow<List<Grade>> {
-        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }
+    fun updateGrade(grade: Grade): Completable {
+        return Completable.fromCallable { local.updateGrades(listOf(grade)) }
     }
 
-    fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
-    }
-
-    fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
-    }
-
-    suspend fun updateGrade(grade: Grade) {
-        return local.updateGrades(listOf(grade))
-    }
-
-    suspend fun updateGrades(grades: List<Grade>) {
-        return local.updateGrades(grades)
-    }
-
-    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
-        return local.updateGradesSummary(gradesSummary)
+    fun updateGrades(grades: List<Grade>): Completable {
+        return Completable.fromCallable { local.updateGrades(grades) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
new file mode 100644
index 000000000..e74641d3a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
+
+    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.insertAll(gradesSummary)
+    }
+
+    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.deleteAll(gradesSummary)
+    }
+
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
new file mode 100644
index 000000000..1b09974dd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+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.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getGradeSummary(student: Student, semester: Semester): Single<List<GradeSummary>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGradesSummary(semester.semesterId)
+            .map { gradesSummary ->
+                gradesSummary.map {
+                    GradeSummary(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        position = 0,
+                        subject = it.name,
+                        predictedGrade = it.predicted,
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
+                    )
+                }
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
new file mode 100644
index 000000000..f1d7a6c1c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.data.repositories.gradessummary
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+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.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeSummaryRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: GradeSummaryLocal,
+    private val remote: GradeSummaryRemote
+) {
+
+    fun getGradesSummary(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<GradeSummary>> {
+        return local.getGradesSummary(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradeSummary(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesSummary(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesSummary(old.uniqueSubtract(new))
+                            local.saveGradesSummary(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
index e0e2cd4db..7994bd758 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -5,7 +5,7 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,27 +15,46 @@ class GradeStatisticsLocal @Inject constructor(
     private val gradePointsStatisticsDb: GradePointsStatisticsDao
 ) {
 
-    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Flow<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
     }
 
-    fun getGradesPointsStatistics(semester: Semester): Flow<List<GradePointsStatistics>> {
-        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
+        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 
-    suspend fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
+        return when (subjectName) {
+            "Wszystkie" -> gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
+                list.groupBy { it.grade }.map {
+                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
+                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
+                } + list
+            }
+            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<List<GradePointsStatistics>> {
+        return when (subjectName) {
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.insertAll(gradesStatistics)
     }
 
-    suspend fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
+    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
         gradePointsStatisticsDb.insertAll(gradePointsStatistics)
     }
 
-    suspend fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.deleteAll(gradesStatistics)
     }
 
-    suspend fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
+    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
         gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
index 1ff8132fc..99e0cb987 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -6,39 +6,44 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): List<GradeStatistics> {
+    fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
             if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
             else it.getGradesPartialStatistics(semester.semesterId)
-        }.map {
-            GradeStatistics(
-                semesterId = semester.semesterId,
-                studentId = semester.studentId,
-                subject = it.subject,
-                grade = it.gradeValue,
-                amount = it.amount,
-                semester = isSemester
-            )
-        }
-    }
-
-    suspend fun getGradePointsStatistics(student: Student, semester: Semester): List<GradePointsStatistics> {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getGradesPointsStatistics(semester.semesterId)
-            .map {
-                GradePointsStatistics(
+        }.map { gradeStatistics ->
+            gradeStatistics.map {
+                GradeStatistics(
                     semesterId = semester.semesterId,
                     studentId = semester.studentId,
                     subject = it.subject,
-                    others = it.others,
-                    student = it.student
+                    grade = it.gradeValue,
+                    amount = it.amount,
+                    semester = isSemester
                 )
             }
+        }
+    }
+
+    fun getGradePointsStatistics(student: Student, semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGradesPointsStatistics(semester.semesterId)
+            .map { gradePointsStatistics ->
+                gradePointsStatistics.map {
+                    GradePointsStatistics(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        subject = it.subject,
+                        others = it.others,
+                        student = it.student
+                    )
+                }
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
index 52ca705f7..8d96d2f57 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -1,72 +1,75 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeStatisticsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: GradeStatisticsLocal,
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getGradesStatistics(semester, isSemester) },
-        fetch = { remote.getGradeStatistics(student, semester, isSemester) },
-        saveFetchResult = { old, new ->
-            local.deleteGradesStatistics(old uniqueSubtract new)
-            local.saveGradesStatistics(new uniqueSubtract old)
-        },
-        mapResult = { items ->
-            when (subjectName) {
-                "Wszystkie" -> items.groupBy { it.grade }.map {
-                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
-                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
-                } + items
-                else -> items.filter { it.subject == subjectName }
-            }.mapToStatisticItems()
-        }
-    )
-
-    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getGradesPointsStatistics(semester) },
-        fetch = { remote.getGradePointsStatistics(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteGradesPointsStatistics(old uniqueSubtract new)
-            local.saveGradesPointsStatistics(new uniqueSubtract old)
-        },
-        mapResult = { items ->
-            when (subjectName) {
-                "Wszystkie" -> items
-                else -> items.filter { it.subject == subjectName }
-            }.mapToStatisticsItem()
-        }
-    )
-
-    private fun List<GradeStatistics>.mapToStatisticItems() = groupBy { it.subject }.map {
-        GradeStatisticsItem(
-            type = ViewType.PARTIAL,
-            partial = it.value
-                .sortedByDescending { item -> item.grade }
-                .filter { item -> item.amount != 0 },
-            points = null
-        )
+    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradeStatistics(student, semester, isSemester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesStatistics(old.uniqueSubtract(new))
+                            local.saveGradesStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
     }
 
-    private fun List<GradePointsStatistics>.mapToStatisticsItem() = map {
-        GradeStatisticsItem(
-            type = ViewType.POINTS,
-            partial = emptyList(),
-            points = it
-        )
+    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
+        return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradePointsStatistics(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesPointsStatistics(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
+                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.toSingle(emptyList()) })
+    }
+
+    private fun List<GradeStatistics>.mapToStatisticItems(): List<GradeStatisticsItem> {
+        return groupBy { it.subject }.map {
+            GradeStatisticsItem(
+                type = ViewType.PARTIAL,
+                partial = it.value
+                    .sortedByDescending { item -> item.grade }
+                    .filter { item -> item.amount != 0 },
+                points = null
+            )
+        }
+    }
+
+    private fun List<GradePointsStatistics>.mapToStatisticsItem(): List<GradeStatisticsItem> {
+        return map {
+            GradeStatisticsItem(
+                type = ViewType.POINTS,
+                partial = emptyList(),
+                points = it
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index f2cbb8031..fdae45182 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -3,27 +3,28 @@ package io.github.wulkanowy.data.repositories.homework
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
 
-    suspend fun saveHomework(homework: List<Homework>) {
+    fun saveHomework(homework: List<Homework>) {
         homeworkDb.insertAll(homework)
     }
 
-    suspend fun deleteHomework(homework: List<Homework>) {
+    fun deleteHomework(homework: List<Homework>) {
         homeworkDb.deleteAll(homework)
     }
 
-    suspend fun updateHomework(homework: List<Homework>) {
+    fun updateHomework(homework: List<Homework>) {
         homeworkDb.updateAll(homework)
     }
 
-    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Homework>> {
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
         return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
+            .filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 32109877a..20ffee99c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -5,28 +5,31 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Homework> {
+    fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getHomework(startDate, endDate)
-            .map {
-                Homework(
-                    semesterId = semester.semesterId,
-                    studentId = semester.studentId,
-                    date = it.date,
-                    entryDate = it.entryDate,
-                    subject = it.subject,
-                    content = it.content,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol,
-                    attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
-                )
+            .map { homework ->
+                homework.map {
+                    Homework(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        date = it.date,
+                        entryDate = it.entryDate,
+                        subject = it.subject,
+                        content = it.content,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
index 54397ea02..4454fd88e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -1,35 +1,49 @@
 package io.github.wulkanowy.data.repositories.homework
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.friday
 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 java.time.LocalDate
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: HomeworkLocal,
     private val remote: HomeworkRemote
 ) {
 
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getHomework(semester, start.monday, end.sunday) },
-        fetch = { remote.getHomework(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteHomework(old uniqueSubtract new)
-            local.saveHomework(new uniqueSubtract old)
+    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
+            local.getHomework(semester, monday, friday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                    .flatMap {
+                        if (it) remote.getHomework(student, semester, monday, friday)
+                        else Single.error(UnknownHostException())
+                    }.flatMap { new ->
+                        local.getHomework(semester, monday, friday).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteHomework(old.uniqueSubtract(new))
+                                local.saveHomework(new.uniqueSubtract(old))
+                            }
+                    }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
         }
-    )
+    }
 
-    suspend fun toggleDone(homework: Homework) {
-        local.updateHomework(listOf(homework.apply {
-            isDone = !isDone
-        }))
+    fun toggleDone(homework: Homework): Completable {
+        return Completable.fromCallable {
+            local.updateHomework(listOf(homework.apply {
+                isDone = !isDone
+            }))
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
index 85168fee5..be6ad2f48 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
@@ -1,28 +1,29 @@
 package io.github.wulkanowy.data.repositories.logger
 
 import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.withContext
+import io.reactivex.Single
 import java.io.File
 import java.io.FileNotFoundException
 import javax.inject.Inject
 
-class LoggerRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val dispatchers: DispatchersProvider
-) {
+class LoggerRepository @Inject constructor(private val context: Context) {
 
-    suspend fun getLastLogLines() = getLastModified().readText().split("\n")
-
-    suspend fun getLogFiles() = withContext(dispatchers.backgroundThread) {
-        File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
-            it.name.endsWith(".log")
-        }!!
+    fun getLastLogLines(): Single<List<String>> {
+        return getLastModified()
+            .map { it.readText() }
+            .map { it.split("\n") }
     }
 
-    private suspend fun getLastModified(): File {
-        return withContext(dispatchers.backgroundThread) {
+    fun getLogFiles(): Single<List<File>> {
+        return Single.fromCallable {
+            File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
+                it.name.endsWith(".log")
+            }
+        }
+    }
+
+    private fun getLastModified(): Single<File> {
+        return Single.fromCallable {
             var lastModifiedTime = Long.MIN_VALUE
             var chosenFile: File? = null
             File(context.filesDir.absolutePath).listFiles(File::isFile)?.forEach { file ->
@@ -32,7 +33,7 @@ class LoggerRepository @Inject constructor(
                 }
             }
             if (chosenFile == null) throw FileNotFoundException("Log file not found")
-            chosenFile!!
+            chosenFile
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
index 0c3156d1e..0f4f79c84 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -3,27 +3,27 @@ package io.github.wulkanowy.data.repositories.luckynumber
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
 
-    suspend fun saveLuckyNumber(luckyNumber: LuckyNumber?) {
-        luckyNumberDb.insertAll(listOfNotNull(luckyNumber))
+    fun saveLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.insertAll(listOf(luckyNumber))
     }
 
-    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) {
-        luckyNumberDb.updateAll(listOfNotNull(luckyNumber))
+    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.updateAll(listOf(luckyNumber))
     }
 
-    suspend fun deleteLuckyNumber(luckyNumber: LuckyNumber?) {
-        luckyNumberDb.deleteAll(listOfNotNull(luckyNumber))
+    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
-    fun getLuckyNumber(student: Student, date: LocalDate): Flow<LuckyNumber?> {
+    fun getLuckyNumber(student: Student, date: LocalDate): Maybe<LuckyNumber> {
         return luckyNumberDb.load(student.studentId, date)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
index 2872957d0..0c71897a6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -4,15 +4,16 @@ import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getLuckyNumber(student: Student): LuckyNumber? {
-        return sdk.init(student).getLuckyNumber(student.schoolShortName)?.let {
+    fun getLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return sdk.init(student).getLuckyNumber(student.schoolShortName).map {
             LuckyNumber(
                 studentId = student.studentId,
                 date = LocalDate.now(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
index 173ce7e45..374b9a294 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -1,36 +1,54 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: LuckyNumberLocal,
     private val remote: LuckyNumberRemote
 ) {
 
-    fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it == null || forceRefresh },
-        query = { local.getLuckyNumber(student, now()) },
-        fetch = { remote.getLuckyNumber(student) },
-        saveFetchResult = { old, new ->
-            if (new != old) {
-                old?.let { local.deleteLuckyNumber(it) }
-                local.saveLuckyNumber(new?.apply {
-                    if (notify) isNotified = false
-                })
-            }
-        }
-    )
+    fun getLuckyNumber(student: Student, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMapMaybe {
+                    if (it) remote.getLuckyNumber(student)
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getLuckyNumber(student, LocalDate.now())
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteLuckyNumber(old)
+                                local.saveLuckyNumber(new.apply {
+                                    if (notify) isNotified = false
+                                })
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveLuckyNumber(new.apply {
+                                if (notify) isNotified = false
+                            })
+                        }
+                }.flatMap({ local.getLuckyNumber(student, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(student, LocalDate.now()) })
+            )
+    }
 
-    suspend fun getNotNotifiedLuckyNumber(student: Student) =
-        local.getLuckyNumber(student, now()).map { if (it?.isNotified == false) it else null }.first()
+    fun getNotNotifiedLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !it.isNotified }
+    }
 
-    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) = local.updateLuckyNumber(luckyNumber)
+    fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
+        return Completable.fromCallable { local.updateLuckyNumber(luckyNumber) }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
index 730bd005b..53cf0a983 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -7,7 +7,8 @@ import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -17,27 +18,30 @@ class MessageLocal @Inject constructor(
     private val messageAttachmentDao: MessageAttachmentDao
 ) {
 
-    suspend fun saveMessages(messages: List<Message>) {
+    fun saveMessages(messages: List<Message>) {
         messagesDb.insertAll(messages)
     }
 
-    suspend fun updateMessages(messages: List<Message>) {
+    fun updateMessages(messages: List<Message>) {
         messagesDb.updateAll(messages)
     }
 
-    suspend fun deleteMessages(messages: List<Message>) {
+    fun deleteMessages(messages: List<Message>) {
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessageWithAttachment(student: Student, message: Message): Flow<MessageWithAttachment> {
+    fun getMessageWithAttachment(student: Student, message: Message): Single<MessageWithAttachment> {
         return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
     }
 
-    suspend fun saveMessageAttachments(attachments: List<MessageAttachment>) {
+    fun saveMessageAttachments(attachments: List<MessageAttachment>) {
         messageAttachmentDao.insertAttachments(attachments)
     }
 
-    fun getMessages(student: Student, folder: MessageFolder): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), folder.id)
+    fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
+        return when (folder) {
+            TRASHED -> messagesDb.loadDeleted(student.id.toInt())
+            else -> messagesDb.loadAll(student.id.toInt(), folder.id)
+        }.filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
index fdf0c6754..1808c048b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -9,7 +9,8 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.init
-import java.time.LocalDateTime.now
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -17,31 +18,32 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getMessages(student: Student, semester: Semester, folder: MessageFolder): List<Message> {
-        return sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).map {
-            Message(
-                studentId = student.id.toInt(),
-                realId = it.id ?: 0,
-                messageId = it.messageId ?: 0,
-                sender = it.sender?.name.orEmpty(),
-                senderId = it.sender?.loginId ?: 0,
-                recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
-                subject = it.subject.trim(),
-                date = it.date ?: now(),
-                folderId = it.folderId,
-                unread = it.unread ?: false,
-                unreadBy = it.unreadBy ?: 0,
-                readBy = it.readBy ?: 0,
-                removed = it.removed,
-                hasAttachments = it.hasAttachments
-            ).apply {
-                content = it.content.orEmpty()
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
+        return sdk.init(student).getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
+            messages.map {
+                Message(
+                    studentId = student.id.toInt(),
+                    realId = it.id ?: 0,
+                    messageId = it.messageId ?: 0,
+                    sender = it.sender.orEmpty(),
+                    senderId = it.senderId ?: 0,
+                    recipient = it.recipient.orEmpty(),
+                    subject = it.subject.trim(),
+                    date = it.date ?: now(),
+                    content = it.content.orEmpty(),
+                    folderId = it.folderId,
+                    unread = it.unread ?: false,
+                    unreadBy = it.unreadBy ?: 0,
+                    readBy = it.readBy ?: 0,
+                    removed = it.removed,
+                    hasAttachments = it.hasAttachments
+                )
             }
         }
     }
 
-    suspend fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Pair<String, List<MessageAttachment>> {
-        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).let { details ->
+    fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Single<Pair<String, List<MessageAttachment>>> {
+        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).map { details ->
             details.content to details.attachments.map {
                 MessageAttachment(
                     realId = it.id,
@@ -54,7 +56,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         }
     }
 
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
         return sdk.init(student).sendMessage(
             subject = subject,
             content = content,
@@ -72,7 +74,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         )
     }
 
-    suspend fun deleteMessage(student: Student, message: Message): Boolean {
-        return sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return sdk.init(student).deleteMessages(listOf(Pair(message.realId, message.folderId)))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
index f653f2683..2d2c0430c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -1,74 +1,105 @@
 package io.github.wulkanowy.data.repositories.message
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 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
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import io.reactivex.Completable
+import io.reactivex.Single
 import timber.log.Timber
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: MessageLocal,
     private val remote: MessageRemote
 ) {
 
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getMessages(student, folder) },
-        fetch = { remote.getMessages(student, semester, folder) },
-        saveFetchResult = { old, new ->
-            local.deleteMessages(old uniqueSubtract new)
-            local.saveMessages((new uniqueSubtract old).onEach {
-                it.isNotified = !notify
-            })
-        }
-    )
-
-    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
-        shouldFetch = {
-            Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
-            it.message.unread || it.message.content.isEmpty()
-        },
-        query = { local.getMessageWithAttachment(student, message) },
-        fetch = { remote.getMessagesContentDetails(student, it.message, markAsRead) },
-        saveFetchResult = { old, (downloadedMessage, attachments) ->
-            local.updateMessages(listOf(old.message.copy(unread = !markAsRead).apply {
-                id = old.message.id
-                content = content.ifBlank { downloadedMessage }
-            }))
-            local.saveMessageAttachments(attachments)
-            Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
-        }
-    )
-
-    fun getNotNotifiedMessages(student: Student): Flow<List<Message>> {
-        return local.getMessages(student, RECEIVED).map { it.filter { message -> !message.isNotified && message.unread } }
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return local.getMessages(student, folder).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getMessages(student, semester, folder)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getMessages(student, folder).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteMessages(old.uniqueSubtract(new))
+                            local.saveMessages(new.uniqueSubtract(old)
+                                .onEach {
+                                    it.isNotified = !notify
+                                })
+                        }
+                }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
+            )
     }
 
-    suspend fun updateMessages(messages: List<Message>) {
-        return local.updateMessages(messages)
+    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false): Single<MessageWithAttachment> {
+        return local.getMessageWithAttachment(student, message)
+            .filter {
+                it.message.content.isNotEmpty().also { status ->
+                    Timber.d("Message content in db empty: ${!status}")
+                } && !it.message.unread
+            }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) local.getMessageWithAttachment(student, message)
+                    else Single.error(UnknownHostException())
+                }
+                .flatMap { dbMessage ->
+                    remote.getMessagesContentDetails(student, dbMessage.message, markAsRead).doOnSuccess { (downloadedMessage, attachments) ->
+                        local.updateMessages(listOf(dbMessage.message.copy(unread = !markAsRead).apply {
+                            id = dbMessage.message.id
+                            content = content.ifBlank { downloadedMessage }
+                        }))
+                        local.saveMessageAttachments(attachments)
+                        Timber.d("Message ${message.messageId} with blank content: ${dbMessage.message.content.isBlank()}, marked as read")
+                    }
+                }.flatMap {
+                    local.getMessageWithAttachment(student, message)
+                }
+            )
     }
 
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
-        return remote.sendMessage(student, subject, content, recipients)
+    fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
+        return local.getMessages(student, RECEIVED)
+            .map { it.filter { message -> !message.isNotified && message.unread } }
+            .toSingle(emptyList())
     }
 
-    suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = remote.deleteMessage(student, message)
+    fun updateMessages(messages: List<Message>): Completable {
+        return Completable.fromCallable { local.updateMessages(messages) }
+    }
 
-        if (message.folderId != MessageFolder.TRASHED.id) {
-            if (isDeleted) local.updateMessages(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
-                id = message.id
-                content = message.content
-            }))
-        } else local.deleteMessages(listOf(message))
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.sendMessage(student, subject, content, recipients)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.deleteMessage(student, message)
+                else Single.error(UnknownHostException())
+            }
+            .doOnSuccess {
+                if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
+                    id = message.id
+                    content = message.content
+                }))
+                else local.deleteMessages(listOf(message))
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
index 0ccb3d7ef..473ffa7fe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
@@ -3,22 +3,22 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
 
-    suspend fun saveDevices(devices: List<MobileDevice>) {
+    fun saveDevices(devices: List<MobileDevice>) {
         mobileDb.insertAll(devices)
     }
 
-    suspend fun deleteDevices(devices: List<MobileDevice>) {
+    fun deleteDevices(devices: List<MobileDevice>) {
         mobileDb.deleteAll(devices)
     }
 
-    fun getDevices(semester: Semester): Flow<List<MobileDevice>> {
-        return mobileDb.loadAll(semester.studentId)
+    fun getDevices(semester: Semester): Maybe<List<MobileDevice>> {
+        return mobileDb.loadAll(semester.studentId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
index 907e965ce..800f95971 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
@@ -6,34 +6,37 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getDevices(student: Student, semester: Semester): List<MobileDevice> {
+    fun getDevices(student: Student, semester: Semester): Single<List<MobileDevice>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getRegisteredDevices()
-            .map {
-                MobileDevice(
-                    studentId = semester.studentId,
-                    date = it.createDate,
-                    deviceId = it.id,
-                    name = it.name
-                )
+            .map { devices ->
+                devices.map {
+                    MobileDevice(
+                        studentId = semester.studentId,
+                        date = it.createDate,
+                        deviceId = it.id,
+                        name = it.name
+                    )
+                }
             }
     }
 
-    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Boolean {
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .unregisterDevice(device.deviceId)
     }
 
-    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getToken()
-            .let {
+            .map {
                 MobileDeviceToken(
                     token = it.token,
                     symbol = it.symbol,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
index 65526ef86..545846e85 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
@@ -1,36 +1,53 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: MobileDeviceLocal,
     private val remote: MobileDeviceRemote
 ) {
 
-    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getDevices(semester) },
-        fetch = { remote.getDevices(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteDevices(old uniqueSubtract new)
-            local.saveDevices(new uniqueSubtract old)
-        }
-    )
-
-    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
-        remote.unregisterDevice(student, semester, device)
-        local.deleteDevices(listOf(device))
+    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+        return local.getDevices(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getDevices(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getDevices(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteDevices(old uniqueSubtract new)
+                            local.saveDevices(new uniqueSubtract old)
+                        }
+                }
+            ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
     }
 
-    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
-        return remote.getToken(student, semester)
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.unregisterDevice(student, semester, device)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getToken(student, semester)
+                else Single.error(UnknownHostException())
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
index 85ba5e223..784e61f0f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
@@ -3,26 +3,26 @@ package io.github.wulkanowy.data.repositories.note
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
 
-    suspend fun saveNotes(notes: List<Note>) {
+    fun saveNotes(notes: List<Note>) {
         noteDb.insertAll(notes)
     }
 
-    suspend fun updateNotes(notes: List<Note>) {
+    fun updateNotes(notes: List<Note>) {
         noteDb.updateAll(notes)
     }
 
-    suspend fun deleteNotes(notes: List<Note>) {
+    fun deleteNotes(notes: List<Note>) {
         noteDb.deleteAll(notes)
     }
 
-    fun getNotes(student: Student): Flow<List<Note>> {
-        return noteDb.loadAll(student.studentId)
+    fun getNotes(student: Student): Maybe<List<Note>> {
+        return noteDb.loadAll(student.studentId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index 0e488b7d9..2c62b608d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -5,27 +5,30 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getNotes(student: Student, semester: Semester): List<Note> {
+    fun getNotes(student: Student, semester: Semester): Single<List<Note>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getNotes(semester.semesterId)
-            .map {
-                Note(
-                    studentId = semester.studentId,
-                    date = it.date,
-                    teacher = it.teacher,
-                    teacherSymbol = it.teacherSymbol,
-                    category = it.category,
-                    categoryType = it.categoryType.id,
-                    isPointsShow = it.showPoints,
-                    points = it.points,
-                    content = it.content
-                )
+            .map { notes ->
+                notes.map {
+                    Note(
+                        studentId = semester.studentId,
+                        date = it.date,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        category = it.category,
+                        categoryType = it.categoryType.id,
+                        isPointsShow = it.showPoints,
+                        points = it.points,
+                        content = it.content
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index 6cf62ba22..e155e2bad 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -1,45 +1,54 @@
 package io.github.wulkanowy.data.repositories.note
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 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.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: NoteLocal,
     private val remote: NoteRemote
 ) {
 
-    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getNotes(student) },
-        fetch = { remote.getNotes(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteNotes(old uniqueSubtract new)
-            local.saveNotes((new uniqueSubtract old).onEach {
-                if (it.date >= student.registrationDate.toLocalDate()) it.apply {
-                    isRead = false
-                    if (notify) isNotified = false
-                }
-            })
-        }
-    )
-
-    fun getNotNotifiedNotes(student: Student): Flow<List<Note>> {
-        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }
+    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
+        return local.getNotes(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getNotes(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getNotes(student).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteNotes(old.uniqueSubtract(new))
+                            local.saveNotes(new.uniqueSubtract(old)
+                                .onEach {
+                                    if (it.date >= student.registrationDate.toLocalDate()) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
+                                })
+                        }
+                }.flatMap { local.getNotes(student).toSingle(emptyList()) })
     }
 
-    suspend fun updateNote(note: Note) {
-        local.updateNotes(listOf(note))
+    fun getNotNotifiedNotes(student: Student): Single<List<Note>> {
+        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }.toSingle(emptyList())
     }
 
-    suspend fun updateNotes(notes: List<Note>) {
-        return local.updateNotes(notes)
+    fun updateNote(note: Note): Completable {
+        return Completable.fromCallable { local.updateNotes(listOf(note)) }
+    }
+
+    fun updateNotes(notes: List<Note>): Completable {
+        return Completable.fromCallable { local.updateNotes(notes) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index 1d5e57f8a..523caf6c9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -2,16 +2,14 @@ package io.github.wulkanowy.data.repositories.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class PreferencesRepository @Inject constructor(
     private val sharedPref: SharedPreferences,
-    @ApplicationContext val context: Context
+    val context: Context
 ) {
     val startMenuIndex: Int
         get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
@@ -19,8 +17,8 @@ class PreferencesRepository @Inject constructor(
     val isShowPresent: Boolean
         get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
 
-    val gradeAverageMode: GradeAverageMode
-        get() = GradeAverageMode.getByValue(getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode))
+    val gradeAverageMode: String
+        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
 
     val gradeAverageForceCalc: Boolean
         get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
@@ -28,9 +26,6 @@ class PreferencesRepository @Inject constructor(
     val isGradeExpandable: Boolean
         get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
-    val showAllSubjectsOnStatisticsList: Boolean
-        get() = getBoolean(R.string.pref_key_grade_statistics_list, R.bool.pref_default_grade_statistics_list)
-
     val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
         get() = getString(appThemeKey, R.string.pref_default_app_theme)
@@ -57,10 +52,6 @@ class PreferencesRepository @Inject constructor(
     val isNotificationsEnable: Boolean
         get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isUpcomingLessonsNotificationsEnableKey = context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
-    val isUpcomingLessonsNotificationsEnable: Boolean
-        get() = getBoolean(isUpcomingLessonsNotificationsEnableKey, R.bool.pref_default_notification_upcoming_lessons_enable)
-
     val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
         get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
@@ -77,9 +68,6 @@ class PreferencesRepository @Inject constructor(
     val showWholeClassPlan: String
         get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
 
-    val showTimetableTimers: Boolean
-        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
-
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
     private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
index fac1645e4..9b1d4ac2f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -4,21 +4,22 @@ import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao) {
 
-    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
-        return recipientDb.load(student.studentId, role, unit.realId)
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Maybe<List<Recipient>> {
+        return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
     }
 
-    suspend fun saveRecipients(recipients: List<Recipient>): List<Long> {
+    fun saveRecipients(recipients: List<Recipient>): List<Long> {
         return recipientDb.insertAll(recipients)
     }
 
-    suspend fun deleteRecipients(recipients: List<Recipient>) {
+    fun deleteRecipients(recipients: List<Recipient>) {
         recipientDb.deleteAll(recipients)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
index a5318e77f..e5b16a156 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -13,14 +14,18 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Single<List<Recipient>> {
         return sdk.init(student).getRecipients(unit.realId, role)
-            .map { it.toRecipient() }
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
     }
 
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
         return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
-            .map { it.toRecipient() }
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
     }
 
     private fun SdkRecipient.toRecipient(): Recipient {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
index f5e876b03..6f8a72af2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -1,36 +1,47 @@
 package io.github.wulkanowy.data.repositories.recipient
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecipientRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
     private val remote: RecipientRemote
 ) {
 
-    suspend fun refreshRecipients(student: Student, role: Int, unit: ReportingUnit) {
-        val new = remote.getRecipients(student, role, unit)
-        val old = local.getRecipients(student, role, unit)
-
-        local.deleteRecipients(old uniqueSubtract new)
-        local.saveRecipients(new uniqueSubtract old)
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
+        return local.getRecipients(student, role, unit).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getRecipients(student, role, unit)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteRecipients(old.uniqueSubtract(new))
+                            local.saveRecipients(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getRecipients(student, role, unit).toSingle(emptyList())
+                }
+            )
     }
 
-    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
-        return local.getRecipients(student, role, unit).ifEmpty {
-            refreshRecipients(student, role, unit)
-
-            local.getRecipients(student, role, unit)
-        }
-    }
-
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return remote.getMessageRecipients(student, message)
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getMessageRecipients(student, message)
+                else Single.error(UnknownHostException())
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
index 11eac71e0..f27891250 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
@@ -1,17 +1,18 @@
 package io.github.wulkanowy.data.repositories.recover
 
 import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecoverRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
         return sdk.getPasswordResetCaptchaCode(host, symbol)
     }
 
-    suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
         return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
index 3117a606a..86d4ba1b3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
@@ -1,16 +1,26 @@
 package io.github.wulkanowy.data.repositories.recover
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class RecoverRepository @Inject constructor(private val remote: RecoverRemote) {
+class RecoverRepository @Inject constructor(private val settings: InternetObservingSettings, private val remote: RecoverRemote) {
 
-    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
-        return remote.getReCaptchaSiteKey(host, symbol)
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getReCaptchaSiteKey(host, symbol)
+            else Single.error(UnknownHostException())
+        }
     }
 
-    suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
-        return remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+            else Single.error(UnknownHostException())
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
index 737f1a04f..6f9eec3fc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -3,25 +3,26 @@ package io.github.wulkanowy.data.repositories.reportingunit
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: ReportingUnitDao) {
 
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return reportingUnitDb.load(student.studentId)
+    fun getReportingUnits(student: Student): Maybe<List<ReportingUnit>> {
+        return reportingUnitDb.load(student.studentId).filter { !it.isEmpty() }
     }
 
-    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
         return reportingUnitDb.loadOne(student.studentId, unitId)
     }
 
-    suspend fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 
-    suspend fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
+    fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
         reportingUnitDb.deleteAll(reportingUnits)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
index 6b11c2cc9..1fd8b08e3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -4,22 +4,25 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return sdk.init(student).getReportingUnits().map { unit ->
-            ReportingUnit(
-                studentId = sdk.studentId,
-                realId = unit.id,
-                roles = unit.roles,
-                senderId = unit.senderId,
-                senderName = unit.senderName,
-                shortName = unit.short
-            )
+    fun getReportingUnits(student: Student): Single<List<ReportingUnit>> {
+        return sdk.init(student).getReportingUnits().map {
+            it.map { unit ->
+                ReportingUnit(
+                    studentId = sdk.studentId,
+                    realId = unit.id,
+                    roles = unit.roles,
+                    senderId = unit.senderId,
+                    senderName = unit.senderName,
+                    shortName = unit.short
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
index ff5839460..ee5440984 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -1,38 +1,48 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
     private val remote: ReportingUnitRemote
 ) {
 
-    suspend fun refreshReportingUnits(student: Student) {
-        val new = remote.getReportingUnits(student)
-        val old = local.getReportingUnits(student)
-
-        local.deleteReportingUnits(old.uniqueSubtract(new))
-        local.saveReportingUnits(new.uniqueSubtract(old))
+    fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
+        return local.getReportingUnits(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getReportingUnits(student)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getReportingUnits(student).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteReportingUnits(old.uniqueSubtract(new))
+                            local.saveReportingUnits(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
+            )
     }
 
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return local.getReportingUnits(student).ifEmpty {
-            refreshReportingUnits(student)
-
-            local.getReportingUnits(student)
-        }
-    }
-
-    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        return local.getReportingUnit(student, unitId) ?: run {
-            refreshReportingUnits(student)
-
-            return local.getReportingUnit(student, unitId)
-        }
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return local.getReportingUnit(student, unitId)
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) getReportingUnits(student, true)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe {
+                    local.getReportingUnit(student, unitId)
+                }
+            )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
index bc1b2f446..d87272875 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
@@ -3,20 +3,20 @@ package io.github.wulkanowy.data.repositories.school
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 
 class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
 
-    suspend fun saveSchool(school: School) {
+    fun saveSchool(school: School) {
         schoolDb.insertAll(listOf(school))
     }
 
-    suspend fun deleteSchool(school: School) {
+    fun deleteSchool(school: School) {
         schoolDb.deleteAll(listOf(school))
     }
 
-    fun getSchool(semester: Semester): Flow<School?> {
+    fun getSchool(semester: Semester): Maybe<School> {
         return schoolDb.load(semester.studentId, semester.classId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
index 4d2e0cd6c..6a95a446b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
@@ -5,14 +5,15 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 
 class SchoolRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getSchoolInfo(student: Student, semester: Semester): School {
+    fun getSchoolInfo(student: Student, semester: Semester): Single<School> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getSchool()
-            .let {
+            .map {
                 School(
                     studentId = semester.studentId,
                     classId = semester.classId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
index 4c84c3194..1715a28d5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
@@ -1,27 +1,42 @@
 package io.github.wulkanowy.data.repositories.school
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SchoolRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: SchoolLocal,
     private val remote: SchoolRemote
 ) {
 
-    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it == null || forceRefresh },
-        query = { local.getSchool(semester) },
-        fetch = { remote.getSchoolInfo(student, semester) },
-        saveFetchResult = { old, new ->
-            if (new != old && old != null) {
-                local.deleteSchool(old)
-                local.saveSchool(new)
-            }
-            local.saveSchool(new)
-        }
-    )
+    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+        return local.getSchool(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSchoolInfo(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe { new ->
+                    local.getSchool(semester)
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteSchool(old)
+                                local.saveSchool(new)
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveSchool(new)
+                        }
+                }.flatMap({ local.getSchool(semester) }, { Maybe.error(it) },
+                    { local.getSchool(semester) })
+            )
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index 8ecf1595a..3d98785cd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -3,21 +3,22 @@ package io.github.wulkanowy.data.repositories.semester
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
 
-    suspend fun saveSemesters(semesters: List<Semester>) {
-        semesterDb.insertSemesters(semesters)
+    fun saveSemesters(semesters: List<Semester>) {
+        semesterDb.insertAll(semesters)
     }
 
-    suspend fun deleteSemesters(semesters: List<Semester>) {
+    fun deleteSemesters(semesters: List<Semester>) {
         semesterDb.deleteAll(semesters)
     }
 
-    suspend fun getSemesters(student: Student): List<Semester> {
-        return semesterDb.loadAll(student.studentId, student.classId)
+    fun getSemesters(student: Student): Maybe<List<Semester>> {
+        return semesterDb.loadAll(student.studentId, student.classId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index e1a920b6f..90f0e1d71 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -4,26 +4,29 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getSemesters(student: Student): List<Semester> {
-        return sdk.init(student).getSemesters().map {
-            Semester(
-                studentId = student.studentId,
-                diaryId = it.diaryId,
-                diaryName = it.diaryName,
-                schoolYear = it.schoolYear,
-                semesterId = it.semesterId,
-                semesterName = it.semesterNumber,
-                start = it.start,
-                end = it.end,
-                classId = it.classId,
-                unitId = it.unitId
-            )
+    fun getSemesters(student: Student): Single<List<Semester>> {
+        return sdk.init(student).getSemesters().map { semesters ->
+            semesters.map {
+                Semester(
+                    studentId = student.studentId,
+                    diaryId = it.diaryId,
+                    diaryName = it.diaryName,
+                    schoolYear = it.schoolYear,
+                    semesterId = it.semesterId,
+                    semesterName = it.semesterNumber,
+                    start = it.start,
+                    end = it.end,
+                    classId = it.classId,
+                    unitId = it.unitId
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index 7a76503f2..68946beef 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -1,13 +1,15 @@
 package io.github.wulkanowy.data.repositories.semester
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.getCurrentOrLast
 import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.withContext
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,40 +17,31 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val dispatchers: DispatchersProvider
+    private val settings: InternetObservingSettings
 ) {
 
-    suspend fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false) = withContext(dispatchers.backgroundThread) {
-        val semesters = local.getSemesters(student)
+    fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
+        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
+            when {
+                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
+                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
+                else -> true
+            }
+        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getSemesters(student)
+                else Single.error(UnknownHostException())
+            }.flatMap { new ->
+                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
 
-        if (isShouldFetch(student, semesters, forceRefresh, refreshOnNoCurrent)) {
-            refreshSemesters(student)
-            local.getSemesters(student)
-        } else semesters
+                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
+                    local.deleteSemesters(old.uniqueSubtract(new))
+                    local.saveSemesters(new.uniqueSubtract(old))
+                }
+            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
     }
 
-    private fun isShouldFetch(student: Student, semesters: List<Semester>, forceRefresh: Boolean, refreshOnNoCurrent: Boolean): Boolean {
-        val isNoSemesters = semesters.isEmpty()
-
-        val isRefreshOnModeChangeRequired = if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-            semesters.firstOrNull { it.isCurrent }?.diaryId == 0
-        } else false
-
-        val isRefreshOnNoCurrentAppropriate = refreshOnNoCurrent && !semesters.any { semester -> semester.isCurrent }
-
-        return forceRefresh || isNoSemesters || isRefreshOnModeChangeRequired || isRefreshOnNoCurrentAppropriate
-    }
-
-    private suspend fun refreshSemesters(student: Student) {
-        val new = remote.getSemesters(student)
-        if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
-
-        val old = local.getSemesters(student)
-        local.deleteSemesters(old.uniqueSubtract(new))
-        local.saveSemesters(new.uniqueSubtract(old))
-    }
-
-    suspend fun getCurrentSemester(student: Student, forceRefresh: Boolean = false) = withContext(dispatchers.backgroundThread) {
-        getSemesters(student, forceRefresh).getCurrentOrLast()
+    fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
+        return getSemesters(student, forceRefresh).map { it.getCurrentOrLast() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index c01d1d049..06b9bb4ac 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -1,59 +1,64 @@
 package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
-import kotlinx.coroutines.withContext
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentLocal @Inject constructor(
     private val studentDb: StudentDao,
-    private val dispatchers: DispatchersProvider,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) {
 
-    suspend fun saveStudents(students: List<Student>) = withContext(dispatchers.backgroundThread) {
-        studentDb.insertAll(students.map {
-            if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
-            else it
-        })
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return Single.fromCallable {
+            studentDb.insertAll(students.map {
+                if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
+                else it
+            })
+        }
     }
 
-    suspend fun getStudents(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
-        studentDb.loadStudentsWithSemesters().map {
+    fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
+        return studentDb.loadAll()
+            .map { list -> list.map { it.apply { if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password) } } }
+            .filter { it.isNotEmpty() }
+    }
+
+    fun getStudentById(id: Int): Maybe<Student> {
+        return studentDb.loadById(id).map {
             it.apply {
-                if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) student.password = decrypt(student.password)
+                if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
             }
         }
     }
 
-    suspend fun getStudentById(id: Int) = withContext(dispatchers.backgroundThread) {
-        studentDb.loadById(id)?.apply {
-            if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+    fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
+        return studentDb.loadCurrent().map {
+            it.apply {
+                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
         }
     }
 
-    suspend fun getCurrentStudent(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
-        studentDb.loadCurrent()?.apply {
-            if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+    fun setCurrentStudent(student: Student): Completable {
+        return Completable.fromCallable {
+            studentDb.run {
+                resetCurrent()
+                updateCurrent(student.id)
+            }
         }
     }
 
-    suspend fun setCurrentStudent(student: Student) = withContext(dispatchers.backgroundThread) {
-        studentDb.run {
-            resetCurrent()
-            updateCurrent(student.id)
-        }
-    }
-
-    suspend fun logoutStudent(student: Student) = withContext(dispatchers.backgroundThread) {
-        studentDb.delete(student)
+    fun logoutStudent(student: Student): Completable {
+        return Completable.fromCallable { studentDb.delete(student) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
index dcb126233..9b77c9ad3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -1,23 +1,52 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
+import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
 @Singleton
 class StudentRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getStudentsMobileApi(token: String, pin: String, symbol: String): List<StudentWithSemesters> {
-        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").mapToEntities()
+    private fun mapStudents(students: List<SdkStudent>, email: String, password: String): List<Student> {
+        return students.map { student ->
+            Student(
+                email = email,
+                password = password,
+                isParent = student.isParent,
+                symbol = student.symbol,
+                studentId = student.studentId,
+                userLoginId = student.userLoginId,
+                studentName = student.studentName,
+                schoolSymbol = student.schoolSymbol,
+                schoolShortName = student.schoolShortName,
+                schoolName = student.schoolName,
+                className = student.className,
+                classId = student.classId,
+                scrapperBaseUrl = student.scrapperBaseUrl,
+                loginType = student.loginType.name,
+                isCurrent = false,
+                registrationDate = now(),
+                mobileBaseUrl = student.mobileBaseUrl,
+                privateKey = student.privateKey,
+                certificateKey = student.certificateKey,
+                loginMode = student.loginMode.name
+            )
+        }
     }
 
-    suspend fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): List<StudentWithSemesters> {
-        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).mapToEntities(password)
+    fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromMobileApi(token, pin, symbol).map { mapStudents(it, "", "") }
     }
 
-    suspend fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): List<StudentWithSemesters> {
-        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).mapToEntities(password)
+    fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    }
+
+    fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index 19e0e2086..bebd1eb9c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -1,57 +1,73 @@
 package io.github.wulkanowy.data.repositories.student
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.semester.SemesterLocal
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentRepository @Inject constructor(
     private val local: StudentLocal,
-    private val semestersLocal: SemesterLocal,
-    private val remote: StudentRemote
+    private val remote: StudentRemote,
+    private val settings: InternetObservingSettings
 ) {
 
-    suspend fun isStudentSaved(): Boolean = local.getStudents(false).isNotEmpty()
+    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
-    suspend fun isCurrentStudentSet(): Boolean = local.getCurrentStudent(false)?.isCurrent ?: false
+    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
 
-    suspend fun getStudentsApi(pin: String, symbol: String, token: String): List<StudentWithSemesters> {
-        return remote.getStudentsMobileApi(token, pin, symbol)
+    fun getStudentsApi(pin: String, symbol: String, token: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsMobileApi(token, pin, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
-    suspend fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): List<StudentWithSemesters> {
-        return remote.getStudentsScrapper(email, password, endpoint, symbol)
+    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsScrapper(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
-    suspend fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): List<StudentWithSemesters> {
-        return remote.getStudentsHybrid(email, password, endpoint, symbol)
+    fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getStudentsHybrid(email, password, endpoint, symbol)
+            else Single.error(UnknownHostException("No internet connection"))
+        }
     }
 
-    suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
-        return local.getStudents(decryptPass)
+    fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
+        return local.getStudents(decryptPass).toSingle(emptyList())
     }
 
-    suspend fun getStudentById(id: Int): Student {
-        return local.getStudentById(id) ?: throw NoCurrentStudentException()
+    fun getStudentById(id: Int): Single<Student> {
+        return local.getStudentById(id)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
     }
 
-    suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
-        return local.getCurrentStudent(decryptPass) ?: throw NoCurrentStudentException()
+    fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
+        return local.getCurrentStudent(decryptPass)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
     }
 
-    suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>): List<Long> {
-        semestersLocal.saveSemesters(studentsWithSemesters.flatMap { it.semesters })
-        return local.saveStudents(studentsWithSemesters.map { it.student })
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return local.saveStudents(students)
     }
 
-    suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
-        return local.setCurrentStudent(studentWithSemesters.student)
+    fun switchStudent(student: Student): Completable {
+        return local.setCurrentStudent(student)
     }
 
-    suspend fun logoutStudent(student: Student) {
+    fun logoutStudent(student: Student): Completable {
         return local.logoutStudent(student)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index e225a381e..f8c13e6c2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -3,22 +3,23 @@ package io.github.wulkanowy.data.repositories.subject
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
 
-    fun getSubjects(semester: Semester): Flow<List<Subject>> {
+    fun getSubjects(semester: Semester): Maybe<List<Subject>> {
         return subjectDao.loadAll(semester.diaryId, semester.studentId)
+            .filter { it.isNotEmpty() }
     }
 
-    suspend fun saveSubjects(subjects: List<Subject>) {
+    fun saveSubjects(subjects: List<Subject>) {
         subjectDao.insertAll(subjects)
     }
 
-    suspend fun deleteSubjects(subjects: List<Subject>) {
+    fun deleteSubjects(subjects: List<Subject>) {
         subjectDao.deleteAll(subjects)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index 624a5a00a..d30232f82 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -5,22 +5,25 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getSubjects(student: Student, semester: Semester): List<Subject> {
+    fun getSubjects(student: Student, semester: Semester): Single<List<Subject>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getSubjects()
-            .map {
-                Subject(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    name = it.name,
-                    realId = it.id
-                )
+            .map { subjects ->
+                subjects.map {
+                    Subject(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        name = it.name,
+                        realId = it.id
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index 60a0c3e71..649904da1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -1,25 +1,38 @@
 package io.github.wulkanowy.data.repositories.subject
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: SubjectLocal,
     private val remote: SubjectRemote
 ) {
 
-    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getSubjects(semester) },
-        fetch = { remote.getSubjects(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteSubjects(old uniqueSubtract new)
-            local.saveSubjects(new uniqueSubtract old)
-        }
-    )
+    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
+        return local.getSubjects(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSubjects(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getSubjects(semester)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteSubjects(old.uniqueSubtract(new))
+                            local.saveSubjects(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getSubjects(semester).toSingle(emptyList())
+                })
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
index 908f45a1a..dd2be5e58 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
@@ -3,20 +3,20 @@ package io.github.wulkanowy.data.repositories.teacher
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Inject
 
 class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
 
-    suspend fun saveTeachers(teachers: List<Teacher>) {
+    fun saveTeachers(teachers: List<Teacher>) {
         teacherDb.insertAll(teachers)
     }
 
-    suspend fun deleteTeachers(teachers: List<Teacher>) {
+    fun deleteTeachers(teachers: List<Teacher>) {
         teacherDb.deleteAll(teachers)
     }
 
-    fun getTeachers(semester: Semester): Flow<List<Teacher>> {
-        return teacherDb.loadAll(semester.studentId, semester.classId)
+    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
+        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
index 1d1caa686..01552f748 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
@@ -5,23 +5,26 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
+import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TeacherRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getTeachers(student: Student, semester: Semester): List<Teacher> {
+    fun getTeachers(student: Student, semester: Semester): Single<List<Teacher>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getTeachers(semester.semesterId)
-            .map {
-                Teacher(
-                    studentId = semester.studentId,
-                    name = it.name,
-                    subject = it.subject,
-                    shortName = it.short,
-                    classId = semester.classId
-                )
+            .map { teachers ->
+                teachers.map {
+                    Teacher(
+                        studentId = semester.studentId,
+                        name = it.name,
+                        subject = it.subject,
+                        shortName = it.short,
+                        classId = semester.classId
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
index df25a53ec..3c10be73f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
@@ -1,25 +1,35 @@
 package io.github.wulkanowy.data.repositories.teacher
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TeacherRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: TeacherLocal,
     private val remote: TeacherRemote
 ) {
 
-    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getTeachers(semester) },
-        fetch = { remote.getTeachers(student, semester) },
-        saveFetchResult = { old, new ->
-            local.deleteTeachers(old uniqueSubtract new)
-            local.saveTeachers(new uniqueSubtract old)
-        }
-    )
+    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+        return local.getTeachers(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getTeachers(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTeachers(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTeachers(old.uniqueSubtract(new))
+                            local.saveTeachers(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getTeachers(semester).toSingle(emptyList()) })
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
index df4bfb20a..e074ce2a1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.timetable
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
 
-    suspend fun saveTimetable(timetables: List<Timetable>) {
+    fun saveTimetable(timetables: List<Timetable>) {
         timetableDb.insertAll(timetables)
     }
 
-    suspend fun deleteTimetable(timetables: List<Timetable>) {
+    fun deleteTimetable(timetables: List<Timetable>) {
         timetableDb.deleteAll(timetables)
     }
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Timetable>> {
-        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
+        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index eef8729e8..22cb947db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -5,36 +5,39 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableRemote @Inject constructor(private val sdk: Sdk) {
 
-    suspend fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Timetable> {
+    fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
         return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
             .getTimetable(startDate, endDate)
-            .map {
-                Timetable(
-                    studentId = semester.studentId,
-                    diaryId = semester.diaryId,
-                    number = it.number,
-                    start = it.start,
-                    end = it.end,
-                    date = it.date,
-                    subject = it.subject,
-                    subjectOld = it.subjectOld,
-                    group = it.group,
-                    room = it.room,
-                    roomOld = it.roomOld,
-                    teacher = it.teacher,
-                    teacherOld = it.teacherOld,
-                    info = it.info,
-                    isStudentPlan = it.studentPlan,
-                    changes = it.changes,
-                    canceled = it.canceled
-                )
+            .map { lessons ->
+                lessons.map {
+                    Timetable(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        number = it.number,
+                        start = it.start,
+                        end = it.end,
+                        date = it.date,
+                        subject = it.subject,
+                        subjectOld = it.subjectOld,
+                        group = it.group,
+                        room = it.room,
+                        roomOld = it.roomOld,
+                        teacher = it.teacher,
+                        teacherOld = it.teacherOld,
+                        info = it.info,
+                        isStudentPlan = it.studentPlan,
+                        changes = it.changes,
+                        canceled = it.canceled
+                    )
+                }
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index ee2734aaf..42812b30f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -1,41 +1,51 @@
 package io.github.wulkanowy.data.repositories.timetable
 
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.utils.friday
 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.map
-import java.time.LocalDate
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
     private val local: TimetableLocal,
-    private val remote: TimetableRemote,
-    private val schedulerHelper: TimetableNotificationSchedulerHelper
+    private val remote: TimetableRemote
 ) {
 
-    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { local.getTimetable(semester, start.monday, end.sunday).map { schedulerHelper.scheduleNotifications(it, student); it } },
-        fetch = { remote.getTimetable(student, semester, start.monday, end.sunday) },
-        saveFetchResult = { old, new ->
-            local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
-            local.saveTimetable(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
-                        )
-                    }
-                }
-            })
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
+    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
+            local.getTimetable(semester, monday, friday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                    if (it) remote.getTimetable(student, semester, monday, friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTimetable(semester, monday, friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTimetable(old.uniqueSubtract(new))
+                            local.saveTimetable(new.uniqueSubtract(old).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
+                                        )
+                                    }
+                                }
+                            })
+                        }
+                }.flatMap {
+                    local.getTimetable(semester, monday, friday).toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
new file mode 100644
index 000000000..c0329f7d7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -0,0 +1,22 @@
+package io.github.wulkanowy.di
+
+import dagger.Component
+import dagger.android.AndroidInjector
+import dagger.android.support.AndroidSupportInjectionModule
+import io.github.wulkanowy.WulkanowyApp
+import io.github.wulkanowy.data.RepositoryModule
+import io.github.wulkanowy.services.ServicesModule
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [
+    AndroidSupportInjectionModule::class,
+    AppModule::class,
+    RepositoryModule::class,
+    ServicesModule::class,
+    BindingModule::class])
+interface AppComponent : AndroidInjector<WulkanowyApp> {
+
+    @Component.Factory
+    interface Factory : AndroidInjector.Factory<WulkanowyApp>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index 9133c34ed..4f5683850 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -5,23 +5,34 @@ import android.content.Context
 import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.utils.DispatchersProvider
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.WulkanowyApp
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Singleton
 
 @Module
-@InstallIn(ApplicationComponent::class)
 internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideDispatchersProvider() = DispatchersProvider()
+    fun provideContext(app: WulkanowyApp): Context = app
 
     @Singleton
     @Provides
-    fun provideAppWidgetManager(@ApplicationContext context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+    fun provideSchedulersProvider() = SchedulersProvider()
+
+    @Provides
+    fun provideFlexibleAdapter() = FlexibleAdapter<AbstractFlexibleItem<*>>(null, null, true)
+
+    @Singleton
+    @Provides
+    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+
+    @Singleton
+    @Provides
+    fun provideAppInfo() = AppInfo()
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
new file mode 100644
index 000000000..ba8c78d3f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
@@ -0,0 +1,51 @@
+package io.github.wulkanowy.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainModule
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
+import io.github.wulkanowy.ui.modules.splash.SplashActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
+
+@Suppress("unused")
+@Module
+internal abstract class BindingModule {
+
+    @ContributesAndroidInjector
+    abstract fun bindErrorDialog(): ErrorDialog
+
+    @PerActivity
+    @ContributesAndroidInjector
+    abstract fun bindSplashActivity(): SplashActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(modules = [LoginModule::class])
+    abstract fun bindLoginActivity(): LoginActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(modules = [MainModule::class])
+    abstract fun bindMainActivity(): MainActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindMessageSendActivity(): SendMessageActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
new file mode 100644
index 000000000..c1b4352a4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.di.scopes
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PerActivity
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
new file mode 100644
index 000000000..08884dac5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.di.scopes
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PerChildFragment
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
new file mode 100644
index 000000000..1203d7d88
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.di.scopes
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PerFragment
diff --git a/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
deleted file mode 100644
index 1e795d439..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.github.wulkanowy.services
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-abstract class HiltBroadcastReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {}
-}
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 ac5a84e8f..7240a50bb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -1,16 +1,13 @@
 package io.github.wulkanowy.services
 
-import android.app.AlarmManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.getSystemService
 import androidx.work.WorkManager
+import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
-import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoSet
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.services.sync.channels.DebugChannel
@@ -19,12 +16,12 @@ import io.github.wulkanowy.services.sync.channels.NewGradesChannel
 import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.services.sync.channels.NewNotesChannel
 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.ExamWork
 import io.github.wulkanowy.services.sync.works.GradeStatisticsWork
+import io.github.wulkanowy.services.sync.works.GradeSummaryWork
 import io.github.wulkanowy.services.sync.works.GradeWork
 import io.github.wulkanowy.services.sync.works.HomeworkWork
 import io.github.wulkanowy.services.sync.works.LuckyNumberWork
@@ -34,27 +31,27 @@ import io.github.wulkanowy.services.sync.works.RecipientWork
 import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
 @Suppress("unused")
-@Module
-@InstallIn(ApplicationComponent::class)
+@AssistedModule
+@Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
 
     companion object {
 
         @Provides
-        fun provideWorkManager(@ApplicationContext context: Context) = WorkManager.getInstance(context)
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
         @Singleton
         @Provides
-        fun provideNotificationManager(@ApplicationContext context: Context) = NotificationManagerCompat.from(context)
-
-        @Singleton
-        @Provides
-        fun provideAlarmManager(@ApplicationContext context: Context): AlarmManager = context.getSystemService()!!
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
     }
 
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+
     @Binds
     @IntoSet
     abstract fun provideGradeWork(work: GradeWork): Work
@@ -67,6 +64,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideAttendanceWork(work: AttendanceWork): Work
 
+    @Binds
+    @IntoSet
+    abstract fun provideGradeSummaryWork(work: GradeSummaryWork): Work
+
     @Binds
     @IntoSet
     abstract fun provideExamWork(work: ExamWork): Work
@@ -130,8 +131,4 @@ abstract class ServicesModule {
     @Binds
     @IntoSet
     abstract fun providePushChannel(channel: PushChannel): Channel
-
-    @Binds
-    @IntoSet
-    abstract fun provideUpcomingLessonsChannel(channel: UpcomingLessonsChannel): 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
deleted file mode 100644
index 592d0919e..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-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
-import android.content.Intent
-import android.os.Build
-import android.os.Build.VERSION_CODES.N
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
-import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
-import io.github.wulkanowy.ui.modules.main.MainActivity
-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.GlobalScope
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TimetableNotificationReceiver : HiltBroadcastReceiver() {
-
-    @Inject
-    lateinit var studentRepository: StudentRepository
-
-    companion object {
-        const val NOTIFICATION_TYPE_CURRENT = 1
-        const val NOTIFICATION_TYPE_UPCOMING = 2
-        const val NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION = 3
-
-        const val NOTIFICATION_ID = "id"
-
-        const val STUDENT_NAME = "student_name"
-        const val STUDENT_ID = "student_id"
-        const val LESSON_TYPE = "type"
-        const val LESSON_TITLE = "title"
-        const val LESSON_ROOM = "room"
-        const val LESSON_NEXT_TITLE = "next_title"
-        const val LESSON_NEXT_ROOM = "next_room"
-        const val LESSON_START = "start_timestamp"
-        const val LESSON_END = "end_timestamp"
-    }
-
-    @SuppressLint("CheckResult")
-    override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
-        Timber.d("Receiving intent... ${intent.toUri(0)}")
-
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent(false)
-            val studentId = intent.getIntExtra(STUDENT_ID, 0)
-            if (student.studentId == studentId) prepareNotification(context, intent)
-            else Timber.d("Notification studentId($studentId) differs from current(${student.studentId})")
-        }.onEach {
-            if (it.status == Status.ERROR) Timber.e(it.error!!)
-        }.launchIn(GlobalScope)
-    }
-
-    private fun prepareNotification(context: Context, intent: Intent) {
-        val type = intent.getIntExtra(LESSON_TYPE, 0)
-        val notificationId = intent.getIntExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
-
-        if (type == NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION) {
-            return NotificationManagerCompat.from(context).cancel(notificationId)
-        }
-
-        val studentId = intent.getIntExtra(STUDENT_ID, 0)
-        val studentName = intent.getStringExtra(STUDENT_NAME)
-
-        val subject = intent.getStringExtra(LESSON_TITLE)
-        val room = intent.getStringExtra(LESSON_ROOM)
-
-        val start = intent.getLongExtra(LESSON_START, 0)
-        val end = intent.getLongExtra(LESSON_END, 0)
-
-        val nextSubject = intent.getStringExtra(LESSON_NEXT_TITLE)
-        val nextRoom = intent.getStringExtra(LESSON_NEXT_ROOM)
-
-        Timber.d("TimetableNotification receive: type: $type, subject: $subject, start: ${start.toLocalDateTime()}, student: $studentId")
-
-        showNotification(context, notificationId, studentName,
-            if (type == NOTIFICATION_TYPE_CURRENT) end else start, end - start,
-            context.getString(if (type == NOTIFICATION_TYPE_CURRENT) R.string.timetable_now else R.string.timetable_next, "($room) $subject".removePrefix("()")),
-            nextSubject?.let { context.getString(R.string.timetable_later, "($nextRoom) $nextSubject".removePrefix("()")) }
-        )
-    }
-
-    private fun showNotification(context: Context, notificationId: Int, studentName: String?, countDown: Long, timeout: Long, title: String, next: String?) {
-        NotificationManagerCompat.from(context).notify(notificationId, NotificationCompat.Builder(context, CHANNEL_ID)
-            .setContentTitle(title)
-            .setContentText(next)
-            .setAutoCancel(false)
-            .setOngoing(true)
-            .setWhen(countDown)
-            .apply {
-                if (Build.VERSION.SDK_INT >= N) setUsesChronometer(true)
-            }
-            .setTimeoutAfter(timeout)
-            .setSmallIcon(R.drawable.ic_stat_timetable)
-            .setColor(context.getCompatColor(R.color.colorPrimary))
-            .setStyle(NotificationCompat.InboxStyle().also {
-                it.setSummaryText(studentName)
-                it.addLine(next)
-            })
-            .setContentIntent(PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
-                MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
-            .build()
-        )
-    }
-}
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
deleted file mode 100644
index 8f8782a2f..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package io.github.wulkanowy.services.alarm
-
-import android.app.AlarmManager
-import android.app.AlarmManager.RTC_WAKEUP
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import android.content.Intent
-import androidx.core.app.AlarmManagerCompat
-import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_END
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_ROOM
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_TITLE
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_ROOM
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_START
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TITLE
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TYPE
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_ID
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_CURRENT
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_UPCOMING
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_ID
-import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_NAME
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.toTimestamp
-import timber.log.Timber
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
-import javax.inject.Inject
-
-class TimetableNotificationSchedulerHelper @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val alarmManager: AlarmManager,
-    private val preferencesRepository: PreferencesRepository
-) {
-
-    private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
-
-    private fun getUpcomingLessonTime(index: Int, day: List<Timetable>, lesson: Timetable): LocalDateTime {
-        return day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
-    }
-
-    fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
-        lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
-            val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
-            cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
-            cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
-
-            Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
-        }
-    }
-
-    private fun cancelScheduledTo(range: ClosedRange<LocalDateTime>, requestCode: Int) {
-        if (now() in range) cancelNotification()
-        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT))
-    }
-
-    fun cancelNotification() = NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
-
-    fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
-        if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) return cancelScheduled(lessons, student.studentId)
-
-        lessons.groupBy { it.date }
-            .map { it.value.sortedBy { lesson -> lesson.start } }
-            .map { it.filter { lesson -> !lesson.canceled && lesson.isStudentPlan } }
-            .map { day ->
-                day.forEachIndexed { index, lesson ->
-                    val intent = createIntent(student, lesson, day.getOrNull(index + 1))
-
-                    if (lesson.start > now()) {
-                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, day, lesson))
-                    }
-
-                    if (lesson.end > now()) {
-                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
-                        if (day.lastIndex == index) {
-                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
-                        }
-                    }
-                }
-            }
-    }
-
-    private fun createIntent(student: Student, lesson: Timetable, nextLesson: Timetable?): Intent {
-        return Intent(context, TimetableNotificationReceiver::class.java).apply {
-            putExtra(STUDENT_ID, student.studentId)
-            putExtra(STUDENT_NAME, student.studentName)
-            putExtra(LESSON_ROOM, lesson.room)
-            putExtra(LESSON_START, lesson.start.toTimestamp())
-            putExtra(LESSON_END, lesson.end.toTimestamp())
-            putExtra(LESSON_TITLE, lesson.subject)
-            putExtra(LESSON_NEXT_TITLE, nextLesson?.subject)
-            putExtra(LESSON_NEXT_ROOM, nextLesson?.room)
-        }
-    }
-
-    private fun scheduleBroadcast(intent: Intent, studentId: Int, notificationType: Int, time: LocalDateTime) {
-        AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, RTC_WAKEUP, time.toTimestamp(),
-            PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
-                it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
-                it.putExtra(LESSON_TYPE, notificationType)
-            }, FLAG_UPDATE_CURRENT)
-        )
-        Timber.d("TimetableNotification scheduled: type: $notificationType, subject: ${intent.getStringExtra(LESSON_TITLE)}, start: $time, student: $studentId")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 1d005ae8e..dda2abe0c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.services.sync
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.O
 import androidx.core.app.NotificationManagerCompat
-import androidx.lifecycle.asFlow
 import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
 import androidx.work.Data
@@ -16,15 +15,16 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import com.paulinasadowska.rxworkmanagerobservers.extensions.getWorkInfoByIdObservable
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Observable
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate.now
 import java.util.concurrent.TimeUnit.MINUTES
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -42,7 +42,7 @@ class SyncManager @Inject constructor(
     init {
         if (now().isHolidays) stopSyncWorker()
 
-        if (SDK_INT >= O) {
+        if (SDK_INT > O) {
             channels.forEach { it.create() }
             notificationManager.deleteNotificationChannel("new_entries_channel")
         }
@@ -67,7 +67,7 @@ class SyncManager @Inject constructor(
         }
     }
 
-    fun startOneTimeSyncWorker(): Flow<WorkInfo> {
+    fun startOneTimeSyncWorker(): Observable<WorkInfo> {
         val work = OneTimeWorkRequestBuilder<SyncWorker>()
             .setInputData(
                 Data.Builder()
@@ -77,8 +77,7 @@ class SyncManager @Inject constructor(
             .build()
 
         workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
-
-        return workManager.getWorkInfoByIdLiveData(work.id).asFlow()
+        return workManager.getWorkInfoByIdObservable(work.id)
     }
 
     fun stopSyncWorker() {
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 2ba0435b4..126d856aa 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
@@ -5,25 +5,27 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationManagerCompat
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
-import androidx.work.CoroutineWorker
 import androidx.work.Data
+import androidx.work.ListenableWorker
+import androidx.work.RxWorker
 import androidx.work.WorkerParameters
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
-import kotlinx.coroutines.coroutineScope
+import io.reactivex.Completable
+import io.reactivex.Single
 import timber.log.Timber
 import kotlin.random.Random
 
-class SyncWorker @WorkerInject constructor(
+class SyncWorker @AssistedInject constructor(
     @Assisted appContext: Context,
     @Assisted workerParameters: WorkerParameters,
     private val studentRepository: StudentRepository,
@@ -31,43 +33,45 @@ class SyncWorker @WorkerInject constructor(
     private val works: Set<@JvmSuppressWildcards Work>,
     private val preferencesRepository: PreferencesRepository,
     private val notificationManager: NotificationManagerCompat
-) : CoroutineWorker(appContext, workerParameters) {
+) : RxWorker(appContext, workerParameters) {
 
-    override suspend fun doWork() = coroutineScope {
+    override fun createWork(): Single<Result> {
         Timber.i("SyncWorker is starting")
-
-        if (!studentRepository.isCurrentStudentSet()) return@coroutineScope Result.failure()
-
-        val student = studentRepository.getCurrentStudent()
-        val semester = semesterRepository.getCurrentSemester(student, true)
-
-        val exceptions = works.mapNotNull { work ->
-            try {
-                Timber.i("${work::class.java.simpleName} is starting")
-                work.doWork(student, semester)
-                Timber.i("${work::class.java.simpleName} result: Success")
-                null
-            } catch (e: Throwable) {
-                Timber.w("${work::class.java.simpleName} result: An exception ${e.message} occurred")
-                if (e is FeatureDisabledException || e is FeatureNotAvailableException) null
-                else e
+        return studentRepository.isCurrentStudentSet()
+            .filter { true }
+            .flatMap { studentRepository.getCurrentStudent().toMaybe() }
+            .flatMapCompletable { student ->
+                semesterRepository.getCurrentSemester(student, true)
+                    .flatMapCompletable { semester ->
+                        Completable.mergeDelayError(works.map { work ->
+                            work.create(student, semester)
+                                .onErrorResumeNext {
+                                    if (it is FeatureDisabledException || it is FeatureNotAvailableException) Completable.complete()
+                                    else Completable.error(it)
+                                }
+                                .doOnSubscribe { Timber.i("${work::class.java.simpleName} is starting") }
+                                .doOnError { Timber.i("${work::class.java.simpleName} result: An exception occurred") }
+                                .doOnComplete { Timber.i("${work::class.java.simpleName} result: Success") }
+                        })
+                    }
             }
-        }
-        val result = when {
-            exceptions.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
-                Result.failure(Data.Builder()
-                    .putString("error", exceptions.toString())
-                    .build()
-                )
+            .toSingleDefault(Result.success())
+            .onErrorReturn {
+                Timber.e(it, "There was an error during synchronization")
+                when {
+                    inputData.getBoolean("one_time", false) -> {
+                        Result.failure(Data.Builder()
+                            .putString("error", it.toString())
+                            .build()
+                        )
+                    }
+                    else -> Result.retry()
+                }
+            }
+            .doOnSuccess {
+                if (preferencesRepository.isDebugNotificationEnable) notify(it)
+                Timber.i("SyncWorker result: $it")
             }
-            exceptions.isNotEmpty() -> Result.retry()
-            else -> Result.success()
-        }
-
-        if (preferencesRepository.isDebugNotificationEnable) notify(result)
-        Timber.i("SyncWorker result: $result")
-
-        result
     }
 
     private fun notify(result: Result) {
@@ -80,4 +84,10 @@ class SyncWorker @WorkerInject constructor(
             .setPriority(PRIORITY_DEFAULT)
             .build())
     }
+
+    @AssistedInject.Factory
+    interface Factory {
+
+        fun create(appContext: Context, workerParameters: WorkerParameters): ListenableWorker
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
new file mode 100644
index 000000000..aadfc27f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.services.sync
+
+import android.content.Context
+import androidx.work.ListenableWorker
+import androidx.work.WorkerFactory
+import androidx.work.WorkerParameters
+import timber.log.Timber
+import javax.inject.Inject
+
+class SyncWorkerFactory @Inject constructor(private val syncWorkerFactory: SyncWorker.Factory) : WorkerFactory() {
+
+    override fun createWorker(appContext: Context, workerClassName: String, workerParameters: WorkerParameters): ListenableWorker? {
+        return if (workerClassName == SyncWorker::class.java.name) {
+            syncWorkerFactory.create(appContext, workerParameters)
+        } else {
+            Timber.e(IllegalArgumentException("Unknown worker class name: $workerClassName"))
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index 2c7565195..9b6f213bd 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -6,7 +6,6 @@ import android.app.NotificationChannel
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -14,7 +13,7 @@ import javax.inject.Inject
 @TargetApi(26)
 class DebugChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val appInfo: AppInfo
 ) : Channel {
 
@@ -23,7 +22,7 @@ class DebugChannel @Inject constructor(
     }
 
     override fun create() {
-        if (!appInfo.isDebug) return
+        if (appInfo.isDebug) return
         notificationManager.createNotificationChannel(
             NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
                 .apply {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
index 8025bd76c..ae228edd7 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
@@ -6,14 +6,13 @@ 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 LuckyNumberChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
index 5d5727d35..7d6f275d9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
@@ -6,14 +6,13 @@ 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 NewGradesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
index 962fbfa24..49f39c6be 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
@@ -6,14 +6,13 @@ 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 NewMessagesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
index c6e79b393..d80d43dc5 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
@@ -6,14 +6,13 @@ 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 NewNotesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
index 1d7376b92..a0e24ab45 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
@@ -6,14 +6,13 @@ 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 PushChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
deleted file mode 100644
index 41fb61925..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.github.wulkanowy.services.sync.channels
-
-import android.annotation.TargetApi
-import android.app.Notification.VISIBILITY_PUBLIC
-import android.app.NotificationChannel
-import android.app.NotificationManager.IMPORTANCE_DEFAULT
-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 UpcomingLessonsChannel @Inject constructor(
-    private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
-) : Channel {
-
-    companion object {
-        const val CHANNEL_ID = "lesson_channel"
-    }
-
-    override fun create() {
-        notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_upcoming_lessons), IMPORTANCE_DEFAULT).apply {
-                lockscreenVisibility = VISIBILITY_PUBLIC
-                setShowBadge(false)
-                enableVibration(false)
-                setSound(null, null)
-            }
-        )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
index 9e4ab9025..5f7d7efa2 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -3,14 +3,15 @@ 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.attendancesummary.AttendanceSummaryRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class AttendanceSummaryWork @Inject constructor(
     private val attendanceSummaryRepository: AttendanceSummaryRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).ignoreElement()
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
index ecf0be018..e8579ddba 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -3,15 +3,16 @@ 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.attendance.AttendanceRepository
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceRepository.getAttendance(student, semester, now().monday, now().friday, true)
+            .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
index 212ea6327..0da597e0a 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -3,17 +3,19 @@ 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.completedlessons.CompletedLessonsRepository
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class CompletedLessonWork @Inject constructor(
     private val completedLessonsRepository: CompletedLessonsRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().friday, true)
+            .ignoreElement()
     }
 }
+
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 f7d8db0ae..c6110bbbf 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,15 +3,15 @@ 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.exam.ExamRepository
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        examRepository.getExams(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return examRepository.getExams(student, semester, now().monday, now().friday, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
index 3d61a423b..327c71740 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -3,18 +3,14 @@ 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.gradestatistics.GradeStatisticsRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 
-class GradeStatisticsWork @Inject constructor(
-    private val gradeStatisticsRepository: GradeStatisticsRepository
-) : Work {
+class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        with(gradeStatisticsRepository) {
-            getGradesStatistics(student, semester, "Wszystkie", isSemester = true, forceRefresh = true).waitForResult()
-            getGradesStatistics(student, semester, "Wszystkie", isSemester = false, forceRefresh = true).waitForResult()
-            getGradesPointsStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeStatisticsRepository.getGradesStatistics(student, semester, "Wszystkie", false, true)
+            .ignoreElement()
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
new file mode 100644
index 000000000..4c8e955d1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
@@ -0,0 +1,14 @@
+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.gradessummary.GradeSummaryRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class GradeSummaryWork @Inject constructor(private val gradeSummaryRepository: GradeSummaryRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeSummaryRepository.getGradesSummary(student, semester, true).ignoreElement()
+    }
+}
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 00bce109e..7559d2892 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
@@ -7,10 +7,8 @@ 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.grade.GradeRepository
@@ -19,39 +17,30 @@ 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.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class GradeWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val gradeRepository: GradeRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        gradeRepository.getNotNotifiedGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyDetails(it)
-            gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
-        }
-
-        gradeRepository.getNotNotifiedPredictedGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyPredicted(it)
-            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isPredictedGradeNotified = true })
-        }
-
-        gradeRepository.getNotNotifiedFinalGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyFinal(it)
-            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isFinalGradeNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { gradeRepository.getNotNotifiedGrades(semester) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
+            }
     }
 
-    private fun getNotificationBuilder(): NotificationCompat.Builder {
-        return NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
+    private fun notify(grades: List<Grade>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
+            .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))
             .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
@@ -60,12 +49,6 @@ class GradeWork @Inject constructor(
             .setContentIntent(
                 PendingIntent.getActivity(context, MainView.Section.GRADE.id,
                     MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
-    }
-
-    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}") }
@@ -74,30 +57,5 @@ class GradeWork @Inject constructor(
             .build()
         )
     }
-
-    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()
-        )
-    }
 }
+
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 a07f11073..cf3484394 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,15 @@ 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.homework.HomeworkRepository
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return homeworkRepository.getHomework(student, semester, now().monday, now().friday, true).ignoreElement()
     }
 }
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 7b9f5ab30..f19af4df6 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
@@ -7,7 +7,6 @@ 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
@@ -18,24 +17,24 @@ 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.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class LuckyNumberWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        luckyNumberRepository.getNotNotifiedLuckyNumber(student)?.let {
-            notify(it)
-            luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(student) }
+            .flatMapCompletable {
+                notify(it)
+                luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
+            }
     }
 
     private fun notify(luckyNumber: LuckyNumber) {
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 7b32f13bb..b8773dbca 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
@@ -7,7 +7,6 @@ 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
@@ -19,25 +18,24 @@ 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.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class MessageWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val messageRepository: MessageRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        messageRepository.getNotNotifiedMessages(student).first().let {
-            if (it.isNotEmpty()) notify(it)
-            messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { messageRepository.getNotNotifiedMessages(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
+            }
     }
 
     private fun notify(messages: List<Message>) {
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 84b806795..4fc92ffcc 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
@@ -7,7 +7,6 @@ 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
@@ -18,25 +17,24 @@ 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.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class NoteWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val noteRepository: NoteRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
-
-        noteRepository.getNotNotifiedNotes(student).first().let {
-            if (it.isNotEmpty()) notify(it)
-            noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { noteRepository.getNotNotifiedNotes(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
+            }
     }
 
     private fun notify(notes: List<Note>) {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
index c433c0ac8..fa610dee4 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
 import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class RecipientWork @Inject constructor(
@@ -11,13 +12,13 @@ class RecipientWork @Inject constructor(
     private val recipientRepository: RecipientRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        reportingUnitRepository.refreshReportingUnits(student)
-
-        reportingUnitRepository.getReportingUnits(student).let { units ->
-            units.map {
-                recipientRepository.refreshRecipients(student, 2, it)
+    override fun create(student: Student, semester: Semester): Completable {
+        return reportingUnitRepository.getReportingUnits(student, true)
+            .flatMapCompletable { units ->
+                Completable.mergeDelayError(units.map {
+                    recipientRepository.getRecipients(student, 2, it, true).ignoreElement()
+                })
             }
-        }
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
index a9abdaa72..5a7a41d8d 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
@@ -3,12 +3,12 @@ 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.teacher.TeacherRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        teacherRepository.getTeachers(student, semester, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return teacherRepository.getTeachers(student, semester, true).ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
index 3b8c6f5dc..0990ed67a 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -3,17 +3,16 @@ 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.timetable.TimetableRepository
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
-class TimetableWork @Inject constructor(
-    private val timetableRepository: TimetableRepository
-) : Work {
+class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return timetableRepository.getTimetable(student, semester, now().monday, now().friday, true)
+            .ignoreElement()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
index c41f41ce2..1601a103b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
@@ -2,8 +2,10 @@ 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.reactivex.Completable
 
 interface Work {
 
-    suspend fun doWork(student: Student, semester: Semester)
+    fun create(student: Student, semester: Semester): Completable
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index 42c6d3bfd..e5ccf963c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -2,17 +2,16 @@ package io.github.wulkanowy.services.widgets
 
 import android.content.Intent
 import android.widget.RemoteViewsService
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetFactory
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableWidgetService : RemoteViewsService() {
 
     @Inject
@@ -30,8 +29,11 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
-        Timber.d("TimetableWidgetFactory created")
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, applicationContext, intent)
+        AndroidInjection.inject(this)
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, schedulers, applicationContext, intent)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 86b6701b3..ee74832fd 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
@@ -11,20 +11,22 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
+import dagger.android.AndroidInjection
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 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 javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
-    AppCompatActivity(), BaseView {
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
+    HasAndroidInjector {
 
-    protected var binding: VB by lifecycleAwareVariable()
+    @Inject
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
@@ -36,7 +38,8 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
     abstract var presenter: T
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
@@ -84,4 +87,6 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         invalidateOptionsMenu()
         presenter.onDetachView()
     }
+
+    override fun androidInjector() = androidInjector
 }
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 18cd58b41..fdc463714 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -1,13 +1,9 @@
 package io.github.wulkanowy.ui.base
 
 import android.widget.Toast
-import androidx.fragment.app.DialogFragment
-import androidx.viewbinding.ViewBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import dagger.android.support.DaggerAppCompatDialogFragment
 
-abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView {
-
-    protected var binding: VB by lifecycleAwareVariable()
+abstract class BaseDialogFragment : DaggerAppCompatDialogFragment(), BaseView {
 
     override fun showError(text: String, error: Throwable) {
         showMessage(text)
@@ -18,11 +14,11 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+        (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
deleted file mode 100644
index eee4625c9..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.util.DisplayMetrics
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.LinearSmoothScroller
-import androidx.recyclerview.widget.RecyclerView
-import kotlin.math.max
-import kotlin.math.min
-
-abstract class BaseExpandableAdapter<T : RecyclerView.ViewHolder> : RecyclerView.Adapter<T>() {
-
-    companion object {
-        private const val MILLISECONDS_PER_INCH = 100f
-        private const val AUTO_SCROLL_DELAY = 150L
-    }
-
-    private var recyclerView: RecyclerView? = null
-
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        super.onAttachedToRecyclerView(recyclerView)
-        this.recyclerView = recyclerView
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        this.recyclerView = null
-    }
-
-    // original: https://github.com/davideas/FlexibleAdapter/blob/5.1.0/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java#L4984-L5011
-    protected fun scrollToHeaderWithSubItems(position: Int, subItemsCount: Int) {
-        val layoutManager = recyclerView!!.layoutManager as LinearLayoutManager
-        val firstVisibleItem = layoutManager.findFirstCompletelyVisibleItemPosition()
-        val lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition()
-        val itemsToShow = position + subItemsCount - lastVisibleItem
-        if (itemsToShow > 0) {
-            val scrollMax: Int = position - firstVisibleItem
-            val scrollMin = max(0, position + subItemsCount - lastVisibleItem)
-            val scrollBy = min(scrollMax, scrollMin)
-            val scrollTo = firstVisibleItem + scrollBy
-            scrollToPosition(scrollTo)
-        } else if (position < firstVisibleItem) {
-            scrollToPosition(position)
-        }
-    }
-
-    private fun scrollToPosition(position: Int) {
-        recyclerView?.run {
-            postDelayed({
-                layoutManager?.startSmoothScroll(object : LinearSmoothScroller(context) {
-                    override fun getVerticalSnapPreference() = SNAP_TO_START
-                    override fun calculateSpeedPerPixel(displayMetrics: DisplayMetrics) = MILLISECONDS_PER_INCH / displayMetrics.densityDpi
-                }.apply {
-                    targetPosition = position
-                })
-            }, AUTO_SCROLL_DELAY)
-        }
-    }
-}
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..2f5878d0d 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
@@ -1,18 +1,12 @@
 package io.github.wulkanowy.ui.base
 
 import android.view.View
-import androidx.annotation.LayoutRes
-import androidx.fragment.app.Fragment
-import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
+import dagger.android.support.DaggerFragment
 import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragment(layoutId),
-    BaseView {
-
-    protected var binding: VB by lifecycleAwareVariable()
+abstract class BaseFragment : DaggerFragment(), BaseView {
 
     protected var messageContainer: View? = null
 
@@ -22,7 +16,7 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
                 .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
                 .show()
         } else {
-            (activity as? BaseActivity<*, *>)?.showError(text, error)
+            (activity as? BaseActivity<*>)?.showError(text, error)
         }
     }
 
@@ -34,15 +28,15 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
         } else {
-            (activity as? BaseActivity<*, *>)?.showMessage(text)
+            (activity as? BaseActivity<*>)?.showMessage(text)
         }
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+        (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
index aec524259..9f0b4047c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
@@ -1,33 +1,22 @@
 package io.github.wulkanowy.ui.base
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
+import io.reactivex.disposables.CompositeDisposable
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
 
 open class BasePresenter<T : BaseView>(
     protected val errorHandler: ErrorHandler,
-    protected val studentRepository: StudentRepository
-) : CoroutineScope {
+    protected val studentRepository: StudentRepository,
+    protected val schedulers: SchedulersProvider
+) {
 
-    private var job: Job = Job()
-
-    private val jobs = mutableMapOf<String, Job>()
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main + job
+    val disposable = CompositeDisposable()
 
     var view: T? = null
 
     open fun onAttachView(view: T) {
-        job = Job()
         this.view = view
         errorHandler.apply {
             showErrorMessage = view::showError
@@ -37,47 +26,30 @@ open class BasePresenter<T : BaseView>(
     }
 
     fun onExpiredLoginSelected() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent(false)
-            studentRepository.logoutStudent(student)
-
-            val students = studentRepository.getSavedStudents(false)
-            if (students.isNotEmpty()) {
-                Timber.i("Switching current student")
-                studentRepository.switchStudent(students[0])
+        Timber.i("Attempt to switch the student after the session expires")
+        disposable.add(studentRepository.getCurrentStudent(false)
+            .flatMapCompletable { studentRepository.logoutStudent(it) }
+            .andThen(studentRepository.getSavedStudents(false))
+            .flatMapCompletable {
+                if (it.isNotEmpty()) {
+                    Timber.i("Switching current student")
+                    studentRepository.switchStudent(it[0])
+                } else Completable.complete()
             }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to switch the student after the session expires")
-                Status.SUCCESS -> {
-                    Timber.i("Switch student result: Open login view")
-                    view?.openClearLoginView()
-                }
-                Status.ERROR -> {
-                    Timber.i("Switch student result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("expired")
-    }
-
-    fun <T> Flow<T>.launch(individualJobTag: String = "load"): Job {
-        jobs[individualJobTag]?.cancel()
-        val job = launchIn(this@BasePresenter)
-        jobs[individualJobTag] = job
-        Timber.d("Job $individualJobTag launched in ${this@BasePresenter.javaClass.simpleName}: $job")
-        return job
-    }
-
-    fun cancelJobs(vararg names: String) {
-        names.forEach {
-            jobs[it]?.cancel()
-        }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Switch student result: Open login view")
+                view?.openClearLoginView()
+            }, {
+                Timber.i("Switch student result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 
     open fun onDetachView() {
         view = null
-        job.cancel()
+        disposable.clear()
         errorHandler.clear()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 8d6739a15..ae3604bfd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -9,19 +9,16 @@ import android.view.ViewGroup
 import android.widget.HorizontalScrollView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.DialogErrorBinding
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.getString
-import io.github.wulkanowy.utils.openAppInMarket
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import kotlinx.android.synthetic.main.dialog_error.*
 import java.io.InterruptedIOException
 import java.io.PrintWriter
 import java.io.StringWriter
@@ -29,8 +26,7 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
+class ErrorDialog : BaseDialogFragment() {
 
     private lateinit var error: Throwable
 
@@ -56,7 +52,7 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_error, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -66,43 +62,28 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
             error.printStackTrace(PrintWriter(this))
         }
 
-        with(binding) {
-            errorDialogContent.text = stringWriter.toString()
-            with(errorDialogHorizontalScroll) {
-                post { fullScroll(HorizontalScrollView.FOCUS_LEFT) }
-            }
-            errorDialogCopy.setOnClickListener {
-                val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
-                activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
-
-                Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
-            }
-            errorDialogCancel.setOnClickListener { dismiss() }
-            errorDialogReport.setOnClickListener {
-                openConfirmDialog { openEmailClient(stringWriter.toString()) }
-            }
-            errorDialogMessage.text = resources.getString(error)
-            errorDialogReport.isEnabled = when (error) {
-                is UnknownHostException,
-                is InterruptedIOException,
-                is SocketTimeoutException,
-                is ServiceUnavailableException,
-                is FeatureDisabledException,
-                is FeatureNotAvailableException -> false
-                else -> true
-            }
+        errorDialogContent.text = stringWriter.toString()
+        with(errorDialogHorizontalScroll) {
+            post { fullScroll(HorizontalScrollView.FOCUS_LEFT) }
         }
-    }
+        errorDialogCopy.setOnClickListener {
+            val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
+            activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
 
-    private fun openConfirmDialog(callback: () -> Unit) {
-        AlertDialog.Builder(requireContext())
-            .setTitle(R.string.dialog_error_check_update)
-            .setMessage(R.string.dialog_error_check_update_message)
-            .setNeutralButton(R.string.about_feedback) { _, _ -> callback() }
-            .setPositiveButton(R.string.dialog_error_check_update) { _, _ ->
-                requireContext().openAppInMarket(::showMessage)
-            }
-            .show()
+            Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+        }
+        errorDialogCancel.setOnClickListener { dismiss() }
+        errorDialogReport.setOnClickListener { openEmailClient(stringWriter.toString()) }
+        errorDialogMessage.text = resources.getString(error)
+        errorDialogReport.isEnabled = when (error) {
+            is UnknownHostException,
+            is InterruptedIOException,
+            is SocketTimeoutException,
+            is ServiceUnavailableException,
+            is FeatureDisabledException,
+            is FeatureNotAvailableException -> false
+            else -> true
+        }
     }
 
     private fun openEmailClient(content: 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 946e661b1..f746b36f8 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,7 +3,7 @@ package io.github.wulkanowy.ui.base
 import android.content.res.Resources
 import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
@@ -24,10 +24,10 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
     }
 
     protected open fun proceed(error: Throwable) {
-        showErrorMessage(resources.getString(error), error)
         when (error) {
             is ScramblerException, is BadCredentialsException -> onSessionExpired()
             is NoCurrentStudentException -> onNoCurrentStudent()
+            else -> showErrorMessage(resources.getString(error), error)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
deleted file mode 100644
index cefe6ed75..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.annotation.SuppressLint
-import android.graphics.PorterDuff
-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.Student
-import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Pair<Student, Boolean>>()
-
-    var onClickListener: (Student) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (student, isCurrent) = items[position]
-
-        with(holder.binding) {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-
-            with(accountItemImage) {
-                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
-
-                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
-            }
-
-            root.setOnClickListener { onClickListener(student) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
deleted file mode 100644
index 35dec3b4f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemAboutBinding
-import io.github.wulkanowy.databinding.ScrollableHeaderAboutBinding
-import javax.inject.Inject
-
-class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        ITEM_HEADER(1),
-        ITEM_ELEMENT(2)
-    }
-
-    var items = emptyList<Triple<String, String, Drawable?>>()
-
-    var onClickListener: (name: String) -> Unit = {}
-
-    override fun getItemCount() = items.size + 1
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.ITEM_HEADER.id
-        else -> ViewType.ITEM_ELEMENT.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.ITEM_HEADER.id -> HeaderViewHolder(ScrollableHeaderAboutBinding.inflate(inflater, parent, false))
-            ViewType.ITEM_ELEMENT.id -> ItemViewHolder(ItemAboutBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 1)
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: ScrollableHeaderAboutBinding) {
-        with(binding.aboutScrollableHeaderIcon) {
-            setImageDrawable(ResourcesCompat.getDrawableForDensity(
-                context.resources, context.applicationInfo.icon, 640, null)
-            )
-        }
-    }
-
-    private fun bindItemViewHolder(binding: ItemAboutBinding, position: Int) {
-        val (title, summary, image) = items[position]
-
-        with(binding) {
-            aboutItemImage.setImageDrawable(image)
-            aboutItemTitle.text = title
-            aboutItemSummary.text = summary
-
-            root.setOnClickListener { onClickListener(title) }
-        }
-    }
-
-    private class HeaderViewHolder(val binding: ScrollableHeaderAboutBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemAboutBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
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 5ec1a66e3..5a32ac837 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
@@ -2,11 +2,13 @@ package io.github.wulkanowy.ui.modules.about
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-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
@@ -15,20 +17,19 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.getCompatDrawable
-import io.github.wulkanowy.utils.openAppInMarket
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about), AboutView,
-    MainView.TitledView {
+class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: AboutPresenter
 
     @Inject
-    lateinit var aboutAdapter: AboutAdapter
+    lateinit var aboutAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -79,34 +80,34 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
         fun newInstance() = AboutFragment()
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_about, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAboutBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        aboutAdapter.onClickListener = presenter::onItemSelected
+        aboutAdapter.setOnItemClickListener(presenter::onItemSelected)
 
-        with(binding.aboutRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(aboutRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = aboutAdapter
         }
     }
 
-    override fun updateData(data: List<Triple<String, String, Drawable?>>) {
+    override fun updateData(header: AboutScrollableHeader, items: List<AboutItem>) {
         with(aboutAdapter) {
-            items = data
-            notifyDataSetChanged()
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
+            updateDataSet(items)
         }
     }
 
-    override fun openAppInMarket() {
-        context?.openAppInMarket(::showMessage)
-    }
-
     override fun openLogViewer() {
-        (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
+        if (appInfo.isDebug) (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
     }
 
     override fun openDiscordInvite() {
@@ -122,7 +123,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
             chooserTitle = getString(R.string.about_feedback),
             email = "wulkanowyinc@gmail.com",
             subject = "Zgłoszenie błędu",
-            body = getString(R.string.about_feedback_template,
+            body = requireContext().getString(R.string.about_feedback_template,
                 "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
             ),
             onActivityNotFound = {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
new file mode 100644
index 000000000..29f1cd8c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
@@ -0,0 +1,56 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_about.*
+
+class AboutItem(
+    val title: String,
+    private val summary: String,
+    private val image: Drawable?
+) : AbstractFlexibleItem<AboutItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            aboutItemImage.setImageDrawable(image)
+            aboutItemTitle.text = title
+            aboutItemSummary.text = summary
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AboutItem
+
+        if (title != other.title) return false
+        if (summary != other.summary) return false
+        if (image != other.image) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = title.hashCode()
+        result = 31 * result + summary.hashCode()
+        result = 31 * result + (image?.hashCode() ?: 0)
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
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 24e59d36b..7e740b32b 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
@@ -1,19 +1,20 @@
 package io.github.wulkanowy.ui.modules.about
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.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.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class AboutPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val appInfo: AppInfo,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AboutView>(errorHandler, studentRepository) {
+) : BasePresenter<AboutView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
@@ -22,13 +23,13 @@ class AboutPresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(name: String) {
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is AboutItem) return
         view?.run {
-            when (name) {
+            when (item.title) {
                 versionRes?.first -> {
                     Timber.i("Opening log viewer")
-                    if (appInfo.isDebug) openLogViewer()
-                    else openAppInMarket()
+                    openLogViewer()
                     analytics.logEvent("about_open", "name" to "log_viewer")
                 }
                 feedbackRes?.first -> {
@@ -72,16 +73,15 @@ class AboutPresenter @Inject constructor(
 
     private fun loadData() {
         view?.run {
-            updateData(listOfNotNull(
-                versionRes,
-                creatorsRes,
-                feedbackRes,
-                faqRes,
-                discordRes,
-                homepageRes,
-                licensesRes,
-                privacyRes
-            ))
+            updateData(AboutScrollableHeader(), listOfNotNull(
+                versionRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                creatorsRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                feedbackRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                faqRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                discordRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                homepageRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                licensesRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                privacyRes?.let { (title, summary, image) -> AboutItem(title, summary, image) }))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
new file mode 100644
index 000000000..07bb41249
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.view.View
+import androidx.core.content.res.ResourcesCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_about.*
+
+class AboutScrollableHeader : AbstractFlexibleItem<AboutScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            val context = contentView.context
+            val drawable = ResourcesCompat.getDrawableForDensity(context.resources, context.applicationInfo.icon, 640, null)
+
+            aboutScrollableHeaderIcon.setImageDrawable(drawable)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return true
+    }
+
+    override fun hashCode() = javaClass.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
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 4c4b002f9..4bc0c3fe0 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
@@ -23,9 +23,7 @@ interface AboutView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Triple<String, String, Drawable?>>)
-
-    fun openAppInMarket()
+    fun updateData(header: AboutScrollableHeader, items: List<AboutItem>)
 
     fun openLogViewer()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
deleted file mode 100644
index b6755c6a7..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.contributor
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import coil.load
-import coil.transform.RoundedCornersTransformation
-import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.databinding.ItemContributorBinding
-import javax.inject.Inject
-
-class ContributorAdapter @Inject constructor() :
-    RecyclerView.Adapter<ContributorAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Contributor>()
-
-    var onClickListener: (Contributor) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemContributorBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            creatorItemName.text = item.displayName
-            creatorItemAvatar.load("https://github.com/${item.githubUsername}.png") {
-                transformations(RoundedCornersTransformation(8f))
-                crossfade(true)
-            }
-
-            root.setOnClickListener { onClickListener(item) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemContributorBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
index 5d7e076c7..c181c3d38 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
@@ -1,29 +1,30 @@
 package io.github.wulkanowy.ui.modules.about.contributor
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.databinding.FragmentContributorBinding
 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.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_creator.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fragment_contributor),
-    ContributorView, MainView.TitledView {
+class ContributorFragment : BaseFragment(), ContributorView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: ContributorPresenter
 
     @Inject
-    lateinit var creatorsAdapter: ContributorAdapter
+    lateinit var creatorsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     override val titleStringId get() = R.string.contributors_title
 
@@ -31,27 +32,29 @@ class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fr
         fun newInstance() = ContributorFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentContributorBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_creator, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding.creatorRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(creatorRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = creatorsAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false))
         }
-        creatorsAdapter.onClickListener = presenter::onItemSelected
-        binding.creatorSeeMore.setOnClickListener { presenter.onSeeMoreClick() }
+        creatorsAdapter.setOnItemClickListener(presenter::onItemSelected)
+        creatorSeeMore.setOnClickListener { presenter.onSeeMoreClick() }
     }
 
-    override fun updateData(data: List<Contributor>) {
-        with(creatorsAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<ContributorItem>) {
+        creatorsAdapter.updateDataSet(data)
     }
 
     override fun openUserGithubPage(username: String) {
@@ -63,7 +66,7 @@ class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fr
     }
 
     override fun showProgress(show: Boolean) {
-        binding.creatorProgress.visibility = if (show) VISIBLE else GONE
+        creatorProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorItem.kt
new file mode 100644
index 000000000..844b5bd8d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorItem.kt
@@ -0,0 +1,51 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import android.view.View
+import coil.api.load
+import coil.transform.RoundedCornersTransformation
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.pojos.AppCreator
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_contributor.*
+
+class ContributorItem(val creator: AppCreator) :
+    AbstractFlexibleItem<ContributorItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_contributor
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            creatorItemName.text = creator.displayName
+
+            creatorItemAvatar.load("https://github.com/${creator.githubUsername}.png") {
+                transformations(RoundedCornersTransformation(8f))
+                crossfade(true)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ContributorItem
+
+        if (creator != other.creator) return false
+
+        return true
+    }
+
+    override fun hashCode() = creator.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
index 78fdb43a1..721b25007 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
@@ -1,20 +1,19 @@
 package io.github.wulkanowy.ui.modules.about.contributor
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.pojos.Contributor
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.appcreator.AppCreatorRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class ContributorPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val appCreatorRepository: AppCreatorRepository
-) : BasePresenter<ContributorView>(errorHandler, studentRepository) {
+) : BasePresenter<ContributorView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: ContributorView) {
         super.onAttachView(view)
@@ -22,8 +21,9 @@ class ContributorPresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(contributor: Contributor) {
-        view?.openUserGithubPage(contributor.githubUsername)
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is ContributorItem) return
+        view?.openUserGithubPage(item.creator.githubUsername)
     }
 
     fun onSeeMoreClick() {
@@ -31,15 +31,11 @@ class ContributorPresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource { appCreatorRepository.getAppCreators() }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.showProgress(true)
-                Status.SUCCESS -> view?.run {
-                    showProgress(false)
-                    updateData(it.data!!)
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.launch()
+        disposable.add(appCreatorRepository.getAppCreators()
+            .map { it.map { creator -> ContributorItem(creator) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
index 8007e4e3f..18ec3a8ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.about.contributor
 
-import io.github.wulkanowy.data.pojos.Contributor
 import io.github.wulkanowy.ui.base.BaseView
 
 interface ContributorView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Contributor>)
+    fun updateData(data: List<ContributorItem>)
 
     fun openUserGithubPage(username: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
deleted file mode 100644
index 6ae06bbe7..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.license
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.mikepenz.aboutlibraries.entity.Library
-import io.github.wulkanowy.databinding.ItemLicenseBinding
-import javax.inject.Inject
-
-class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Library>()
-
-    var onClickListener: (Library) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLicenseBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            licenseItemName.text = item.libraryName
-            licenseItemSummary.text = item.licenses?.firstOrNull()?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
-
-            root.setOnClickListener { onClickListener(item) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemLicenseBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
index cdd29b41b..2681680b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -1,64 +1,67 @@
 package io.github.wulkanowy.ui.modules.about.license
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.parseAsHtml
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentLicenseBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_license.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_license),
-    LicenseView, MainView.TitledView {
+class LicenseFragment : BaseFragment(), LicenseView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: LicensePresenter
 
     @Inject
-    lateinit var licenseAdapter: LicenseAdapter
+    lateinit var licenseAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
-    private val libs by lazy { Libs(requireContext()) }
+    @Inject
+    lateinit var libs: Lazy<Libs>
 
     override val titleStringId get() = R.string.license_title
 
     override val appLibraries: ArrayList<Library>?
         get() = context?.let {
-            libs.prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
         }
 
     companion object {
         fun newInstance() = LicenseFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLicenseBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_license, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        licenseAdapter.onClickListener = presenter::onItemSelected
-
-        with(binding.licenseRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(licenseRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = licenseAdapter
         }
+        licenseAdapter.setOnItemClickListener(presenter::onItemSelected)
     }
 
-    override fun updateData(data: List<Library>) {
-        with(licenseAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LicenseItem>) {
+        licenseAdapter.updateDataSet(data)
     }
 
     override fun openLicense(licenseHtml: String) {
@@ -73,7 +76,7 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
     }
 
     override fun showProgress(show: Boolean) {
-        binding.licenseProgress.visibility = if (show) VISIBLE else GONE
+        licenseProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
new file mode 100644
index 000000000..8dcb89224
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.view.View
+import com.mikepenz.aboutlibraries.entity.Library
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_license.*
+
+class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_license
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            licenseItemName.text = library.libraryName
+            licenseItemSummary.text = library.license?.licenseName?.takeIf { it.isNotBlank() } ?: library.libraryVersion
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as LicenseItem
+
+        if (library != other.library) return false
+
+        return true
+    }
+
+    override fun hashCode() = library.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
new file mode 100644
index 000000000..0ffc3d90e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.content.Context
+import com.mikepenz.aboutlibraries.Libs
+import dagger.Module
+import dagger.Provides
+import io.github.wulkanowy.di.scopes.PerFragment
+
+@Module
+class LicenseModule {
+
+    @PerFragment
+    @Provides
+    fun provideLibs(context: Context) = Libs(context)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
index 18d257eed..dc48b098b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -1,23 +1,18 @@
 package io.github.wulkanowy.ui.modules.about.license
 
-import com.mikepenz.aboutlibraries.entity.Library
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.withContext
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import javax.inject.Inject
 
 class LicensePresenter @Inject constructor(
-    private val dispatchers: DispatchersProvider,
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LicenseView>(errorHandler, studentRepository) {
+) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LicenseView) {
         super.onAttachView(view)
@@ -25,23 +20,17 @@ class LicensePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(library: Library) {
-        view?.run { library.licenses?.firstOrNull()?.licenseDescription?.let { openLicense(it) } }
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is LicenseItem) return
+        view?.run { item.library.license?.licenseDescription?.let { openLicense(it) } }
     }
 
     private fun loadData() {
-        flowWithResource {
-            withContext(dispatchers.backgroundThread) {
-                view?.appLibraries.orEmpty()
-            }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("License data load started")
-                Status.SUCCESS -> view?.updateData(it.data!!)
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch()
+        disposable.add(Single.fromCallable { view?.appLibraries }
+            .map { it.map { library -> LicenseItem(library) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnEvent { _, _ -> view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
index 0680dbb73..3939d3e80 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
@@ -9,7 +9,7 @@ interface LicenseView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Library>)
+    fun updateData(data: List<LicenseItem>)
 
     fun openLicense(licenseHtml: String)
 
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/about/logviewer/LogViewerFragment.kt
index cf40975e7..0b7b05c78 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/about/logviewer/LogViewerFragment.kt
@@ -8,24 +8,23 @@ 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.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import androidx.core.content.FileProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentLogviewerBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import kotlinx.android.synthetic.main.fragment_logviewer.*
 import java.io.File
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragment_logviewer),
-    LogViewerView, MainView.TitledView {
+class LogViewerFragment : BaseFragment(), LogViewerView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: LogViewerPresenter
@@ -44,10 +43,13 @@ class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragme
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLogviewerBinding.bind(view)
-        messageContainer = binding.logViewerRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_logviewer, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = logViewerRecycler
         presenter.onAttachView(this)
     }
 
@@ -61,18 +63,18 @@ class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragme
     }
 
     override fun initView() {
-        with(binding.logViewerRecycler) {
+        with(logViewerRecycler) {
             layoutManager = LinearLayoutManager(context)
             adapter = logAdapter
         }
 
-        binding.logViewRefreshButton.setOnClickListener { presenter.onRefreshClick() }
+        logViewRefreshButton.setOnClickListener { presenter.onRefreshClick() }
     }
 
     override fun setLines(lines: List<String>) {
         logAdapter.lines = lines
         logAdapter.notifyDataSetChanged()
-        binding.logViewerRecycler.scrollToPosition(lines.size - 1)
+        logViewerRecycler.scrollToPosition(lines.size - 1)
     }
 
     override fun shareLogs(files: List<File>) {
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/about/logviewer/LogViewerPresenter.kt
index 85eae8e6e..4485cb3eb 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/about/logviewer/LogViewerPresenter.kt
@@ -1,20 +1,19 @@
 package io.github.wulkanowy.ui.modules.about.logviewer
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.logger.LoggerRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LogViewerPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val loggerRepository: LoggerRepository
-) : BasePresenter<LogViewerView>(errorHandler, studentRepository) {
+) : BasePresenter<LogViewerView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LogViewerView) {
         super.onAttachView(view)
@@ -23,19 +22,16 @@ class LogViewerPresenter @Inject constructor(
     }
 
     fun onShareLogsSelected(): Boolean {
-        flowWithResource { loggerRepository.getLogFiles() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Loading logs files started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading logs files result: ${it.data!!.joinToString { file -> file.name }}")
-                    view?.shareLogs(it.data)
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading logs files result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("share")
+        disposable.add(loggerRepository.getLogFiles()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading logs files result: ${it.joinToString { it.name }}")
+                view?.shareLogs(it)
+            }, {
+                Timber.i("Loading logs files result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
@@ -44,18 +40,15 @@ class LogViewerPresenter @Inject constructor(
     }
 
     private fun loadLogFile() {
-        flowWithResource { loggerRepository.getLastLogLines() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Loading last log file started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading last log file result: load ${it.data!!.size} lines")
-                    view?.setLines(it.data)
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading last log file result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("file")
+        disposable.add(loggerRepository.getLastLogLines()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading last log file result: load ${it.size} lines")
+                view?.setLines(it)
+            }, {
+                Timber.i("Loading last log file result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
deleted file mode 100644
index dbcb499e8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-data class Account(val email: String, val isParent: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
deleted file mode 100644
index 7ecb41399..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-import android.annotation.SuppressLint
-import android.graphics.PorterDuff
-import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.HeaderAccountBinding
-import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var items = emptyList<AccountItem<*>>()
-
-    var onClickListener: (StudentWithSemesters) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            AccountItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderAccountBinding.inflate(inflater, parent, false))
-            AccountItem.ViewType.ITEM.id -> ItemViewHolder(ItemAccountBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as Account)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as StudentWithSemesters)
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: HeaderAccountBinding, account: Account) {
-        with(binding) {
-            accountHeaderEmail.text = account.email
-            accountHeaderType.setText(if (account.isParent) R.string.account_type_parent else R.string.account_type_student)
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(binding: ItemAccountBinding, studentWithSemesters: StudentWithSemesters) {
-        val student = studentWithSemesters.student
-        val semesters = studentWithSemesters.semesters
-        val diary = semesters.maxByOrNull { it.semesterId }
-
-        with(binding) {
-            accountItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
-            accountItemSchool.text = studentWithSemesters.student.schoolName
-            with(accountItemLoginMode) {
-                visibility = when (Sdk.Mode.valueOf(student.loginMode)) {
-                    Sdk.Mode.API -> {
-                        setText(R.string.account_login_mobile_api)
-                        VISIBLE
-                    }
-                    Sdk.Mode.HYBRID -> {
-                        setText(R.string.account_login_hybrid)
-                        VISIBLE
-                    }
-                    Sdk.Mode.SCRAPPER -> {
-                        GONE
-                    }
-                }
-            }
-
-            with(accountItemImage) {
-                val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
-
-                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
-            }
-
-            root.setOnClickListener { onClickListener(studentWithSemesters) }
-        }
-    }
-
-    class HeaderViewHolder(val binding: HeaderAccountBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
index 1fa87268b..cfff31c98 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -7,22 +7,23 @@ import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.DialogAccountBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
+class AccountDialog : BaseDialogFragment(), AccountView {
 
     @Inject
     lateinit var presenter: AccountPresenter
 
     @Inject
-    lateinit var accountAdapter: AccountAdapter
+    lateinit var accountAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = AccountDialog()
@@ -34,7 +35,7 @@ class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogAccountBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_account, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -43,23 +44,18 @@ class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
     }
 
     override fun initView() {
-        accountAdapter.onClickListener = presenter::onItemSelected
+        accountAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
 
-        with(binding) {
-            accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
-            accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
-            accountDialogRecycler.apply {
-                layoutManager = LinearLayoutManager(context)
-                adapter = accountAdapter
-            }
+        accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
+        accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
+        accountDialogRecycler.apply {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = accountAdapter
         }
     }
 
-    override fun updateData(data: List<AccountItem<*>>) {
-        with(accountAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<AccountItem>) {
+        accountAdapter.updateDataSet(data)
     }
 
     override fun showError(text: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
index 05a4a69ce..d3a3ee6a3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
@@ -1,9 +1,59 @@
 package io.github.wulkanowy.ui.modules.account
 
-data class AccountItem<out T>(val value: T, val viewType: ViewType) {
+import android.annotation.SuppressLint
+import android.graphics.PorterDuff
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
 
-    enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
+class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_account
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        val context = holder.contentView.context
+
+        val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AccountItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index 4eaee4291..e9b4b81ee 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -1,22 +1,21 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import timber.log.Timber
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val syncManager: SyncManager
-) : BasePresenter<AccountView>(errorHandler, studentRepository) {
+) : BasePresenter<AccountView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
@@ -36,20 +35,20 @@ class AccountPresenter @Inject constructor(
     }
 
     fun onLogoutConfirm() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent(false)
-            studentRepository.logoutStudent(student)
-
-            val students = studentRepository.getSavedStudents(false)
-            if (students.isNotEmpty()) {
-                studentRepository.switchStudent(students[0])
+        Timber.i("Attempt to logout current user ")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMapCompletable { studentRepository.logoutStudent(it) }
+            .andThen(studentRepository.getSavedStudents(false))
+            .flatMap {
+                if (it.isNotEmpty()) studentRepository.switchStudent(it[0]).toSingle { it }
+                else Single.just(it)
             }
-            students
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to logout current user ")
-                Status.SUCCESS -> view?.run {
-                    if (it.data!!.isEmpty()) {
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.dismissView() }
+            .subscribe({
+                view?.apply {
+                    if (it.isEmpty()) {
                         Timber.i("Logout result: Open login view")
                         syncManager.stopSyncWorker()
                         openClearLoginView()
@@ -58,58 +57,47 @@ class AccountPresenter @Inject constructor(
                         recreateMainView()
                     }
                 }
-                Status.ERROR -> {
-                    Timber.i("Logout result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.dismissView()
-        }.launch("logout")
+            }, {
+                Timber.i("Logout result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 
-    fun onItemSelected(studentWithSemesters: StudentWithSemesters) {
-        Timber.i("Select student item ${studentWithSemesters.student.id}")
-        if (studentWithSemesters.student.isCurrent) {
-            view?.dismissView()
-        } else flowWithResource { studentRepository.switchStudent(studentWithSemesters) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to change a student")
-                Status.SUCCESS -> {
-                    Timber.i("Change a student result: Success")
-                    view?.recreateMainView()
-                }
-                Status.ERROR -> {
-                    Timber.i("Change a student result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item is AccountItem) {
+            Timber.i("Select student item ${item.student.id}")
+            if (item.student.isCurrent) {
+                view?.dismissView()
+            } else {
+                Timber.i("Attempt to change a student")
+                disposable.add(studentRepository.switchStudent(item.student)
+                    .subscribeOn(schedulers.backgroundThread)
+                    .observeOn(schedulers.mainThread)
+                    .doFinally { view?.dismissView() }
+                    .subscribe({
+                        Timber.i("Change a student result: Success")
+                        view?.recreateMainView()
+                    }, {
+                        Timber.i("Change a student result: An exception occurred")
+                        errorHandler.dispatch(it)
+                    }))
             }
-        }.afterLoading {
-            view?.dismissView()
-        }.launch("switch")
-    }
-
-    private fun createAccountItems(items: List<StudentWithSemesters>): List<AccountItem<*>> {
-        return items.groupBy { Account(it.student.email, it.student.isParent) }.map { (account, students) ->
-            listOf(AccountItem(account, AccountItem.ViewType.HEADER)) + students.map { student ->
-                AccountItem(student, AccountItem.ViewType.ITEM)
-            }
-        }.flatten()
+        }
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading account data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading account result: Success")
-                    view?.updateData(createAccountItems(it.data!!))
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading account result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch()
+        Timber.i("Loading account data started")
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it.map { item -> AccountItem(item) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading account result: Success")
+                view?.updateData(it)
+            }, {
+                Timber.i("Loading account result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index a1f8086cd..ede5023ba 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -6,7 +6,7 @@ interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<AccountItem<*>>)
+    fun updateData(data: List<AccountItem>)
 
     fun dismissView()
 
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 a63d5045a..75f998404 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
@@ -1,80 +1,12 @@
 package io.github.wulkanowy.ui.modules.attendance
 
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
-import io.github.wulkanowy.databinding.ItemAttendanceBinding
-import javax.inject.Inject
 
-class AttendanceAdapter @Inject constructor() :
-    RecyclerView.Adapter<AttendanceAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Attendance>()
+class AttendanceAdapter<T : IFlexible<*>> : FlexibleAdapter<T>(null, null, true) {
 
     var excuseActionMode: Boolean = false
 
-    var onClickListener: (Attendance) -> Unit = {}
-
     var onExcuseCheckboxSelect: (attendanceItem: Attendance, checked: Boolean) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemAttendanceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            attendanceItemNumber.text = item.number.toString()
-            attendanceItemSubject.text = item.subject
-            attendanceItemDescription.text = item.name
-            attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
-            attendanceItemNumber.visibility = View.GONE
-            attendanceItemExcuseInfo.visibility = View.GONE
-            attendanceItemExcuseCheckbox.visibility = View.GONE
-            attendanceItemExcuseCheckbox.isChecked = false
-            attendanceItemExcuseCheckbox.setOnCheckedChangeListener { _, checked ->
-                onExcuseCheckboxSelect(item, checked)
-            }
-
-            when (if (item.excuseStatus != null) SentExcuseStatus.valueOf(item.excuseStatus) else null) {
-                SentExcuseStatus.WAITING -> {
-                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
-                    attendanceItemExcuseInfo.visibility = View.VISIBLE
-                    attendanceItemAlert.visibility = View.INVISIBLE
-                }
-                SentExcuseStatus.DENIED -> {
-                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
-                    attendanceItemExcuseInfo.visibility = View.VISIBLE
-                }
-                else -> {
-                    if (item.excusable && excuseActionMode) {
-                        attendanceItemNumber.visibility = View.GONE
-                        attendanceItemExcuseCheckbox.visibility = View.VISIBLE
-                    } else {
-                        attendanceItemNumber.visibility = View.VISIBLE
-                        attendanceItemExcuseCheckbox.visibility = View.GONE
-                    }
-                }
-            }
-            root.setOnClickListener {
-                onClickListener(item)
-
-                with(attendanceItemExcuseCheckbox) {
-                    if (excuseActionMode && isVisible) {
-                        isChecked = !isChecked
-                    }
-                }
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemAttendanceBinding) : RecyclerView.ViewHolder(binding.root)
 }
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 97b76e812..611dd999e 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
@@ -5,15 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.databinding.DialogAttendanceBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_attendance.*
 
 class AttendanceDialog : DialogFragment() {
 
-    private var binding: DialogAttendanceBinding by lifecycleAwareVariable()
-
     private lateinit var attendance: Attendance
 
     companion object {
@@ -35,18 +33,16 @@ class AttendanceDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_attendance, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            attendanceDialogSubject.text = attendance.subject
-            attendanceDialogDescription.text = attendance.name
-            attendanceDialogDate.text = attendance.date.toFormattedString()
-            attendanceDialogNumber.text = attendance.number.toString()
-            attendanceDialogClose.setOnClickListener { dismiss() }
-        }
+        attendanceDialogSubject.text = attendance.subject
+        attendanceDialogDescription.text = attendance.name
+        attendanceDialogDate.text = attendance.date.toFormattedString()
+        attendanceDialogNumber.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 c7caef069..9969b1c78 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
@@ -10,34 +10,35 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.databinding.DialogExcuseBinding
-import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 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.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
-import java.time.LocalDate
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.dialog_excuse.*
+import kotlinx.android.synthetic.main.fragment_attendance.*
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
+class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
     MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendancePresenter
 
     @Inject
-    lateinit var attendanceAdapter: AttendanceAdapter
+    lateinit var attendanceAdapter: AttendanceAdapter<AbstractFlexibleItem<*>>
 
     override val excuseSuccessString: String
         get() = getString(R.string.attendance_excuse_success)
@@ -53,7 +54,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty get() = attendanceAdapter.items.isEmpty()
+    override val isViewEmpty get() = attendanceAdapter.isEmpty
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
@@ -90,38 +91,39 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAttendanceBinding.bind(view)
-        messageContainer = binding.attendanceRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_attendance, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = attendanceRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        with(attendanceAdapter) {
-            onClickListener = presenter::onAttendanceItemSelected
-            onExcuseCheckboxSelect = presenter::onExcuseCheckboxSelect
-        }
+        attendanceAdapter.setOnItemClickListener(presenter::onAttendanceItemSelected)
+        attendanceAdapter.onExcuseCheckboxSelect = presenter::onExcuseCheckboxSelect
 
-        with(binding.attendanceRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(attendanceRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false))
         }
 
-        with(binding) {
-            attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
-            attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
+        attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            attendanceNavDate.setOnClickListener { presenter.onPickDate() }
-            attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+        attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        attendanceNavDate.setOnClickListener { presenter.onPickDate() }
+        attendanceNextButton.setOnClickListener { presenter.onNextDay() }
 
-            attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
+        attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
 
-            attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -133,26 +135,20 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         else false
     }
 
-    override fun updateData(data: List<Attendance>) {
-        with(attendanceAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<AttendanceItem>) {
+        attendanceAdapter.updateDataSet(data, true)
     }
 
     override fun updateNavigationDay(date: String) {
-        binding.attendanceNavDate.text = date
+        attendanceNavDate.text = date
     }
 
     override fun clearData() {
-        with(attendanceAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        attendanceAdapter.clear()
     }
 
     override fun resetView() {
-        binding.attendanceRecycler.smoothScrollToPosition(0)
+        attendanceRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -168,43 +164,43 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.attendanceEmpty.visibility = if (show) VISIBLE else GONE
+        attendanceEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.attendanceError.visibility = if (show) VISIBLE else GONE
+        attendanceError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.attendanceErrorMessage.text = message
+        attendanceErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.attendanceProgress.visibility = if (show) VISIBLE else GONE
+        attendanceProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.attendanceSwipe.isEnabled = enable
+        attendanceSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.attendanceSwipe.isRefreshing = false
+        attendanceSwipe.isRefreshing = false
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding. attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExcuseButton(show: Boolean) {
-        binding.attendanceExcuseButton.visibility = if (show) VISIBLE else GONE
+        attendanceExcuseButton.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
@@ -227,15 +223,14 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showExcuseDialog() {
-        val dialogBinding = DialogExcuseBinding.inflate(LayoutInflater.from(context))
         AlertDialog.Builder(requireContext())
             .setTitle(R.string.attendance_excuse_title)
-            .setView(dialogBinding.root)
+            .setView(R.layout.dialog_excuse)
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .create()
             .apply {
                 setButton(BUTTON_POSITIVE, getString(R.string.attendance_excuse_dialog_submit)) { _, _ ->
-                    presenter.onExcuseDialogSubmit(dialogBinding.excuseReason.text?.toString().orEmpty())
+                    presenter.onExcuseDialogSubmit(excuseReason.text?.toString().orEmpty())
                 }
             }.show()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
new file mode 100644
index 000000000..7355aec2e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
@@ -0,0 +1,97 @@
+package io.github.wulkanowy.ui.modules.attendance
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import androidx.core.view.isVisible
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_attendance.*
+
+class AttendanceItem(val attendance: Attendance) :
+    AbstractFlexibleItem<AttendanceItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_attendance
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            attendanceItemNumber.text = attendance.number.toString()
+            attendanceItemSubject.text = attendance.subject
+            attendanceItemDescription.text = attendance.name
+            attendanceItemAlert.visibility = attendance.run { if (absence && !excused) VISIBLE else INVISIBLE }
+            attendanceItemNumber.visibility = GONE
+            attendanceItemExcuseInfo.visibility = GONE
+            attendanceItemExcuseCheckbox.visibility = GONE
+            attendanceItemExcuseCheckbox.isChecked = false
+            attendanceItemExcuseCheckbox.setOnCheckedChangeListener { _, checked ->
+                (adapter as AttendanceAdapter).onExcuseCheckboxSelect(attendance, checked)
+            }
+
+            when (if (attendance.excuseStatus != null) SentExcuseStatus.valueOf(attendance.excuseStatus) else null) {
+                SentExcuseStatus.WAITING -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
+                    attendanceItemExcuseInfo.visibility = VISIBLE
+                    attendanceItemAlert.visibility = INVISIBLE
+                }
+                SentExcuseStatus.DENIED -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
+                    attendanceItemExcuseInfo.visibility = VISIBLE
+                }
+                else -> {
+                    if (attendance.excusable && (adapter as AttendanceAdapter).excuseActionMode) {
+                        attendanceItemNumber.visibility = GONE
+                        attendanceItemExcuseCheckbox.visibility = VISIBLE
+                    } else {
+                        attendanceItemNumber.visibility = VISIBLE
+                        attendanceItemExcuseCheckbox.visibility = GONE
+                    }
+                }
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttendanceItem
+
+        if (attendance != other.attendance) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = attendance.hashCode()
+        result = 31 * result + attendance.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, val adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+
+        override fun onClick(view: View?) {
+            super.onClick(view)
+            attendanceItemExcuseCheckbox.apply {
+                if ((adapter as AttendanceAdapter).excuseActionMode && isVisible) {
+                    isChecked = !isChecked
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceModule.kt
new file mode 100644
index 000000000..eb35fea1b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceModule.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.attendance
+
+import dagger.Module
+import dagger.Provides
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+
+@Module
+class AttendanceModule {
+
+    @Provides
+    fun provideAttendanceFlexibleAdapter() = AttendanceAdapter<AbstractFlexibleItem<*>>()
+}
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 158f08ba3..7fc044744 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
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -10,32 +10,29 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousOrSameSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class AttendancePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val attendanceRepository: AttendanceRepository,
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AttendanceView>(errorHandler, studentRepository) {
+) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().previousOrSameSchoolDay
 
@@ -114,11 +111,11 @@ class AttendancePresenter @Inject constructor(
         view?.finishActionMode()
     }
 
-    fun onAttendanceItemSelected(attendance: Attendance) {
+    fun onAttendanceItemSelected(item: AbstractFlexibleItem<*>?) {
         view?.apply {
-            if (!excuseActionMode) {
-                Timber.i("Select attendance item ${attendance.id}")
-                showAttendanceDialog(attendance)
+            if (item is AttendanceItem && !excuseActionMode) {
+                Timber.i("Select attendance item ${item.attendance.id}")
+                showAttendanceDialog(item.attendance)
             }
         }
     }
@@ -172,93 +169,98 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.showExcuseButton(false)
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
+                    }
+                }
+                .map { list ->
+                    if (prefRepository.isShowPresent) list
+                    else list.filter { !it.presence }
+                }
+                .delay(200, MILLISECONDS)
+                .map { items -> items.map { AttendanceItem(it) } }
+                .map { items -> items.sortedBy { it.attendance.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading attendance result: Success")
                     view?.apply {
-                        updateData(it.data!!.let { items ->
-                            if (prefRepository.isShowPresent) items
-                            else items.filter { item -> !item.presence }
-                        }.sortedBy { item -> item.number })
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
-                        showExcuseButton(it.data.any { item -> item.excusable })
+                        showContent(it.isNotEmpty())
+                        showExcuseButton(it.any { item -> item.attendance.excusable })
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "attendance",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh)
+                }) {
                     Timber.i("Loading attendance result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            )
+        }
     }
 
     private fun excuseAbsence(reason: String?, toExcuseList: List<Attendance>) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Excusing absence started")
-                    showProgress(true)
-                    showContent(false)
-                    showExcuseButton(false)
+        Timber.i("Excusing absence started")
+        disposable.apply {
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
+                    }
                 }
-                Status.SUCCESS -> {
+                .delay(200, MILLISECONDS)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        showProgress(true)
+                        showContent(false)
+                        showExcuseButton(false)
+                    }
+                }
+                .subscribe({
                     Timber.i("Excusing for absence result: Success")
                     analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
                     attendanceToExcuseList.clear()
-                    view?.run {
+                    view?.apply {
                         showExcuseButton(false)
                         showMessage(excuseSuccessString)
-                        showContent(true)
-                        showProgress(false)
                     }
-                    loadData(currentDate, forceRefresh = true)
-                }
-                Status.ERROR -> {
+                    loadData(currentDate, true)
+                }) {
                     Timber.i("Excusing for absence result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                    loadData(currentDate)
-                }
-            }
-        }.launch("excuse")
+                    view?.showProgress(false)
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
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 d54fb8bf1..03e95053f 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
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface AttendanceView : BaseView {
 
@@ -18,7 +18,7 @@ interface AttendanceView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Attendance>)
+    fun updateData(data: List<AttendanceItem>)
 
     fun updateNavigationDay(date: String)
 
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
deleted file mode 100644
index 4250a9109..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.summary
-
-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.AttendanceSummary
-import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
-import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
-import io.github.wulkanowy.utils.calculatePercentage
-import io.github.wulkanowy.utils.getFormattedName
-import java.time.Month
-import java.util.Locale
-import javax.inject.Inject
-
-class AttendanceSummaryAdapter @Inject constructor() :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
-    }
-
-    var items = emptyList<AttendanceSummary>()
-
-    override fun getItemCount() = if (items.isNotEmpty()) items.size + 2 else 0
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.HEADER.id
-        else -> ViewType.ITEM.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderAttendanceSummaryBinding.inflate(inflater, parent, false))
-            ViewType.ITEM.id -> ItemViewHolder(ItemAttendanceSummaryBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 2)
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: ScrollableHeaderAttendanceSummaryBinding) {
-        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(items.calculatePercentage())
-    }
-
-    private fun bindItemViewHolder(binding: ItemAttendanceSummaryBinding, position: Int) {
-        val item = if (position == -1) getTotalItem() else items[position]
-
-        with(binding) {
-            attendanceSummaryMonth.text = when (position) {
-                -1 -> root.context.getString(R.string.attendance_summary_total)
-                else -> item.month.getFormattedName()
-            }
-            attendanceSummaryPercentage.text = when (position) {
-                -1 -> formatPercentage(items.calculatePercentage())
-                else -> formatPercentage(item.calculatePercentage())
-            }
-
-            attendanceSummaryPresent.text = item.presence.toString()
-            attendanceSummaryAbsenceUnexcused.text = item.absence.toString()
-            attendanceSummaryAbsenceExcused.text = item.absenceExcused.toString()
-            attendanceSummaryAbsenceSchool.text = item.absenceForSchoolReasons.toString()
-            attendanceSummaryExemption.text = item.exemption.toString()
-            attendanceSummaryLatenessUnexcused.text = item.lateness.toString()
-            attendanceSummaryLatenessExcused.text = item.latenessExcused.toString()
-        }
-    }
-
-    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 },
-        diaryId = -1,
-        studentId = -1,
-        subjectId = -1
-    )
-
-    private fun formatPercentage(percentage: Double): String {
-        return if (percentage == 0.0) "0%"
-        else "${String.format(Locale.FRANCE, "%.2f", percentage)}%"
-    }
-
-    class HeaderViewHolder(val binding: ScrollableHeaderAttendanceSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class ItemViewHolder(val binding: ItemAttendanceSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index 2f8622374..8e30ea8b7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -1,33 +1,32 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.databinding.FragmentAttendanceSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
+import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class AttendanceSummaryFragment :
-    BaseFragment<FragmentAttendanceSummaryBinding>(R.layout.fragment_attendance_summary),
-    AttendanceSummaryView, MainView.TitledView {
+class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendanceSummaryPresenter
 
     @Inject
-    lateinit var attendanceSummaryAdapter: AttendanceSummaryAdapter
+    lateinit var attendanceSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
@@ -37,38 +36,41 @@ class AttendanceSummaryFragment :
         fun newInstance() = AttendanceSummaryFragment()
     }
 
+    override val totalString get() = getString(R.string.attendance_summary_total)
+
     override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty get() = attendanceSummaryAdapter.items.isEmpty()
+    override val isViewEmpty get() = attendanceSummaryAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAttendanceSummaryBinding.bind(view)
-        messageContainer = binding.attendanceSummaryRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_attendance_summary, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = attendanceSummaryRecycler
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SUBJECT_KEY))
     }
 
     override fun initView() {
-        with(binding.attendanceSummaryRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(attendanceSummaryRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceSummaryAdapter
         }
 
-        with(binding) {
-            attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-            attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+        attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        with(binding.attendanceSummarySubjects) {
+        with(attendanceSummarySubjects) {
             adapter = subjectsAdapter
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        binding.attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+        attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -79,50 +81,48 @@ class AttendanceSummaryFragment :
         }
     }
 
-    override fun updateDataSet(data: List<AttendanceSummary>) {
+    override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
         with(attendanceSummaryAdapter) {
-            items = data
-            notifyDataSetChanged()
+            updateDataSet(data, true)
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
         }
     }
 
     override fun clearView() {
-        with(attendanceSummaryAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        attendanceSummaryAdapter.clear()
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.attendanceSummaryError.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.attendanceSummaryErrorMessage.text = message
+        attendanceSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.attendanceSummarySwipe.isEnabled = enable
+        attendanceSummarySwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
+        attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showSubjects(show: Boolean) {
-        binding.attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
+        attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun hideRefresh() {
-        binding.attendanceSummarySwipe.isRefreshing = false
+        attendanceSummarySwipe.isRefreshing = false
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -131,7 +131,7 @@ class AttendanceSummaryFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
new file mode 100644
index 000000000..265d6ce44
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
@@ -0,0 +1,80 @@
+package io.github.wulkanowy.ui.modules.attendance.summary
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_attendance_summary.*
+
+class AttendanceSummaryItem(
+    private val month: String,
+    private val percentage: String,
+    private val present: String,
+    private val absence: String,
+    private val excusedAbsence: String,
+    private val schoolAbsence: String,
+    private val exemption: String,
+    private val lateness: String,
+    private val excusedLateness: String
+) : AbstractFlexibleItem<AttendanceSummaryItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_attendance_summary
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            attendanceSummaryMonth.text = month
+            attendanceSummaryPercentage.text = percentage
+            attendanceSummaryPresent.text = present
+            attendanceSummaryAbsenceUnexcused.text = absence
+            attendanceSummaryAbsenceExcused.text = excusedAbsence
+            attendanceSummaryAbsenceSchool.text = schoolAbsence
+            attendanceSummaryExemption.text = exemption
+            attendanceSummaryLatenessUnexcused.text = lateness
+            attendanceSummaryLatenessExcused.text = excusedLateness
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttendanceSummaryItem
+
+        if (month != other.month) return false
+        if (percentage != other.percentage) return false
+        if (present != other.present) return false
+        if (absence != other.absence) return false
+        if (excusedAbsence != other.excusedAbsence) return false
+        if (schoolAbsence != other.schoolAbsence) return false
+        if (exemption != other.exemption) return false
+        if (lateness != other.lateness) return false
+        if (excusedLateness != other.excusedLateness) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = month.hashCode()
+        result = 31 * result + percentage.hashCode()
+        result = 31 * result + present.hashCode()
+        result = 31 * result + absence.hashCode()
+        result = 31 * result + excusedAbsence.hashCode()
+        result = 31 * result + schoolAbsence.hashCode()
+        result = 31 * result + exemption.hashCode()
+        result = 31 * result + lateness.hashCode()
+        result = 31 * result + excusedLateness.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index e5dce9ac8..8fc5b6e4a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -9,21 +9,25 @@ import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.calculatePercentage
+import io.github.wulkanowy.utils.getFormattedName
+import org.threeten.bp.Month
 import timber.log.Timber
-import java.time.Month
+import java.lang.String.format
+import java.util.Locale.FRANCE
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class AttendanceSummaryPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
     private val subjectRepository: SubjectRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository) {
+) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository, schedulers) {
 
     private var subjects = emptyList<Subject>()
 
@@ -74,43 +78,41 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
+        Timber.i("Loading attendance summary data started")
         currentSubjectId = subjectId
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceSummaryRepository.getAttendanceSummary(student, semester, subjectId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading attendance summary data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap {
+                        attendanceSummaryRepository.getAttendanceSummary(student, it, subjectId, forceRefresh)
+                    }
+                }
+                .map { createAttendanceSummaryItems(it) to AttendanceSummaryScrollableHeader(formatPercentage(it.calculatePercentage())) }
+                .delay(200, MILLISECONDS)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading attendance summary result: Success")
                     view?.apply {
-                        showEmpty(it.data!!.isEmpty())
-                        showContent(it.data.isNotEmpty())
-                        updateDataSet(it.data.sortedByDescending { item ->
-                            if (item.month.value <= Month.JUNE.value) item.month.value + 12 else item.month.value
-                        })
+                        showEmpty(it.first.isEmpty())
+                        showContent(it.first.isNotEmpty())
+                        updateDataSet(it.first, it.second)
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "attendance_summary",
-                        "items" to it.data!!.size,
-                        "item_id" to subjectId
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_attendance_summary", "items" to it.first.size, "force_refresh" to forceRefresh, "item_id" to subjectId)
+                }) {
                     Timber.i("Loading attendance summary result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -125,27 +127,65 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            subjectRepository.getSubjects(student, semester)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading attendance summary subjects started")
-                Status.SUCCESS -> {
-                    subjects = it.data!!
-
-                    Timber.i("Loading attendance summary subjects result: Success")
-                    view?.run {
-                        view?.updateSubjects(ArrayList(it.data.map { subject -> subject.name }))
-                        showSubjects(true)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading attendance summary subjects result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading attendance summary subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
                 }
             }
-        }.launch("subjects")
+            .doOnSuccess { subjects = it }
+            .map { ArrayList(it.map { subject -> subject.name }) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading attendance summary subjects result: Success")
+                view?.run {
+                    view?.updateSubjects(it)
+                    showSubjects(true)
+                }
+            }, {
+                Timber.i("Loading attendance summary subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
+    }
+
+    private fun createAttendanceSummaryTotalItem(attendanceSummary: List<AttendanceSummary>): AttendanceSummaryItem {
+        return AttendanceSummaryItem(
+            month = view?.totalString.orEmpty(),
+            percentage = formatPercentage(attendanceSummary.calculatePercentage()),
+            present = attendanceSummary.sumBy { it.presence }.toString(),
+            absence = attendanceSummary.sumBy { it.absence }.toString(),
+            excusedAbsence = attendanceSummary.sumBy { it.absenceExcused }.toString(),
+            schoolAbsence = attendanceSummary.sumBy { it.absenceForSchoolReasons }.toString(),
+            exemption = attendanceSummary.sumBy { it.exemption }.toString(),
+            lateness = attendanceSummary.sumBy { it.lateness }.toString(),
+            excusedLateness = attendanceSummary.sumBy { it.latenessExcused }.toString()
+        )
+    }
+
+    private fun createAttendanceSummaryItems(attendanceSummary: List<AttendanceSummary>): List<AttendanceSummaryItem> {
+        if (attendanceSummary.isEmpty()) return emptyList()
+        return listOf(createAttendanceSummaryTotalItem(attendanceSummary)) + attendanceSummary.sortedByDescending {
+            if (it.month.value <= Month.JUNE.value) it.month.value + 12 else it.month.value
+        }.map {
+            AttendanceSummaryItem(
+                month = it.month.getFormattedName(),
+                percentage = formatPercentage(it.calculatePercentage()),
+                present = it.presence.toString(),
+                absence = it.absence.toString(),
+                excusedAbsence = it.absenceExcused.toString(),
+                schoolAbsence = it.absenceForSchoolReasons.toString(),
+                exemption = it.exemption.toString(),
+                lateness = it.lateness.toString(),
+                excusedLateness = it.latenessExcused.toString()
+            )
+        }
+    }
+
+    private fun formatPercentage(percentage: Double): String {
+        return if (percentage == 0.0) "0%"
+        else "${format(FRANCE, "%.2f", percentage)}%"
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
new file mode 100644
index 000000000..c258f71d2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
@@ -0,0 +1,46 @@
+package io.github.wulkanowy.ui.modules.attendance.summary
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_attendance_summary.*
+
+class AttendanceSummaryScrollableHeader(private val percentage: String) :
+    AbstractFlexibleItem<AttendanceSummaryScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_attendance_summary
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply { attendanceSummaryScrollableHeaderPercentage.text = percentage }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AttendanceSummaryScrollableHeader
+
+        if (percentage != other.percentage) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return percentage.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
index dd4053c72..8bd5332d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@@ -1,10 +1,11 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AttendanceSummaryView : BaseView {
 
+    val totalString: String
+
     val isViewEmpty: Boolean
 
     fun initView()
@@ -23,7 +24,7 @@ interface AttendanceSummaryView : BaseView {
 
     fun setErrorDetails(message: String)
 
-    fun updateDataSet(data: List<AttendanceSummary>)
+    fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
 
     fun updateSubjects(data: ArrayList<String>)
 
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
deleted file mode 100644
index 535587399..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.github.wulkanowy.ui.modules.exam
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.ViewGroup
-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.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import java.time.LocalDate
-import javax.inject.Inject
-
-class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var items = emptyList<ExamItem<*>>()
-
-    var onClickListener: (Exam) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ExamItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderExamBinding.inflate(inflater, parent, false))
-            ExamItem.ViewType.ITEM.id -> ItemViewHolder(ItemExamBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Exam)
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
-    private fun bindHeaderViewHolder(binding: HeaderExamBinding, date: LocalDate) {
-        with(binding) {
-            examHeaderDay.text = date.weekDayName.capitalize()
-            examHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    private fun bindItemViewHolder(binding: ItemExamBinding, exam: Exam) {
-        with(binding) {
-            examItemSubject.text = exam.subject
-            examItemTeacher.text = exam.teacher
-            examItemType.text = exam.type
-
-            root.setOnClickListener { onClickListener(exam) }
-        }
-    }
-
-    private class HeaderViewHolder(val binding: HeaderExamBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemExamBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index c1a6f1f0d..ed5092c96 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -5,15 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.databinding.DialogExamBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_exam.*
 
 class ExamDialog : DialogFragment() {
 
-    private var binding: DialogExamBinding by lifecycleAwareVariable()
-
     private lateinit var exam: Exam
 
     companion object {
@@ -35,20 +33,18 @@ class ExamDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogExamBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_exam, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            examDialogSubjectValue.text = exam.subject
-            examDialogTypeValue.text = exam.type
-            examDialogTeacherValue.text = exam.teacher
-            examDialogDateValue.text = exam.entryDate.toFormattedString()
-            examDialogDescriptionValue.text = exam.description
+        examDialogSubjectValue.text = exam.subject
+        examDialogTypeValue.text = exam.type
+        examDialogTeacherValue.text = exam.teacher
+        examDialogDateValue.text = exam.entryDate.toFormattedString()
+        examDialogDescriptionValue.text = exam.description
 
-            examDialogClose.setOnClickListener { dismiss() }
-        }
+        examDialogClose.setOnClickListener { dismiss() }
     }
 }
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 000da00f8..b880f4650 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
@@ -1,31 +1,33 @@
 package io.github.wulkanowy.ui.modules.exam
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.databinding.FragmentExamBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
-    MainView.MainChildView, MainView.TitledView {
+class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: ExamPresenter
 
     @Inject
-    lateinit var examAdapter: ExamAdapter
+    lateinit var examAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -35,60 +37,57 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
 
     override val titleStringId get() = R.string.exam_title
 
-    override val isViewEmpty get() = examAdapter.items.isEmpty()
+    override val isViewEmpty get() = examAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentExamBinding.bind(view)
-        messageContainer = binding.examRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_exam, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = examRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        examAdapter.onClickListener = presenter::onExamItemSelected
+        examAdapter.setOnItemClickListener(presenter::onExamItemSelected)
 
-        with(binding.examRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(examRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = examAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider(R.layout.item_exam)
+                .withDrawDividerOnLastItem(false))
         }
 
-        with(binding) {
-            examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            examErrorRetry.setOnClickListener { presenter.onRetry() }
-            examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        examErrorRetry.setOnClickListener { presenter.onRetry() }
+        examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
-            examNextButton.setOnClickListener { presenter.onNextWeek() }
+        examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
+        examNextButton.setOnClickListener { presenter.onNextWeek() }
 
-            examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun hideRefresh() {
-        binding.examSwipe.isRefreshing = false
+        examSwipe.isRefreshing = false
     }
 
-    override fun updateData(data: List<ExamItem<*>>) {
-        with(examAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<ExamItem>) {
+        examAdapter.updateDataSet(data, true)
     }
 
     override fun updateNavigationWeek(date: String) {
-        binding.examNavDate.text = date
+        examNavDate.text = date
     }
 
     override fun clearData() {
-        with(examAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        examAdapter.clear()
     }
 
     override fun resetView() {
-        binding.examRecycler.scrollToPosition(0)
+        examRecycler.scrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -96,35 +95,35 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.examEmpty.visibility = if (show) VISIBLE else GONE
+        examEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.examError.visibility = if (show) VISIBLE else GONE
+        examError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.examErrorMessage.text = message
+        examErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.examProgress.visibility = if (show) VISIBLE else GONE
+        examProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.examSwipe.isEnabled = enable
+        examSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.examRecycler.visibility = if (show) VISIBLE else GONE
+        examRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.examNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        examNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExamDialog(exam: Exam) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
new file mode 100644
index 000000000..0a5b862c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.ui.modules.exam
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractHeaderItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_exam.*
+import org.threeten.bp.LocalDate
+
+class ExamHeader(private val date: LocalDate) : AbstractHeaderItem<ExamHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.header_exam
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder,
+                                position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            examHeaderDay.text = date.weekDayName.capitalize()
+            examHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ExamHeader
+
+        if (date != other.date) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return date.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
+            LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
index 579e37203..8971b4df3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
@@ -1,9 +1,50 @@
 package io.github.wulkanowy.ui.modules.exam
 
-data class ExamItem<out T>(val value: T, val viewType: ViewType) {
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Exam
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_exam.*
 
-    enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
+class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<ExamItem.ViewHolder, ExamHeader>(header) {
+
+    override fun getLayoutRes() = R.layout.item_exam
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            examItemSubject.text = exam.subject
+            examItemTeacher.text = exam.teacher
+            examItemType.text = exam.type
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ExamItem
+
+        if (exam != other.exam) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = exam.hashCode()
+        result = 31 * result + exam.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
     }
 }
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 f63316a8d..aac9bc4bb 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
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,30 +8,28 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class ExamPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val examRepository: ExamRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<ExamView>(errorHandler, studentRepository) {
+) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -77,9 +75,11 @@ class ExamPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onExamItemSelected(exam: Exam) {
-        Timber.i("Select exam item ${exam.id}")
-        view?.showExamDialog(exam)
+    fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is ExamItem) {
+            Timber.i("Select exam item ${item.exam.id}")
+            view?.showExamDialog(item.exam)
+        }
     }
 
     fun onViewReselected() {
@@ -93,54 +93,56 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading exam data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            examRepository.getExams(student, semester, currentDate.monday, currentDate.sunday, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading exam data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        examRepository.getExams(student, semester, currentDate.monday, currentDate.friday, forceRefresh)
+                    }
+                }
+                .delay(200, MILLISECONDS)
+                .map { it.groupBy { exam -> exam.date }.toSortedMap() }
+                .map { createExamItems(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading exam result: Success")
                     view?.apply {
-                        updateData(createExamItems(it.data!!))
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "exam",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh)
+                }) {
                     Timber.i("Loading exam result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -154,12 +156,12 @@ class ExamPresenter @Inject constructor(
         }
     }
 
-    private fun createExamItems(items: List<Exam>): List<ExamItem<*>> {
-        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
-            listOf(ExamItem(date, ExamItem.ViewType.HEADER)) + exams.reversed().map { exam ->
-                ExamItem(exam, ExamItem.ViewType.ITEM)
+    private fun createExamItems(items: Map<LocalDate, List<Exam>>): List<ExamItem> {
+        return items.flatMap {
+            ExamHeader(it.key).let { header ->
+                it.value.reversed().map { item -> ExamItem(header, item) }
             }
-        }.flatten()
+        }
     }
 
     private fun reloadView() {
@@ -180,7 +182,7 @@ class ExamPresenter @Inject constructor(
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.sunday.toFormattedString("dd.MM"))
+                currentDate.friday.toFormattedString("dd.MM"))
         }
     }
 }
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 00429bae6..5f4a74306 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
@@ -9,7 +9,7 @@ interface ExamView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<ExamItem<*>>)
+    fun updateData(data: List<ExamItem>)
 
     fun updateNavigationWeek(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
deleted file mode 100644
index 1960c3df7..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade
-
-enum class GradeAverageMode(val value: String) {
-    ALL_YEAR("all_year"),
-    ONE_SEMESTER("only_one_semester"),
-    BOTH_SEMESTERS("both_semesters");
-
-    companion object {
-        fun getByValue(value: String) = values().firstOrNull { it.value == value } ?: ONE_SEMESTER
-    }
-}
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 5d0a310f2..3bb084d3a 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
@@ -1,136 +1,73 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
-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.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ALL_YEAR
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.BOTH_SEMESTERS
-import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ONE_SEMESTER
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.flatMapConcat
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
+import io.reactivex.Maybe
+import io.reactivex.Single
 import javax.inject.Inject
 
-@OptIn(FlowPreview::class)
 class GradeAverageProvider @Inject constructor(
-    private val semesterRepository: SemesterRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val gradeRepository: GradeRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val gradeSummaryRepository: GradeSummaryRepository
 ) {
 
-    private val plusModifier get() = preferencesRepository.gradePlusModifier
+    private val plusModifier = preferencesRepository.gradePlusModifier
 
-    private val minusModifier get() = preferencesRepository.gradeMinusModifier
+    private val minusModifier = preferencesRepository.gradeMinusModifier
 
-    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) = flowWithResourceIn {
-        val semesters = semesterRepository.getSemesters(student)
-
-        when (preferencesRepository.gradeAverageMode) {
-            ONE_SEMESTER -> getSemesterDetailsWithAverage(student, semesters.single { it.semesterId == semesterId }, forceRefresh)
-            BOTH_SEMESTERS -> calculateBothSemestersAverage(student, semesters, semesterId, forceRefresh)
-            ALL_YEAR -> calculateAllYearAverage(student, semesters, semesterId, forceRefresh)
+    fun getGradeAverage(student: Student, semesters: List<Semester>, selectedSemesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
+        return when (preferencesRepository.gradeAverageMode) {
+            "all_year" -> getAllYearAverage(student, semesters, selectedSemesterId, forceRefresh)
+            "only_one_semester" -> getOnlyOneSemesterAverage(student, semesters, selectedSemesterId, forceRefresh)
+            else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
         }
-    }.distinctUntilChanged()
+    }
 
-    private fun calculateBothSemestersAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
+    private fun getAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMapConcat { selectedDetails ->
-            val isAnyAverage = selectedDetails.data.orEmpty().any { it.average != .0 }
-
-            if (selectedSemester != firstSemester) {
-                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
-                    secondDetails.copy(data = selectedDetails.data?.map { selected ->
-                        val second = secondDetails.data.orEmpty().singleOrNull { it.subject == selected.subject }
-                        selected.copy(average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                            val selectedGrades = selected.grades.updateModifiers(student).calcAverage()
-                            (selectedGrades + (second?.grades?.updateModifiers(student)?.calcAverage() ?: selectedGrades)) / 2
-                        } else (selected.average + (second?.average ?: selected.average)) / 2)
-                    })
-                }.filter { it.status != Status.LOADING }.filter { it.data != null }
-            } else flowOf(selectedDetails)
-        }
+        return getAverageFromGradeSummary(student, selectedSemester, forceRefresh)
+            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+                .flatMap { firstGrades ->
+                    if (selectedSemester == firstSemester) Single.just(firstGrades)
+                    else {
+                        gradeRepository.getGrades(student, firstSemester)
+                            .map { secondGrades -> secondGrades + firstGrades }
+                    }
+                }.map { grades ->
+                    grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
+                        .groupBy { it.subject }
+                        .map { Triple(it.key, it.value.calcAverage(), "") }
+                })
     }
 
-    private fun calculateAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
+    private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<Triple<String, Double, String>>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
-        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMapConcat { selectedDetails ->
-            val isAnyAverage = selectedDetails.data.orEmpty().any { it.average != .0 }
-
-            if (selectedSemester != firstSemester) {
-                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
-                    secondDetails.copy(data = selectedDetails.data?.map { selected ->
-                        val second = secondDetails.data.orEmpty().singleOrNull { it.subject == selected.subject }
-                        selected.copy(average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                            (selected.grades.updateModifiers(student) + second?.grades?.updateModifiers(student).orEmpty()).calcAverage()
-                        } else selected.average)
-                    })
-                }.filter { it.status != Status.LOADING }.filter { it.data != null }
-            } else flowOf(selectedDetails)
-        }
+        return getAverageFromGradeSummary(student, selectedSemester, forceRefresh)
+            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
+                .map { grades ->
+                    grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
+                        .groupBy { it.subject }
+                        .map { Triple(it.key, it.value.calcAverage(), "") }
+                })
     }
 
-    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
-        return gradeRepository.getGrades(student, semester, forceRefresh = forceRefresh).map { res ->
-            val (details, summaries) = res.data ?: null to null
-            val isAnyAverage = summaries.orEmpty().any { it.average != .0 }
-            val allGrades = details.orEmpty().groupBy { it.subject }
-
-            Resource(res.status, summaries?.emulateEmptySummaries(student, semester, allGrades.toList(), isAnyAverage)?.map { summary ->
-                val grades = allGrades[summary.subject].orEmpty()
-                GradeDetailsWithAverage(
-                    subject = summary.subject,
-                    average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
-                        grades.updateModifiers(student).calcAverage()
-                    } else summary.average,
-                    points = summary.pointsSum,
-                    summary = summary,
-                    grades = grades
-                )
-            }, res.error)
-        }
-    }
-
-    private fun List<GradeSummary>.emulateEmptySummaries(student: Student, semester: Semester, grades: List<Pair<String, List<Grade>>>, calcAverage: Boolean): List<GradeSummary> {
-        if (isNotEmpty() && size > grades.size) return this
-
-        return grades.mapIndexed { i, (subject, details) ->
-            singleOrNull { it.subject == subject }?.let { return@mapIndexed it }
-            GradeSummary(
-                studentId = student.studentId,
-                semesterId = semester.semesterId,
-                position = i,
-                subject = subject,
-                predictedGrade = "",
-                finalGrade = "",
-                proposedPoints = "",
-                finalPoints = "",
-                pointsSum = "",
-                average = if (calcAverage) details.updateModifiers(student).calcAverage() else .0
-            )
-        }
-    }
-
-    private fun List<Grade>.updateModifiers(student: Student): List<Grade> {
-        return if (student.loginMode == Sdk.Mode.SCRAPPER.name) {
-            map { it.changeModifier(plusModifier, minusModifier) }
-        } else this
+    private fun getAverageFromGradeSummary(student: Student, selectedSemester: Semester, forceRefresh: Boolean): Maybe<List<Triple<String, Double, String>>> {
+        return gradeSummaryRepository.getGradesSummary(student, selectedSemester, forceRefresh)
+            .toMaybe()
+            .flatMap {
+                if (it.any { summary -> summary.average != .0 }) {
+                    Maybe.just(it.map { summary -> Triple(summary.subject, summary.average, summary.pointsSum) })
+                } else Maybe.empty()
+            }.filter { !preferencesRepository.gradeAverageForceCalc }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
deleted file mode 100644
index 3f5d706b3..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade
-
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradeSummary
-
-data class GradeDetailsWithAverage(
-    val subject: String,
-    val average: Double,
-    val points: String,
-    val summary: GradeSummary,
-    val grades: List<Grade>
-)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 0678e13ef..b1faf18f1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -1,16 +1,16 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
@@ -19,16 +19,16 @@ import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView,
-    MainView.MainChildView, MainView.TitledView {
+class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: GradePresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     private var semesterSwitchMenu: MenuItem? = null
 
@@ -42,16 +42,19 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override var subtitleString = ""
 
-    override val currentPageIndex get() = binding.gradeViewPager.currentItem
+    override val currentPageIndex get() = gradeViewPager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
     }
 
@@ -63,7 +66,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = binding.gradeViewPager.id
+            containerId = gradeViewPager.id
             addFragmentsWithTitle(mapOf(
                 GradeDetailsFragment.newInstance() to getString(R.string.all_details),
                 GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
@@ -71,21 +74,19 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
             ))
         }
 
-        with(binding.gradeViewPager) {
+        with(gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(binding.gradeTabLayout) {
-            setupWithViewPager(binding.gradeViewPager)
+        with(gradeTabLayout) {
+            setupWithViewPager(gradeViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
 
-        with(binding) {
-            gradeErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        gradeErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -98,22 +99,20 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun showContent(show: Boolean) {
-        with(binding) {
-            gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
-            gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
+        gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
+        gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeError.visibility = if (show) VISIBLE else INVISIBLE
+        gradeError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeErrorMessage.text = message
+        gradeErrorMessage.text = message
     }
 
     override fun showSemesterSwitch(show: Boolean) {
@@ -167,7 +166,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
new file mode 100644
index 000000000..342f356cb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerChildFragment
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
+import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
+
+@Suppress("unused")
+@Module
+abstract class GradeModule {
+
+    companion object {
+
+        @PerFragment
+        @Provides
+        fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
+    }
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun bindGradeDetailsFragment(): GradeDetailsFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun binGradeSummaryFragment(): GradeSummaryFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun binGradeStatisticsFragment(): GradeStatisticsFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index d4c9f210a..78885ebd5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -1,25 +1,24 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCurrentOrLast
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeView>(errorHandler, studentRepository, schedulers) {
 
     var selectedIndex = 0
         private set
@@ -99,33 +98,29 @@ class GradePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            delay(200)
-            semesterRepository.getSemesters(student, refreshOnNoCurrent = true)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade data started")
-                Status.SUCCESS -> {
-                    val current = it.data!!.getCurrentOrLast()
-                    selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
-                    schoolYear = current.schoolYear
-                    semesters = it.data.filter { semester -> semester.diaryId == current.diaryId }
-                    view?.setCurrentSemesterName(current.semesterName, schoolYear)
+        Timber.i("Loading grade data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it, refreshOnNoCurrent = true) }
+            .delay(200, MILLISECONDS)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                val current = it.getCurrentOrLast()
+                selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
+                schoolYear = current.schoolYear
+                semesters = it.filter { semester -> semester.diaryId == current.diaryId }
+                view?.setCurrentSemesterName(current.semesterName, schoolYear)
 
-                    view?.run {
-                        Timber.i("Loading grade result: Attempt load index $currentPageIndex")
-                        loadChild(currentPageIndex)
-                        showErrorView(false)
-                        showSemesterSwitch(true)
-                    }
+                view?.run {
+                    Timber.i("Loading grade result: Attempt load index $currentPageIndex")
+                    loadChild(currentPageIndex)
+                    showErrorView(false)
+                    showSemesterSwitch(true)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading grade result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch()
+            }) {
+                Timber.i("Loading grade result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -138,7 +133,6 @@ class GradePresenter @Inject constructor(
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
-        Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${semesters.joinToString { it.semesterName.toString() }}")
         semesters.first { it.semesterName == selectedIndex }.semesterId.also {
             if (forceRefresh || loadedSemesterId[index] != it) {
                 Timber.i("Load grade child view index: $index")
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
deleted file mode 100644
index c129d9485..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
+++ /dev/null
@@ -1,198 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.details
-
-import android.annotation.SuppressLint
-import android.content.res.Resources
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.databinding.HeaderGradeDetailsBinding
-import io.github.wulkanowy.databinding.ItemGradeDetailsBinding
-import io.github.wulkanowy.ui.base.BaseExpandableAdapter
-import io.github.wulkanowy.utils.getBackgroundColor
-import io.github.wulkanowy.utils.toFormattedString
-import timber.log.Timber
-import javax.inject.Inject
-
-class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<RecyclerView.ViewHolder>() {
-
-    private var headers = mutableListOf<GradeDetailsItem>()
-
-    private var items = mutableListOf<GradeDetailsItem>()
-
-    private var expandedPosition = NO_POSITION
-
-    private var isExpandable = false
-
-    var onClickListener: (Grade, position: Int) -> Unit = { _, _ -> }
-
-    var colorTheme = ""
-
-    fun setDataItems(data: List<GradeDetailsItem>, isExpanded: Boolean = isExpandable) {
-        headers = data.filter { it.viewType == ViewType.HEADER }.toMutableList()
-        items = if (isExpanded) headers else data.toMutableList()
-        isExpandable = isExpanded
-        expandedPosition = NO_POSITION
-    }
-
-    fun updateDetailsItem(position: Int, grade: Grade) {
-        if (items.getOrNull(position)?.viewType != ViewType.ITEM) {
-            Timber.e("Trying to update item $position on list ${items.size} size, expanded position: $expandedPosition")
-            return
-        }
-        items[position] = GradeDetailsItem(grade, ViewType.ITEM)
-        notifyItemChanged(position)
-    }
-
-    fun getHeaderItem(subject: String): GradeDetailsItem {
-        val candidates = headers.filter { (it.value as GradeDetailsHeader).subject == subject }
-
-        if (candidates.size > 1) {
-            Timber.e("Header with subject $subject found ${candidates.size} times! Expanded: $expandedPosition. Items: $candidates")
-        }
-
-        return candidates.first()
-    }
-
-    fun updateHeaderItem(item: GradeDetailsItem) {
-        val headerPosition = headers.indexOf(item)
-        val itemPosition = items.indexOf(item)
-
-        if (headerPosition == NO_POSITION || itemPosition == NO_POSITION) {
-            Timber.e("Invalid update header positions! Header: $headerPosition, item: $itemPosition")
-        }
-
-        headers[headerPosition] = item
-        items[itemPosition] = item
-        notifyItemChanged(itemPosition)
-    }
-
-    fun collapseAll() {
-        if (expandedPosition != -1) {
-            refreshList(headers)
-            expandedPosition = NO_POSITION
-        }
-    }
-
-    @Synchronized
-    private fun refreshList(newItems: MutableList<GradeDetailsItem>) {
-        val diffCallback = GradeDetailsDiffUtil(items, newItems)
-        val diffResult = DiffUtil.calculateDiff(diffCallback)
-        items = newItems
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            ViewType.HEADER.id -> HeaderViewHolder(HeaderGradeDetailsBinding.inflate(inflater, parent, false))
-            ViewType.ITEM.id -> ItemViewHolder(ItemGradeDetailsBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(
-                holder = holder,
-                header = items[position].value as GradeDetailsHeader,
-                position = position
-            )
-            is ItemViewHolder -> bindItemViewHolder(
-                holder = holder,
-                grade = items[position].value as Grade
-            )
-        }
-    }
-
-    private fun bindHeaderViewHolder(holder: HeaderViewHolder, header: GradeDetailsHeader, position: Int) {
-        val headerPosition = headers.indexOf(items[position])
-        val adapterPosition = holder.adapterPosition
-
-        with(holder.binding) {
-            gradeHeaderDivider.visibility = if (adapterPosition == 0) View.GONE else View.VISIBLE
-            with(gradeHeaderSubject) {
-                text = header.subject
-                maxLines = if (headerPosition == expandedPosition) 2 else 1
-            }
-            gradeHeaderAverage.text = formatAverage(header.average, root.context.resources)
-            gradeHeaderPointsSum.text = root.context.getString(R.string.grade_points_sum, header.pointsSum)
-            gradeHeaderPointsSum.visibility = if (!header.pointsSum.isNullOrEmpty()) View.VISIBLE else View.GONE
-            gradeHeaderNumber.text = root.context.resources.getQuantityString(R.plurals.grade_number_item, header.grades.size, header.grades.size)
-            gradeHeaderNote.visibility = if (header.newGrades > 0) View.VISIBLE else View.GONE
-            if (header.newGrades > 0) gradeHeaderNote.text = header.newGrades.toString(10)
-
-            gradeHeaderContainer.isEnabled = isExpandable
-            gradeHeaderContainer.setOnClickListener {
-                expandedPosition = if (expandedPosition == adapterPosition) -1 else adapterPosition
-
-                if (expandedPosition != NO_POSITION) {
-                    refreshList(headers.toMutableList().apply {
-                        addAll(headerPosition + 1, header.grades)
-                    })
-                    scrollToHeaderWithSubItems(headerPosition, header.grades.size)
-                } else {
-                    refreshList(headers)
-                }
-            }
-        }
-    }
-
-    private fun formatAverage(average: Double?, resources: Resources): String {
-        return if (average == null || average == .0) resources.getString(R.string.grade_no_average)
-        else resources.getString(R.string.grade_average, average)
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(holder: ItemViewHolder, grade: Grade) {
-        with(holder.binding) {
-            gradeItemValue.run {
-                text = grade.entry
-                setBackgroundResource(grade.getBackgroundColor(colorTheme))
-            }
-            gradeItemDescription.text = when {
-                grade.description.isNotBlank() -> grade.description
-                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
-                else -> root.context.getString(R.string.all_no_description)
-            }
-            gradeItemDate.text = grade.date.toFormattedString()
-            gradeItemWeight.text = "${root.context.getString(R.string.grade_weight)}: ${grade.weight}"
-            gradeItemNote.visibility = if (!grade.isRead) View.VISIBLE else View.GONE
-
-            root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(grade, it) }
-            }
-        }
-    }
-
-    private class HeaderViewHolder(val binding: HeaderGradeDetailsBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemGradeDetailsBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class GradeDetailsDiffUtil(private val old: List<GradeDetailsItem>, private val new: List<GradeDetailsItem>) :
-        DiffUtil.Callback() {
-
-        override fun getOldListSize() = old.size
-
-        override fun getNewListSize() = new.size
-
-        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition] == new[newItemPosition]
-        }
-
-        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition] == new[newItemPosition]
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 698aff3ea..a8f8a8653 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -8,17 +8,14 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.databinding.DialogGradeBinding
 import io.github.wulkanowy.utils.colorStringId
 import io.github.wulkanowy.utils.getBackgroundColor
 import io.github.wulkanowy.utils.getGradeColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_grade.*
 
 class GradeDetailsDialog : DialogFragment() {
 
-    private var binding: DialogGradeBinding by lifecycleAwareVariable()
-
     private lateinit var grade: Grade
 
     private lateinit var colorScheme: String
@@ -47,49 +44,47 @@ class GradeDetailsDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_grade, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            gradeDialogSubject.text = grade.subject
+        gradeDialogSubject.text = grade.subject
 
-            gradeDialogColorAndWeightValue.run {
-                text = context.getString(R.string.grade_weight_value, grade.weight)
-                setBackgroundResource(grade.getGradeColor())
-            }
-
-            gradeDialogDateValue.text = grade.date.toFormattedString()
-            gradeDialogColorValue.text = getString(grade.colorStringId)
-
-            gradeDialogCommentValue.apply {
-                if (grade.comment.isBlank()) {
-                    visibility = GONE
-                    gradeDialogComment.visibility = GONE
-                } else text = grade.comment
-            }
-
-            gradeDialogValue.run {
-                text = grade.entry
-                setBackgroundResource(grade.getBackgroundColor(colorScheme))
-            }
-
-            gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
-                getString(R.string.all_no_data)
-            } else grade.teacher
-
-            gradeDialogDescriptionValue.text = grade.run {
-                when {
-                    description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
-                    description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
-                    gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
-                    else -> description
-                }
-            }
-
-            gradeDialogClose.setOnClickListener { dismiss() }
+        gradeDialogColorAndWeightValue.run {
+            text = context.getString(R.string.grade_weight_value, grade.weight)
+            setBackgroundResource(grade.getGradeColor())
         }
+
+        gradeDialogDateValue.text = grade.date.toFormattedString()
+        gradeDialogColorValue.text = getString(grade.colorStringId)
+
+        gradeDialogCommentValue.apply {
+            if (grade.comment.isBlank()) {
+                visibility = GONE
+                gradeDialogComment.visibility = GONE
+            } else text = grade.comment
+        }
+
+        gradeDialogValue.run {
+            text = grade.entry
+            setBackgroundResource(grade.getBackgroundColor(colorScheme))
+        }
+
+        gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
+            getString(R.string.all_no_data)
+        } else grade.teacher
+
+        gradeDialogDescriptionValue.text = grade.run {
+            when {
+                description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
+                description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
+                gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
+                else -> description
+            }
+        }
+
+        gradeDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index ef9a932e1..9505d354f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -8,27 +9,29 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IExpandable
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.databinding.FragmentGradeDetailsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class GradeDetailsFragment :
-    BaseFragment<FragmentGradeDetailsBinding>(R.layout.fragment_grade_details), GradeDetailsView,
-    GradeView.GradeChildView {
+class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeDetailsPresenter
 
     @Inject
-    lateinit var gradeDetailsAdapter: GradeDetailsAdapter
+    lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     private var gradeDetailsMenu: Menu? = null
 
@@ -36,18 +39,36 @@ class GradeDetailsFragment :
         fun newInstance() = GradeDetailsFragment()
     }
 
+    override val emptyAverageString: String
+        get() = getString(R.string.grade_no_average)
+
+    override val averageString: String
+        get() = getString(R.string.grade_average)
+
+    override val pointsSumString: String
+        get() = getString(R.string.grade_points_sum)
+
+    override val weightString: String
+        get() = getString(R.string.grade_weight)
+
+    override val noDescriptionString: String
+        get() = getString(R.string.all_no_description)
+
     override val isViewEmpty
-        get() = gradeDetailsAdapter.itemCount == 0
+        get() = gradeDetailsAdapter.isEmpty
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeDetailsBinding.bind(view)
-        messageContainer = binding.gradeDetailsRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_details, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeDetailsRecycler
         presenter.onAttachView(this)
     }
 
@@ -58,17 +79,22 @@ class GradeDetailsFragment :
     }
 
     override fun initView() {
-        gradeDetailsAdapter.onClickListener = presenter::onGradeItemSelected
-
-        with(binding) {
-            with(gradeDetailsRecycler) {
-                layoutManager = LinearLayoutManager(context)
-                adapter = gradeDetailsAdapter
-            }
-            gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        gradeDetailsAdapter.run {
+            isAutoCollapseOnExpand = true
+            isAutoScrollOnExpand = true
+            setOnItemClickListener { presenter.onGradeItemSelected(it) }
         }
+
+        gradeDetailsRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = gradeDetailsAdapter
+            addItemDecoration(GradeDetailsHeaderItemDecoration(context)
+                .withDefaultDivider(R.layout.header_grade_details)
+            )
+        }
+        gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -76,23 +102,16 @@ class GradeDetailsFragment :
         else false
     }
 
-    override fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String) {
-        with(gradeDetailsAdapter) {
-            colorTheme = gradeColorTheme
-            setDataItems(data, isGradeExpandable)
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<GradeDetailsHeader>) {
+        gradeDetailsAdapter.updateDataSet(data, true)
     }
 
-    override fun updateItem(item: Grade, position: Int) {
-        gradeDetailsAdapter.updateDetailsItem(position, item)
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        gradeDetailsAdapter.updateItem(item)
     }
 
     override fun clearView() {
-        with(gradeDetailsAdapter) {
-            setDataItems(mutableListOf())
-            notifyDataSetChanged()
-        }
+        gradeDetailsAdapter.clear()
     }
 
     override fun collapseAllItems() {
@@ -100,43 +119,43 @@ class GradeDetailsFragment :
     }
 
     override fun scrollToStart() {
-        binding.gradeDetailsRecycler.smoothScrollToPosition(0)
+        gradeDetailsRecycler.scrollToPosition(0)
     }
 
-    override fun getHeaderOfItem(subject: String): GradeDetailsItem {
-        return gradeDetailsAdapter.getHeaderItem(subject)
+    override fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>? {
+        return gradeDetailsAdapter.getExpandableOf(item)
     }
 
-    override fun updateHeaderItem(item: GradeDetailsItem) {
-        gradeDetailsAdapter.updateHeaderItem(item)
+    override fun getGradeNumberString(number: Int): String {
+        return resources.getQuantityString(R.plurals.grade_number_item, number, number)
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
+        gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.gradeDetailsSwipe.isEnabled = enable
+        gradeDetailsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeDetailsError.visibility = if (show) VISIBLE else GONE
+        gradeDetailsError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeDetailsErrorMessage.text = message
+        gradeDetailsErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.gradeDetailsSwipe.isRefreshing = show
+        gradeDetailsSwipe.isRefreshing = show
     }
 
     override fun showGradeDialog(grade: Grade, colorScheme: String) {
@@ -168,7 +187,7 @@ class GradeDetailsFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
new file mode 100644
index 000000000..4a34a1457
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
@@ -0,0 +1,94 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractExpandableItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_grade_details.*
+
+class GradeDetailsHeader(
+    private val subject: String,
+    private val number: String,
+    private val average: String,
+    private val pointsSum: String,
+    var newGrades: Int,
+    private val isExpandable: Boolean
+) : AbstractExpandableItem<GradeDetailsHeader.ViewHolder, GradeDetailsItem>() {
+
+    init {
+        isExpanded = !isExpandable
+    }
+
+    override fun getLayoutRes() = R.layout.header_grade_details
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            gradeHeaderSubject.apply {
+                text = subject
+                maxLines = if (isExpanded) 2 else 1
+            }
+            gradeHeaderAverage.text = average
+            gradeHeaderPointsSum.text = pointsSum
+            gradeHeaderPointsSum.visibility = if (pointsSum.isNotEmpty()) VISIBLE else GONE
+            gradeHeaderNumber.text = number
+            gradeHeaderNote.visibility = if (newGrades > 0) VISIBLE else GONE
+            if (newGrades > 0) gradeHeaderNote.text = newGrades.toString(10)
+            gradeHeaderContainer.isEnabled = isExpandable
+
+            isViewExpandable = isExpandable
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeDetailsHeader
+
+        if (subject != other.subject) return false
+        if (number != other.number) return false
+        if (average != other.average) return false
+        if (isExpandable != other.isExpandable) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = subject.hashCode()
+        result = 31 * result + number.hashCode()
+        result = 31 * result + average.hashCode()
+        result = 31 * result + isExpandable.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) :
+        ExpandableViewHolder(view, adapter), LayoutContainer {
+
+        var isViewExpandable = true
+
+        init {
+            contentView.setOnClickListener(this)
+        }
+
+        override val containerView: View
+            get() = contentView
+
+        override fun isViewCollapsibleOnClick() = isViewExpandable
+
+        override fun isViewExpandableOnClick() = isViewExpandable
+
+        override fun onClick(view: View?) {
+            super.onClick(view)
+            mAdapter.getItem(adapterPosition)?.let { mAdapter.updateItem(it) }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
new file mode 100644
index 000000000..39a911e62
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.content.Context
+import android.graphics.Canvas
+import androidx.recyclerview.widget.RecyclerView
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+
+class GradeDetailsHeaderItemDecoration(context: Context) : FlexibleItemDecoration(context) {
+
+    override fun drawVertical(canvas: Canvas, parent: RecyclerView) {
+        canvas.save()
+        val left: Int
+        val right: Int
+        if (parent.clipToPadding) {
+            left = parent.paddingLeft
+            right = parent.width - parent.paddingRight
+            canvas.clipRect(left, parent.paddingTop, right,
+                parent.height - parent.paddingBottom)
+        } else {
+            left = 0
+            right = parent.width
+        }
+
+        val itemCount = parent.childCount
+        for (i in 1 until itemCount) {
+            val child = parent.getChildAt(i)
+            val viewHolder = parent.getChildViewHolder(child)
+            if (shouldDrawDivider(viewHolder)) {
+                parent.getDecoratedBoundsWithMargins(child, mBounds)
+                val bottom = mBounds.top + Math.round(child.translationY)
+                val top = bottom - mDivider.intrinsicHeight
+                mDivider.setBounds(left, top, right, bottom)
+                mDivider.draw(canvas)
+            }
+        }
+        canvas.restore()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 281974969..1e47eca5d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -1,19 +1,74 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-enum class ViewType(val id: Int) {
-    HEADER(1),
-    ITEM(2)
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_grade_details.*
+
+class GradeDetailsItem(
+    val grade: Grade,
+    private val valueBgColor: Int,
+    private val weightString: String,
+    private val noDescriptionString: String
+) : AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_grade_details
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            gradeItemValue.run {
+                text = grade.entry
+                setBackgroundResource(valueBgColor)
+            }
+            gradeItemDescription.text = when {
+                grade.description.isNotBlank() -> grade.description
+                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
+                else -> noDescriptionString
+            }
+            gradeItemDate.text = grade.date.toFormattedString()
+            gradeItemWeight.text = "$weightString: ${grade.weight}"
+            gradeItemNote.visibility = if (!grade.isRead) VISIBLE else GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeDetailsItem
+
+        if (grade != other.grade) return false
+        if (grade.id != other.grade.id) return false
+        if (weightString != other.weightString) return false
+        if (valueBgColor != other.valueBgColor) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = grade.hashCode()
+        result = 31 * result + grade.id.toInt()
+        result = 31 * result + weightString.hashCode()
+        result = 31 * result + valueBgColor
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
 }
-
-data class GradeDetailsItem(
-    val value: Any,
-    val viewType: ViewType
-)
-
-data class GradeDetailsHeader(
-    val subject: String,
-    val average: Double?,
-    val pointsSum: String?,
-    var newGrades: Int,
-    val grades: List<GradeDetailsItem>
-)
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 a36517938..a9e5b2b7d 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,6 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -9,17 +9,14 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
-import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getBackgroundColor
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeRepository: GradeRepository,
@@ -27,7 +24,7 @@ class GradeDetailsPresenter @Inject constructor(
     private val preferencesRepository: PreferencesRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {
 
     private var newGradesAmount: Int = 0
 
@@ -43,48 +40,50 @@ class GradeDetailsPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
-
         loadData(semesterId, forceRefresh)
-        if (!forceRefresh) view?.showErrorView(false)
     }
 
-    fun onGradeItemSelected(grade: Grade, position: Int) {
-        Timber.i("Select grade item ${grade.id}, position: $position")
-        view?.apply {
-            showGradeDialog(grade, preferencesRepository.gradeColorTheme)
-            if (!grade.isRead) {
-                grade.isRead = true
-                updateItem(grade, position)
-                getHeaderOfItem(grade.subject).let { header ->
-                    (header.value as GradeDetailsHeader).newGrades--
-                    updateHeaderItem(header)
+    fun onGradeItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is GradeDetailsItem) {
+            Timber.i("Select grade item ${item.grade.id}")
+            view?.apply {
+                showGradeDialog(item.grade, preferencesRepository.gradeColorTheme)
+                if (!item.grade.isRead) {
+                    item.grade.isRead = true
+                    updateItem(item)
+                    getHeaderOfItem(item)?.let { header ->
+                        if (header is GradeDetailsHeader) {
+                            header.newGrades--
+                            updateItem(header)
+                        }
+                    }
+                    newGradesAmount--
+                    updateMarkAsDoneButton()
+                    updateGrade(item.grade)
                 }
-                newGradesAmount--
-                updateMarkAsDoneButton()
-                updateGrade(grade)
             }
         }
     }
 
     fun onMarkAsReadSelected(): Boolean {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semesters = semesterRepository.getSemesters(student)
-            val semester = semesters.first { item -> item.semesterId == currentSemesterId }
-            val unreadGrades = gradeRepository.getUnreadGrades(semester).first()
-
-            Timber.i("Mark as read ${unreadGrades.size} grades")
-            gradeRepository.updateGrades(unreadGrades.map { it.apply { isRead = true } })
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Select mark grades as read")
-                Status.SUCCESS -> Timber.i("Mark as read result: Success")
-                Status.ERROR -> {
-                    Timber.i("Mark as read result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
+        Timber.i("Select mark grades as read")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it) }
+            .flatMap { gradeRepository.getUnreadGrades(it.first { item -> item.semesterId == currentSemesterId }) }
+            .map { it.map { grade -> grade.apply { isRead = true } } }
+            .flatMapCompletable {
+                Timber.i("Mark as read ${it.size} grades")
+                gradeRepository.updateGrades(it)
             }
-        }.launch("mark")
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Mark as read result: Success")
+                loadData(currentSemesterId, false)
+            }, {
+                Timber.i("Mark as read result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
@@ -123,7 +122,7 @@ class GradeDetailsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     fun updateMarkAsDoneButton() {
@@ -131,46 +130,43 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade details data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade details result: Success")
-                    newGradesAmount = it.data!!.sumBy { item -> item.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
-                    updateMarkAsDoneButton()
-                    val items = createGradeItems(it.data)
-                    view?.run {
-                        showEmpty(items.isEmpty())
-                        showErrorView(false)
-                        showContent(items.isNotEmpty())
-                        updateData(
-                            data = items,
-                            isGradeExpandable = preferencesRepository.isGradeExpandable,
-                            gradeColorTheme = preferencesRepository.gradeColorTheme
-                        )
+        Timber.i("Loading grade details data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it).map { semester -> it to semester } }
+            .flatMap { (student, semesters) ->
+                averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+                    .flatMap { averages ->
+                        gradeRepository.getGrades(student, semesters.first { it.semesterId == semesterId }, forceRefresh)
+                            .map { it.sortedByDescending { grade -> grade.date } }
+                            .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
+                            .map { createGradeItems(it, averages) }
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_details",
-                        "items" to it.data.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade details result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch()
+            .subscribe({
+                Timber.i("Loading grade details result: Success")
+                newGradesAmount = it.sumBy { gradeDetailsHeader -> gradeDetailsHeader.newGrades }
+                updateMarkAsDoneButton()
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                    showContent(it.isNotEmpty())
+                    updateData(it)
+                }
+                analytics.logEvent("load_grade_details", "items" to it.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.i("Loading grade details result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -184,35 +180,51 @@ class GradeDetailsPresenter @Inject constructor(
         }
     }
 
-    private fun createGradeItems(items: List<GradeDetailsWithAverage>): List<GradeDetailsItem> {
-        return items
-            .filter { it.grades.isNotEmpty() }
-            .sortedBy { it.subject }
-            .map { (subject, average, points, _, grades) ->
-                val subItems = grades
-                    .sortedByDescending { it.date }
-                    .map { GradeDetailsItem(it, ViewType.ITEM) }
+    private fun createGradeItems(items: Map<String, List<Grade>>, averages: List<Triple<String, Double, String>>): List<GradeDetailsHeader> {
+        val isGradeExpandable = preferencesRepository.isGradeExpandable
+        val gradeColorTheme = preferencesRepository.gradeColorTheme
 
-                listOf(GradeDetailsItem(GradeDetailsHeader(
-                    subject = subject,
-                    average = average,
-                    pointsSum = points,
-                    newGrades = grades.filter { grade -> !grade.isRead }.size,
-                    grades = subItems
-                ), ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
-            }.flatten()
+        val noDescriptionString = view?.noDescriptionString.orEmpty()
+        val weightString = view?.weightString.orEmpty()
+        val pointsSumString = view?.pointsSumString.orEmpty()
+
+        return items.map { subject ->
+            GradeDetailsHeader(
+                subject = subject.key,
+                average = formatAverage(averages.singleOrNull { subject.key == it.first }?.second),
+                pointsSum = averages.singleOrNull { subject.key == it.first }?.takeIf { it.third.isNotEmpty() }?.let { pointsSumString.format(it.third) }.orEmpty(),
+                number = view?.getGradeNumberString(subject.value.size).orEmpty(),
+                newGrades = subject.value.filter { grade -> !grade.isRead }.size,
+                isExpandable = isGradeExpandable
+            ).apply {
+                subItems = subject.value.map { item ->
+                    GradeDetailsItem(
+                        grade = item,
+                        valueBgColor = item.getBackgroundColor(gradeColorTheme),
+                        weightString = weightString,
+                        noDescriptionString = noDescriptionString
+                    )
+                }
+            }
+        }
+    }
+
+    private fun formatAverage(average: Double?): String {
+        return view?.run {
+            if (average == null || average == .0) emptyAverageString
+            else averageString.format(average)
+        }.orEmpty()
     }
 
     private fun updateGrade(grade: Grade) {
-        flowWithResource { gradeRepository.updateGrade(grade) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to update grade ${grade.id}")
-                Status.SUCCESS -> Timber.i("Update grade result: Success")
-                Status.ERROR -> {
-                    Timber.i("Update grade result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launch("update")
+        Timber.i("Attempt to update grade ${grade.id}")
+        disposable.add(gradeRepository.updateGrade(grade)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({ Timber.i("Update grade result: Success") })
+            { error ->
+                Timber.i("Update grade result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
index e71fcc3c8..e2977bcbe 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@@ -1,5 +1,8 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IExpandable
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -7,13 +10,21 @@ interface GradeDetailsView : BaseView {
 
     val isViewEmpty: Boolean
 
+    val emptyAverageString: String
+
+    val averageString: String
+
+    val pointsSumString: String
+
+    val weightString: String
+
+    val noDescriptionString: String
+
     fun initView()
 
-    fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String)
+    fun updateData(data: List<GradeDetailsHeader>)
 
-    fun updateItem(item: Grade, position: Int)
-
-    fun updateHeaderItem(item: GradeDetailsItem)
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
     fun clearView()
 
@@ -43,5 +54,7 @@ interface GradeDetailsView : BaseView {
 
     fun enableMarkAsDoneButton(enable: Boolean)
 
-    fun getHeaderOfItem(subject: String): GradeDetailsItem
+    fun getGradeNumberString(number: Int): String
+
+    fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
index dbb60910a..a7b7b6534 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.modules.grade.statistics
 
 import android.graphics.Color
 import android.view.LayoutInflater
+import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
@@ -20,9 +21,9 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.databinding.ItemGradeStatisticsBarBinding
-import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.synthetic.main.item_grade_statistics_bar.view.*
+import kotlinx.android.synthetic.main.item_grade_statistics_pie.view.*
 import javax.inject.Inject
 
 class GradeStatisticsAdapter @Inject constructor() :
@@ -32,8 +33,6 @@ class GradeStatisticsAdapter @Inject constructor() :
 
     var theme: String = "vulcan"
 
-    var showAllSubjectsOnList: Boolean = false
-
     private val vulcanGradeColors = listOf(
         6 to R.color.grade_vulcan_six,
         5 to R.color.grade_vulcan_five,
@@ -61,30 +60,34 @@ class GradeStatisticsAdapter @Inject constructor() :
         "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
     )
 
-    override fun getItemCount() = if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)
+    override fun getItemCount() = items.size
 
-    override fun getItemViewType(position: Int) = items[position].type.id
+    override fun getItemViewType(position: Int): Int {
+        return when (items[position].type) {
+            ViewType.SEMESTER, ViewType.PARTIAL -> R.layout.item_grade_statistics_pie
+            ViewType.POINTS -> R.layout.item_grade_statistics_bar
+        }
+    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
+        val viewHolder = LayoutInflater.from(parent.context).inflate(viewType, parent, false)
         return when (viewType) {
-            ViewType.PARTIAL.id, ViewType.SEMESTER.id -> PieViewHolder(ItemGradeStatisticsPieBinding.inflate(inflater, parent, false))
-            ViewType.POINTS.id -> BarViewHolder(ItemGradeStatisticsBarBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
+            R.layout.item_grade_statistics_bar -> GradeStatisticsBar(viewHolder)
+            else -> GradeStatisticsPie(viewHolder)
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is PieViewHolder -> bindPieChart(holder, items[position].partial)
-            is BarViewHolder -> bindBarChart(holder, items[position].points!!)
+            is GradeStatisticsPie -> bindPieChart(holder, items[position].partial)
+            is GradeStatisticsBar -> bindBarChart(holder, items[position].points!!)
         }
     }
 
-    private fun bindPieChart(holder: PieViewHolder, partials: List<GradeStatistics>) {
-        with(holder.binding.gradeStatisticsPieTitle) {
+    private fun bindPieChart(holder: GradeStatisticsPie, partials: List<GradeStatistics>) {
+        with(holder.view.gradeStatisticsPieTitle) {
             text = partials.firstOrNull()?.subject
-            visibility = if (items.size == 1 || !showAllSubjectsOnList) GONE else VISIBLE
+            visibility = if (items.size == 1) GONE else VISIBLE
         }
 
         val gradeColors = when (theme) {
@@ -102,10 +105,10 @@ class GradeStatisticsAdapter @Inject constructor() :
             valueTextColor = Color.WHITE
             setColors(partials.map {
                 gradeColors.single { color -> color.first == it.grade }.second
-            }.toIntArray(), holder.binding.root.context)
+            }.toIntArray(), holder.view.context)
         }
 
-        with(holder.binding.gradeStatisticsPie) {
+        with(holder.view.gradeStatisticsPie) {
             setTouchEnabled(false)
             if (partials.size == 1) animateXY(1000, 1000)
             data = PieData(dataset).apply {
@@ -137,8 +140,8 @@ class GradeStatisticsAdapter @Inject constructor() :
         }
     }
 
-    private fun bindBarChart(holder: BarViewHolder, points: GradePointsStatistics) {
-        with(holder.binding.gradeStatisticsBarTitle) {
+    private fun bindBarChart(holder: GradeStatisticsBar, points: GradePointsStatistics) {
+        with(holder.view.gradeStatisticsBarTitle) {
             text = points.subject
             visibility = if (items.size == 1) GONE else VISIBLE
         }
@@ -150,14 +153,14 @@ class GradeStatisticsAdapter @Inject constructor() :
 
         with(dataset) {
             valueTextSize = 12f
-            valueTextColor = holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            valueTextColor = holder.view.context.getThemeAttrColor(android.R.attr.textColorPrimary)
             valueFormatter = object : ValueFormatter() {
                 override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
             }
             colors = gradePointsColors
         }
 
-        with(holder.binding.gradeStatisticsBar) {
+        with(holder.view.gradeStatisticsBar) {
             setTouchEnabled(false)
             if (items.size == 1) animateXY(1000, 1000)
             data = BarData(dataset).apply {
@@ -180,7 +183,7 @@ class GradeStatisticsAdapter @Inject constructor() :
 
             description.isEnabled = false
 
-            holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
+            holder.view.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
                 axisLeft.textColor = it
                 axisRight.textColor = it
             }
@@ -200,9 +203,7 @@ class GradeStatisticsAdapter @Inject constructor() :
         }
     }
 
-    private class PieViewHolder(val binding: ItemGradeStatisticsPieBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class GradeStatisticsPie(val view: View) : RecyclerView.ViewHolder(view)
 
-    private class BarViewHolder(val binding: ItemGradeStatisticsBarBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class GradeStatisticsBar(val view: View) : RecyclerView.ViewHolder(view)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index 75050249a..c05cf3800 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.databinding.FragmentGradeStatisticsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
+import kotlinx.android.synthetic.main.fragment_grade_statistics.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class GradeStatisticsFragment :
-    BaseFragment<FragmentGradeStatisticsBinding>(R.layout.fragment_grade_statistics),
-    GradeStatisticsView, GradeView.GradeChildView {
+class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeStatisticsPresenter
@@ -38,21 +36,24 @@ class GradeStatisticsFragment :
     override val isViewEmpty get() = statisticsAdapter.items.isEmpty()
 
     override val currentType
-        get() = when (binding.gradeStatisticsTypeSwitch.checkedRadioButtonId) {
+        get() = when (gradeStatisticsTypeSwitch.checkedRadioButtonId) {
             R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
             R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
             else -> ViewType.POINTS
         }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeStatisticsBinding.bind(view)
-        messageContainer = binding.gradeStatisticsSwipe
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_statistics, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeStatisticsSwipe
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
-        with(binding.gradeStatisticsRecycler) {
+        with(gradeStatisticsRecycler) {
             layoutManager = LinearLayoutManager(requireContext())
             adapter = statisticsAdapter
         }
@@ -60,18 +61,16 @@ class GradeStatisticsFragment :
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        with(binding.gradeStatisticsSubjects) {
+        with(gradeStatisticsSubjects) {
             adapter = subjectsAdapter
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        with(binding) {
-            gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
 
-            gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -82,17 +81,15 @@ class GradeStatisticsFragment :
         }
     }
 
-    override fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean) {
-        with(statisticsAdapter) {
-            this.showAllSubjectsOnList = showAllSubjectsOnStatisticsList
-            this.theme = theme
-            this.items = items
-            notifyDataSetChanged()
-        }
+    override fun updateData(items: List<GradeStatisticsItem>, theme: String) {
+        statisticsAdapter.theme = theme
+        statisticsAdapter.items = items
+        statisticsAdapter.notifyDataSetChanged()
     }
 
     override fun showSubjects(show: Boolean) {
-        binding.gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun clearView() {
@@ -100,35 +97,35 @@ class GradeStatisticsFragment :
     }
 
     override fun resetView() {
-        binding.gradeStatisticsScroll.scrollTo(0, 0)
+        gradeStatisticsScroll.scrollTo(0, 0)
     }
 
     override fun showContent(show: Boolean) {
-        binding.gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeStatisticsErrorMessage.text = message
+        gradeStatisticsErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
+        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.gradeStatisticsSwipe.isEnabled = enable
+        gradeStatisticsSwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.gradeStatisticsSwipe.isRefreshing = show
+        gradeStatisticsSwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -153,7 +150,7 @@ class GradeStatisticsFragment :
 
     override fun onResume() {
         super.onResume()
-        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
+        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -162,7 +159,7 @@ class GradeStatisticsFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
index 112f4c582..90c4e38ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -10,13 +9,12 @@ import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeStatisticsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeStatisticsRepository: GradeStatisticsRepository,
@@ -24,7 +22,7 @@ class GradeStatisticsPresenter @Inject constructor(
     private val semesterRepository: SemesterRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository, schedulers) {
 
     private var subjects = emptyList<Subject>()
 
@@ -47,7 +45,6 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
-        if (!forceRefresh) view?.showErrorView(false)
         loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
@@ -67,7 +64,7 @@ class GradeStatisticsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     fun onSwipeRefresh() {
@@ -105,7 +102,7 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onTypeChange() {
         val type = view?.currentType ?: ViewType.POINTS
         Timber.i("Select grade stats semester: $type")
-        cancelJobs("load")
+        disposable.clear()
         view?.run {
             showContent(false)
             showProgress(true)
@@ -118,77 +115,73 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            subjectRepository.getSubjects(student, semester)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade stats subjects started")
-                Status.SUCCESS -> {
-                    subjects = it.data!!
-
-                    Timber.i("Loading grade stats subjects result: Success")
-                    view?.run {
-                        view?.updateSubjects(ArrayList(it.data.map { subject -> subject.name }))
-                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade stats subjects result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading grade stats subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
                 }
             }
-        }.launch("subjects")
+            .doOnSuccess { subjects = it }
+            .map { ArrayList(it.map { subject -> subject.name }) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading grade stats subjects result: Success")
+                view?.run {
+                    updateSubjects(it)
+                    showSubjects(true)
+                }
+            }, {
+                Timber.i("Loading grade stats subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
-        currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
+        currentSubjectName = subjectName
         currentType = type
+        loadData(semesterId, subjectName, type, forceRefresh)
+    }
 
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semesters = semesterRepository.getSemesters(student)
-            val semester = semesters.first { item -> item.semesterId == semesterId }
+    private fun loadData(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean) {
+        Timber.i("Loading grade stats data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getSemesters(student).flatMap { semesters ->
+                    val semester = semesters.first { item -> item.semesterId == semesterId }
 
-            with(gradeStatisticsRepository) {
-                when (type) {
-                    ViewType.SEMESTER -> getGradesStatistics(student, semester, currentSubjectName, true, forceRefresh)
-                    ViewType.PARTIAL -> getGradesStatistics(student, semester, currentSubjectName, false, forceRefresh)
-                    ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
-                }
-            }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade stats data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade stats result: Success")
-                    view?.run {
-                        showEmpty(it.data!!.isEmpty())
-                        showContent(it.data.isNotEmpty())
-                        showErrorView(false)
-                        updateData(it.data, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
-                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                    when (type) {
+                        ViewType.SEMESTER -> gradeStatisticsRepository.getGradesStatistics(student, semester, subjectName, true, forceRefresh)
+                        ViewType.PARTIAL -> gradeStatisticsRepository.getGradesStatistics(student, semester, subjectName, false, forceRefresh)
+                        ViewType.POINTS -> gradeStatisticsRepository.getGradesPointsStatistics(student, semester, subjectName, forceRefresh)
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_statistics",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade stats result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
             }
-        }.launch("load")
+            .subscribe({
+                Timber.i("Loading grade stats result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updateData(it, preferencesRepository.gradeColorTheme)
+                }
+                analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.i("Loading grade stats result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
index 26b4a119a..9ba8524c2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
@@ -13,7 +13,7 @@ interface GradeStatisticsView : BaseView {
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean)
+    fun updateData(items: List<GradeStatisticsItem>, theme: String)
 
     fun showSubjects(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
index 02e95b0e5..08c37d587 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-enum class ViewType(val id: Int) {
-    SEMESTER(1),
-    PARTIAL(2),
-    POINTS(3)
+enum class ViewType {
+    SEMESTER,
+    PARTIAL,
+    POINTS
 }
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
deleted file mode 100644
index ccebe94f0..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
-import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
-import io.github.wulkanowy.utils.calcAverage
-import java.util.Locale
-import javax.inject.Inject
-
-class GradeSummaryAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    private enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
-    }
-
-    var items = emptyList<GradeSummary>()
-
-    override fun getItemCount() = items.size + if (items.isNotEmpty()) 1 else 0
-
-    override fun getItemViewType(position: Int) = when (position) {
-        0 -> ViewType.HEADER.id
-        else -> ViewType.ITEM.id
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        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))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position - 1])
-        }
-    }
-
-    private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) {
-        if (items.isEmpty()) return
-
-        with(binding) {
-            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage())
-            gradeSummaryScrollableHeaderCalculated.text = formatAverage(items
-                .filter { value -> value.average != 0.0 }
-                .map { values -> values.average }
-                .reversed() // fix average precision
-                .average()
-            )
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(binding: ItemGradeSummaryBinding, item: GradeSummary) {
-        with(binding) {
-            gradeSummaryItemTitle.text = item.subject
-            gradeSummaryItemPoints.text = item.pointsSum
-            gradeSummaryItemAverage.text = formatAverage(item.average, "")
-            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
-        }
-    }
-
-    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
-        return if (average == 0.0) defaultValue
-        else String.format(Locale.FRANCE, "%.2f", average)
-    }
-
-    private class HeaderViewHolder(val binding: ScrollableHeaderGradeSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class ItemViewHolder(val binding: ItemGradeSummaryBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index 4d12dcd50..05fde5227 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -1,37 +1,36 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.databinding.FragmentGradeSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
+import kotlinx.android.synthetic.main.fragment_grade_summary.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class GradeSummaryFragment :
-    BaseFragment<FragmentGradeSummaryBinding>(R.layout.fragment_grade_summary), GradeSummaryView,
-    GradeView.GradeChildView {
+class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeSummaryPresenter
 
     @Inject
-    lateinit var gradeSummaryAdapter: GradeSummaryAdapter
+    lateinit var gradeSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = GradeSummaryFragment()
     }
 
     override val isViewEmpty
-        get() = gradeSummaryAdapter.items.isEmpty()
+        get() = gradeSummaryAdapter.isEmpty
 
     override val predictedString
         get() = getString(R.string.grade_summary_predicted_grade)
@@ -39,69 +38,70 @@ class GradeSummaryFragment :
     override val finalString
         get() = getString(R.string.grade_summary_final_grade)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentGradeSummaryBinding.bind(view)
-        messageContainer = binding.gradeSummaryRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_summary, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeSummaryRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding.gradeSummaryRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        gradeSummaryAdapter.setDisplayHeadersAtStartUp(true)
+
+        gradeSummaryRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = gradeSummaryAdapter
         }
-        with(binding) {
-            gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-            gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun updateData(data: List<GradeSummary>) {
-        with(gradeSummaryAdapter) {
-            items = data
-            notifyDataSetChanged()
+    override fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader) {
+        gradeSummaryAdapter.apply {
+            updateDataSet(data, true)
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
         }
     }
 
     override fun clearView() {
-        with(gradeSummaryAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        gradeSummaryAdapter.clear()
     }
 
     override fun resetView() {
-        binding.gradeSummaryRecycler.scrollToPosition(0)
+        gradeSummaryRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
-        binding.gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
+        gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.gradeSummaryErrorMessage.text = message
+        gradeSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
+        gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.gradeSummarySwipe.isEnabled = enable
+        gradeSummarySwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.gradeSummarySwipe.isRefreshing = show
+        gradeSummarySwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -125,7 +125,7 @@ class GradeSummaryFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
new file mode 100644
index 000000000..95c32d176
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.ui.modules.grade.summary
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_grade_summary.*
+
+class GradeSummaryItem(
+    val summary: GradeSummary,
+    private val average: String
+) : AbstractFlexibleItem<GradeSummaryItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_grade_summary
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.run {
+            gradeSummaryItemTitle.text = summary.subject
+            gradeSummaryItemPoints.text = summary.pointsSum
+            gradeSummaryItemAverage.text = average
+            gradeSummaryItemPredicted.text = "${summary.predictedGrade} ${summary.proposedPoints}".trim()
+            gradeSummaryItemFinal.text = "${summary.finalGrade} ${summary.finalPoints}".trim()
+
+            gradeSummaryItemPointsContainer.visibility = if (summary.pointsSum.isBlank()) GONE else VISIBLE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeSummaryItem
+
+        if (average != other.average) return false
+        if (summary != other.summary) return false
+        if (summary.id != other.summary.id) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = summary.hashCode()
+        result = 31 * result + summary.id.hashCode()
+        result = 31 * result + average.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index caa3cb84d..c12f2a516 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,25 +1,29 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
-import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.calcAverage
 import timber.log.Timber
+import java.lang.String.format
+import java.util.Locale.FRANCE
 import javax.inject.Inject
 
 class GradeSummaryPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val gradeSummaryRepository: GradeSummaryRepository,
+    private val semesterRepository: SemesterRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository) {
+) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -31,46 +35,38 @@ class GradeSummaryPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade summary data started")
-
-        loadData(semesterId, forceRefresh)
-        if (!forceRefresh) view?.showErrorView(false)
-    }
-
-    private fun loadData(semesterId: Int, forceRefresh: Boolean) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading grade summary started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade summary result: Success")
-                    val items = createGradeSummaryItems(it.data!!)
-                    view?.run {
-                        showEmpty(items.isEmpty())
-                        showContent(items.isNotEmpty())
-                        showErrorView(false)
-                        updateData(items)
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
+            .flatMap { (student, semesters) ->
+                gradeSummaryRepository.getGradesSummary(student, semesters.first { it.semesterId == semesterId }, forceRefresh)
+                    .map { it.sortedBy { subject -> subject.subject } }
+                    .flatMap { gradesSummary ->
+                        averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
+                            .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_summary",
-                        "items" to it.data.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade summary result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
             }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
+            }.subscribe({ (gradeSummaryItems, gradeSummaryHeader) ->
+                Timber.i("Loading grade summary result: Success")
+                view?.run {
+                    showEmpty(gradeSummaryItems.isEmpty())
+                    showContent(gradeSummaryItems.isNotEmpty())
+                    showErrorView(false)
+                    updateData(gradeSummaryItems, gradeSummaryHeader)
+                }
+                analytics.logEvent("load_grade_summary", "items" to gradeSummaryItems.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.i("Loading grade summary result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -116,22 +112,34 @@ class GradeSummaryPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
-    private fun createGradeSummaryItems(items: List<GradeDetailsWithAverage>): List<GradeSummary> {
-        return items
-            .filter { !checkEmpty(it) }
-            .sortedBy { it.subject }
-            .map { it.summary.copy(average = it.average) }
+    private fun createGradeSummaryItemsAndHeader(gradesSummary: List<GradeSummary>, averages: List<Triple<String, Double, String>>): Pair<List<GradeSummaryItem>, GradeSummaryScrollableHeader> {
+        return averages.filter { value -> value.second != 0.0 }
+            .let { filteredAverages ->
+                gradesSummary.filter { !checkEmpty(it, filteredAverages) }
+                    .map { gradeSummary ->
+                        GradeSummaryItem(
+                            summary = gradeSummary,
+                            average = formatAverage(filteredAverages.singleOrNull { gradeSummary.subject == it.first }?.second ?: .0, "")
+                        )
+                    }.let {
+                        it to GradeSummaryScrollableHeader(
+                            formatAverage(gradesSummary.calcAverage()),
+                            formatAverage(filteredAverages.map { values -> values.second }.average()))
+                    }
+            }
     }
 
-    private fun checkEmpty(gradeSummary: GradeDetailsWithAverage): Boolean {
+    private fun checkEmpty(gradeSummary: GradeSummary, averages: List<Triple<String, Double, String>>): Boolean {
         return gradeSummary.run {
-            summary.finalGrade.isBlank()
-                && summary.predictedGrade.isBlank()
-                && average == .0
-                && points.isBlank()
+            finalGrade.isBlank() && predictedGrade.isBlank() && averages.singleOrNull { it.first == subject } == null
         }
     }
+
+    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
+        return if (average == 0.0) defaultValue
+        else format(FRANCE, "%.2f", average)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
new file mode 100644
index 000000000..f1c535c71
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.grade.summary
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_grade_summary.*
+
+class GradeSummaryScrollableHeader(private val finalAverage: String, private val calculatedAverage: String)
+    : AbstractFlexibleItem<GradeSummaryScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_grade_summary
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
+                                position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
+            gradeSummaryScrollableHeaderFinal.text = finalAverage
+            gradeSummaryScrollableHeaderCalculated.text = calculatedAverage
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GradeSummaryScrollableHeader
+
+        if (calculatedAverage != other.calculatedAverage) return false
+        if (finalAverage != other.finalAverage) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = calculatedAverage.hashCode()
+        result = 31 * result + finalAverage.hashCode()
+        return result
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+            LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
index 974d91415..cf3184873 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeSummaryView : BaseView {
@@ -13,7 +12,7 @@ interface GradeSummaryView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<GradeSummary>)
+    fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader)
 
     fun resetView()
 
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
deleted file mode 100644
index 8ae06aeb5..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-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.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import java.time.LocalDate
-import javax.inject.Inject
-
-class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var items = emptyList<HomeworkItem<*>>()
-
-    var onClickListener: (Homework) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun getItemViewType(position: Int) = items[position].viewType.id
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-
-        return when (viewType) {
-            HomeworkItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderHomeworkBinding.inflate(inflater, parent, false))
-            HomeworkItem.ViewType.ITEM.id -> ItemViewHolder(ItemHomeworkBinding.inflate(inflater, parent, false))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
-            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Homework)
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
-    private fun bindHeaderViewHolder(binding: HeaderHomeworkBinding, date: LocalDate) {
-        with(binding) {
-            homeworkHeaderDay.text = date.weekDayName.capitalize()
-            homeworkHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    private fun bindItemViewHolder(binding: ItemHomeworkBinding, homework: Homework) {
-        with(binding) {
-            homeworkItemSubject.text = homework.subject
-            homeworkItemTeacher.text = homework.teacher
-            homeworkItemContent.text = homework.content
-            homeworkItemCheckImage.visibility = if (homework.isDone) View.VISIBLE else View.GONE
-            homeworkItemAttachmentImage.visibility = if (!homework.isDone && homework.attachments.isNotEmpty()) View.VISIBLE else View.GONE
-
-            root.setOnClickListener { onClickListener(homework) }
-        }
-    }
-
-    class HeaderViewHolder(val binding: HeaderHomeworkBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    class ItemViewHolder(val binding: ItemHomeworkBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index e1d7ac52f..a011a015c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -1,31 +1,33 @@
 package io.github.wulkanowy.ui.modules.homework
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.databinding.FragmentHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_homework.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
-    HomeworkView, MainView.TitledView {
+class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: HomeworkPresenter
 
     @Inject
-    lateinit var homeworkAdapter: HomeworkAdapter
+    lateinit var homeworkAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -35,88 +37,89 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
 
     override val titleStringId get() = R.string.homework_title
 
-    override val isViewEmpty get() = homeworkAdapter.items.isEmpty()
+    override val isViewEmpty get() = homeworkAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentHomeworkBinding.bind(view)
-        messageContainer = binding.homeworkRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_homework, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = homeworkRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        homeworkAdapter.onClickListener = presenter::onHomeworkItemSelected
+        homeworkAdapter.setOnItemClickListener(presenter::onHomeworkItemSelected)
 
-        with(binding.homeworkRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(homeworkRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = homeworkAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false))
         }
 
-        with(binding) {
-            homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
-            homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
+        homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            homeworkNextButton.setOnClickListener { presenter.onNextDay() }
+        homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        homeworkNextButton.setOnClickListener { presenter.onNextDay() }
 
-            homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
-    override fun updateData(data: List<HomeworkItem<*>>) {
-        with(homeworkAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<HomeworkItem>) {
+        homeworkAdapter.updateDataSet(data, true)
+    }
+
+    fun onReloadList() {
+        presenter.reloadData()
     }
 
     override fun clearData() {
-        with(homeworkAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        homeworkAdapter.clear()
     }
 
     override fun updateNavigationWeek(date: String) {
-        binding.homeworkNavDate.text = date
+        homeworkNavDate.text = date
     }
 
     override fun hideRefresh() {
-        binding.homeworkSwipe.isRefreshing = false
+        homeworkSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.homeworkEmpty.visibility = if (show) VISIBLE else GONE
+        homeworkEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.homeworkError.visibility = if (show) VISIBLE else GONE
+        homeworkError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.homeworkErrorMessage.text = message
+        homeworkErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.homeworkProgress.visibility = if (show) VISIBLE else GONE
+        homeworkProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.homeworkSwipe.isEnabled = enable
+        homeworkSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.homeworkRecycler.visibility = if (show) VISIBLE else GONE
+        homeworkRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(homework: Homework) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
new file mode 100644
index 000000000..490237883
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.homework
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractHeaderItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_homework.*
+import org.threeten.bp.LocalDate
+
+class HomeworkHeader(private val date: LocalDate) : AbstractHeaderItem<HomeworkHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.header_homework
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>?, holder: HomeworkHeader.ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
+        holder.run {
+            homeworkHeaderDay.text = date.weekDayName.capitalize()
+            homeworkHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HomeworkHeader
+
+        if (date != other.date) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return date.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
index 7e0039583..3c2dd7baf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
@@ -1,9 +1,53 @@
 package io.github.wulkanowy.ui.modules.homework
 
-data class HomeworkItem<out T>(val value: T, val viewType: ViewType) {
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_homework.*
 
-    enum class ViewType(val id: Int) {
-        HEADER(1),
-        ITEM(2)
+class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
+    AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
+
+    override fun getLayoutRes() = R.layout.item_homework
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            homeworkItemSubject.text = homework.subject
+            homeworkItemTeacher.text = homework.teacher
+            homeworkItemContent.text = homework.content
+            homeworkItemCheckImage.visibility = if (homework.isDone) View.VISIBLE else View.GONE
+            homeworkItemAttachmentImage.visibility = if (!homework.isDone && homework.attachments.isNotEmpty()) View.VISIBLE else View.GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HomeworkItem
+
+        if (homework != other.homework) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = homework.hashCode()
+        result = 31 * result + homework.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 8af0d83f6..aae18df32 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,29 +8,27 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class HomeworkPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<HomeworkView>(errorHandler, studentRepository) {
+) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
 
@@ -76,60 +74,69 @@ class HomeworkPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onHomeworkItemSelected(homework: Homework) {
-        Timber.i("Select homework item ${homework.id}")
-        view?.showTimetableDialog(homework)
+    fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is HomeworkItem) {
+            Timber.i("Select homework item ${item.homework.id}")
+            view?.showTimetableDialog(item.homework)
+        }
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
+    fun reloadData() {
+        loadData(currentDate, false)
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading homework data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            homeworkRepository.getHomework(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading homework data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .delay(200, TimeUnit.MILLISECONDS)
+                .map { it.groupBy { homework -> homework.date }.toSortedMap() }
+                .map { createHomeworkItem(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading homework result: Success")
                     view?.apply {
-                        updateData(createHomeworkItem(it.data!!))
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "homework",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_homework", "items" to it.size, "force_refresh" to forceRefresh)
+                }) {
                     Timber.i("Loading homework result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -143,12 +150,12 @@ class HomeworkPresenter @Inject constructor(
         }
     }
 
-    private fun createHomeworkItem(items: List<Homework>): List<HomeworkItem<*>> {
-        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
-            listOf(HomeworkItem(date, HomeworkItem.ViewType.HEADER)) + exams.reversed().map { exam ->
-                HomeworkItem(exam, HomeworkItem.ViewType.ITEM)
+    private fun createHomeworkItem(items: Map<LocalDate, List<Homework>>): List<HomeworkItem> {
+        return items.flatMap {
+            HomeworkHeader(it.key).let { header ->
+                it.value.reversed().map { item -> HomeworkItem(header, item) }
             }
-        }.flatten()
+        }
     }
 
     private fun reloadView() {
@@ -169,7 +176,7 @@ class HomeworkPresenter @Inject constructor(
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.sunday.toFormattedString("dd.MM"))
+                currentDate.friday.toFormattedString("dd.MM"))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
index 2a678cd4c..1d241df46 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
@@ -9,7 +9,7 @@ interface HomeworkView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<HomeworkItem<*>>)
+    fun updateData(data: List<HomeworkItem>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
index 5d6ee162a..3706b56e1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
@@ -1,15 +1,14 @@
 package io.github.wulkanowy.ui.modules.homework.details
 
 import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
+import android.view.View
 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.ItemHomeworkDialogAttachmentBinding
-import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentsHeaderBinding
-import io.github.wulkanowy.databinding.ItemHomeworkDialogDetailsBinding
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.item_homework_dialog_attachment.view.*
+import kotlinx.android.synthetic.main.item_homework_dialog_details.view.*
 import javax.inject.Inject
 
 class HomeworkDetailsAdapter @Inject constructor() :
@@ -31,10 +30,6 @@ class HomeworkDetailsAdapter @Inject constructor() :
 
     var onAttachmentClickListener: (url: String) -> Unit = {}
 
-    var onFullScreenClickListener = {}
-
-    var onFullScreenExitClickListener = {}
-
     override fun getItemCount() = 1 + if (attachments.isNotEmpty()) attachments.size + 1 else 0
 
     override fun getItemViewType(position: Int) = when (position) {
@@ -47,9 +42,9 @@ class HomeworkDetailsAdapter @Inject constructor() :
         val inflater = LayoutInflater.from(parent.context)
 
         return when (viewType) {
-            ViewType.ATTACHMENTS_HEADER.id -> AttachmentsHeaderViewHolder(ItemHomeworkDialogAttachmentsHeaderBinding.inflate(inflater, parent, false))
-            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemHomeworkDialogAttachmentBinding.inflate(inflater, parent, false))
-            else -> DetailsViewHolder(ItemHomeworkDialogDetailsBinding.inflate(inflater, parent, false))
+            ViewType.ATTACHMENTS_HEADER.id -> AttachmentsHeaderViewHolder(inflater.inflate(R.layout.item_homework_dialog_attachments_header, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(inflater.inflate(R.layout.item_homework_dialog_attachment, parent, false))
+            else -> DetailsViewHolder(inflater.inflate(R.layout.item_homework_dialog_details, parent, false))
         }
     }
 
@@ -61,42 +56,29 @@ class HomeworkDetailsAdapter @Inject constructor() :
     }
 
     private fun bindDetailsViewHolder(holder: DetailsViewHolder) {
-        with(holder.binding) {
+        with(holder.view) {
             homeworkDialogDate.text = homework?.date?.toFormattedString()
             homeworkDialogEntryDate.text = homework?.entryDate?.toFormattedString()
             homeworkDialogSubject.text = homework?.subject
             homeworkDialogTeacher.text = homework?.teacher
             homeworkDialogContent.text = homework?.content
-            homeworkDialogFullScreen.setOnClickListener {
-                homeworkDialogFullScreen.visibility = GONE
-                homeworkDialogFullScreenExit.visibility = VISIBLE
-                onFullScreenClickListener()
-            }
-            homeworkDialogFullScreenExit.setOnClickListener {
-                homeworkDialogFullScreen.visibility = VISIBLE
-                homeworkDialogFullScreenExit.visibility = GONE
-                onFullScreenExitClickListener()
-            }
         }
     }
 
     private fun bindAttachmentViewHolder(holder: AttachmentViewHolder, position: Int) {
         val item = attachments[position]
 
-        with(holder.binding) {
+        with(holder.view) {
             homeworkDialogAttachment.text = item.second
-            root.setOnClickListener {
+            setOnClickListener {
                 onAttachmentClickListener(item.first)
             }
         }
     }
 
-    class DetailsViewHolder(val binding: ItemHomeworkDialogDetailsBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class DetailsViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
-    class AttachmentsHeaderViewHolder(val binding: ItemHomeworkDialogAttachmentsHeaderBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class AttachmentsHeaderViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
-    class AttachmentViewHolder(val binding: ItemHomeworkDialogAttachmentBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class AttachmentViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
index 78abfffd0..54cb5c68c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
@@ -5,19 +5,16 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.databinding.DialogHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.utils.openInternetBrowser
+import kotlinx.android.synthetic.main.dialog_homework.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), HomeworkDetailsView {
+class HomeworkDetailsDialog : BaseDialogFragment(), HomeworkDetailsView {
 
     @Inject
     lateinit var presenter: HomeworkDetailsPresenter
@@ -46,7 +43,7 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_homework, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -56,25 +53,22 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
 
     @SuppressLint("SetTextI18n")
     override fun initView() {
-        with(binding) {
-            homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
-            homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
-            homeworkDialogClose.setOnClickListener { dismiss() }
-        }
+        homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+        homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
+        homeworkDialogClose.setOnClickListener { dismiss() }
 
-        with(binding.homeworkDialogRecycler) {
+        with(homeworkDialogRecycler) {
             layoutManager = LinearLayoutManager(context)
             adapter = detailsAdapter.apply {
                 onAttachmentClickListener = { context.openInternetBrowser(it, ::showMessage) }
-                onFullScreenClickListener = { dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT) }
-                onFullScreenExitClickListener = { dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT) }
                 homework = this@HomeworkDetailsDialog.homework
             }
         }
     }
 
     override fun updateMarkAsDoneLabel(isDone: Boolean) {
-        binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+        (parentFragment as? HomeworkFragment)?.onReloadList()
+        homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
index a53d38e86..04a97b8cd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
@@ -1,23 +1,22 @@
 package io.github.wulkanowy.ui.modules.homework.details
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class HomeworkDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository) {
+) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: HomeworkDetailsView) {
         super.onAttachView(view)
@@ -26,19 +25,20 @@ class HomeworkDetailsPresenter @Inject constructor(
     }
 
     fun toggleDone(homework: Homework) {
-        flowWithResource { homeworkRepository.toggleDone(homework) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Homework details update start")
-                Status.SUCCESS -> {
-                    Timber.i("Homework details update: Success")
-                    view?.updateMarkAsDoneLabel(homework.isDone)
-                    analytics.logEvent("homework_mark_as_done")
-                }
-                Status.ERROR -> {
-                    Timber.i("Homework details update result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Homework details update start")
+        disposable.add(homeworkRepository.toggleDone(homework)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Homework details update: Success")
+                view?.run {
+                    updateMarkAsDoneLabel(homework.isDone)
                 }
+                analytics.logEvent("homework_mark_as_done")
+            }) {
+                Timber.i("Homework details update result: An exception occurred")
+                errorHandler.dispatch(it)
             }
-        }.launch("toggle")
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index 749989e3a..19f23593e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -4,9 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.ActivityLoginBinding
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
@@ -15,28 +14,29 @@ import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), LoginView {
+class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
 
     @Inject
     override lateinit var presenter: LoginPresenter
 
-    private val loginAdapter = BaseFragmentPagerAdapter(supportFragmentManager)
+    @Inject
+    lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
 
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
     }
 
-    override val currentViewIndex get() = binding.loginViewpager.currentItem
+    override val currentViewIndex get() = loginViewpager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivityLoginBinding.inflate(layoutInflater).apply { binding = this }.root)
-        setSupportActionBar(binding.loginToolbar)
-        messageContainer = binding.loginContainer
+        setContentView(R.layout.activity_login)
+        setSupportActionBar(loginToolbar)
+        messageContainer = loginContainer
 
         presenter.onAttachView(this)
     }
@@ -48,7 +48,7 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         }
 
         with(loginAdapter) {
-            containerId = binding.loginViewpager.id
+            containerId = loginViewpager.id
             addFragments(listOf(
                 LoginFormFragment.newInstance(),
                 LoginSymbolFragment.newInstance(),
@@ -58,7 +58,7 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
             ))
         }
 
-        with(binding.loginViewpager) {
+        with(loginViewpager) {
             offscreenPageLimit = 2
             adapter = loginAdapter
             setOnSelectPageListener(presenter::onViewSelected)
@@ -71,7 +71,7 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     override fun switchView(index: Int) {
-        binding.loginViewpager.setCurrentItem(index, false)
+        loginViewpager.setCurrentItem(index, false)
     }
 
     override fun showActionBar(show: Boolean) {
@@ -86,16 +86,16 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
     }
 
-    override fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(studentsWithSemesters)
+    override fun notifyInitStudentSelectFragment(students: List<Student>) {
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(students)
     }
 
-    fun onFormFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
-        presenter.onFormViewAccountLogged(studentsWithSemesters, loginData)
+    fun onFormFragmentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        presenter.onFormViewAccountLogged(students, loginData)
     }
 
-    fun onSymbolFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        presenter.onSymbolViewAccountLogged(studentsWithSemesters)
+    fun onSymbolFragmentAccountLogged(students: List<Student>) {
+        presenter.onSymbolViewAccountLogged(students)
     }
 
     fun onAdvancedLoginClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index f30825cff..5ed181bf1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -4,11 +4,11 @@ import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
 import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidPinException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidSymbolException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidTokenException
 import io.github.wulkanowy.sdk.mobile.exception.TokenDeadException
-import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
new file mode 100644
index 000000000..26a243dcd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.ui.modules.login
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
+import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
+import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
+import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
+
+@Suppress("unused")
+@Module
+internal abstract class LoginModule {
+
+    companion object {
+
+        @PerActivity
+        @Provides
+        fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
+    }
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginFormFragment(): LoginFormFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginAdvancedFragment(): LoginAdvancedFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSymbolFragment(): LoginSymbolFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginRecoverFragment(): LoginRecoverFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index 7e731772f..16342de4f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -1,16 +1,18 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LoginView>(errorHandler, studentRepository) {
+) : BasePresenter<LoginView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LoginView) {
         super.onAttachView(view)
@@ -21,24 +23,24 @@ class LoginPresenter @Inject constructor(
         Timber.i("Login view was initialized")
     }
 
-    fun onFormViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
+    fun onFormViewAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
         view?.apply {
-            if (studentsWithSemesters.isEmpty()) {
+            if (students.isEmpty()) {
                 Timber.i("Switch to symbol form")
                 notifyInitSymbolFragment(loginData)
                 switchView(1)
             } else {
                 Timber.i("Switch to student select")
-                notifyInitStudentSelectFragment(studentsWithSemesters)
+                notifyInitStudentSelectFragment(students)
                 switchView(2)
             }
         }
     }
 
-    fun onSymbolViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
+    fun onSymbolViewAccountLogged(students: List<Student>) {
         view?.apply {
             Timber.i("Switch to student select")
-            notifyInitStudentSelectFragment(studentsWithSemesters)
+            notifyInitStudentSelectFragment(students)
             switchView(2)
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 2a5cf316a..9c98a1d8d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginView : BaseView {
@@ -15,5 +15,5 @@ interface LoginView : BaseView {
 
     fun notifyInitSymbolFragment(loginData: Triple<String, String, String>)
 
-    fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyInitStudentSelectFragment(students: List<Student>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 9231914c8..aaea31eca 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -1,15 +1,15 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -17,12 +17,10 @@ import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_advanced.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LoginAdvancedFragment :
-    BaseFragment<FragmentLoginAdvancedBinding>(R.layout.fragment_login_advanced),
-    LoginAdvancedView {
+class LoginAdvancedFragment : BaseFragment(), LoginAdvancedView {
 
     @Inject
     lateinit var presenter: LoginAdvancedPresenter
@@ -32,17 +30,17 @@ class LoginAdvancedFragment :
     }
 
     override val formLoginType: String
-        get() = when (binding.loginTypeSwitch.checkedRadioButtonId) {
+        get() = when (loginTypeSwitch.checkedRadioButtonId) {
             R.id.loginTypeApi -> "API"
             R.id.loginTypeScrapper -> "SCRAPPER"
             else -> "HYBRID"
         }
 
     override val formUsernameValue: String
-        get() = binding.loginFormUsername.text.toString().trim()
+        get() = loginFormUsername.text.toString().trim()
 
     override val formPassValue: String
-        get() = binding.loginFormPass.text.toString().trim()
+        get() = loginFormPass.text.toString().trim()
 
     private lateinit var hostKeys: Array<String>
 
@@ -51,19 +49,19 @@ class LoginAdvancedFragment :
     private lateinit var hostSymbols: Array<String>
 
     override val formHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString())).orEmpty()
 
     override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(loginFormHost.text.toString())).orEmpty()
 
     override val formPinValue: String
-        get() = binding.loginFormPin.text.toString().trim()
+        get() = loginFormPin.text.toString().trim()
 
     override val formSymbolValue: String
-        get() = binding.loginFormSymbol.text.toString().trim()
+        get() = loginFormSymbol.text.toString().trim()
 
     override val formTokenValue: String
-        get() = binding.loginFormToken.text.toString().trim()
+        get() = loginFormToken.text.toString().trim()
 
     override val nicknameLabel: String
         get() = getString(R.string.login_nickname_hint)
@@ -71,9 +69,12 @@ class LoginAdvancedFragment :
     override val emailLabel: String
         get() = getString(R.string.login_email_hint)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginAdvancedBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_advanced, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
@@ -82,201 +83,191 @@ class LoginAdvancedFragment :
         hostValues = resources.getStringArray(R.array.hosts_values)
         hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        with(binding) {
-            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
-            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
-            loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
-            loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
-            loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
-            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+        loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
+        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+        loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
+        loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+        loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
 
-            loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-                presenter.onLoginModeSelected(when (checkedId) {
-                    R.id.loginTypeApi -> Sdk.Mode.API
-                    R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
-                    else -> Sdk.Mode.HYBRID
-                })
-            }
-
-            loginFormPin.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
-            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
-
-            loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+        loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+            presenter.onLoginModeSelected(when (checkedId) {
+                R.id.loginTypeApi -> Sdk.Mode.API
+                R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
+                else -> Sdk.Mode.HYBRID
+            })
         }
 
-        with(binding.loginFormHost) {
+        loginFormPin.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+        loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+
+        loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+
+        with(loginFormHost) {
             setText(hostKeys.getOrNull(0).orEmpty())
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
-            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
+            setOnClickListener { if (loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
     override fun showMobileApiWarningMessage() {
-        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_mobile_api)
+        loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_mobile_api)
     }
 
     override fun showScraperWarningMessage() {
-        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_scraper)
+        loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_scraper)
     }
 
     override fun showHybridWarningMessage() {
-        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_hybrid)
+        loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_hybrid)
     }
 
     override fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String) {
-        with(binding) {
-            loginFormUsername.setText(username)
-            loginFormPass.setText(pass)
-            loginFormToken.setText(token)
-            loginFormSymbol.setText(symbol)
-            loginFormPin.setText(pin)
-        }
+        loginFormUsername.setText(username)
+        loginFormPass.setText(pass)
+        loginFormToken.setText(token)
+        loginFormSymbol.setText(symbol)
+        loginFormPin.setText(pin)
     }
 
     override fun setUsernameLabel(label: String) {
-        binding.loginFormUsernameLayout.hint = label
+        loginFormUsernameLayout.hint = label
     }
 
     override fun setSymbol(symbol: String) {
-        binding.loginFormSymbol.setText(symbol)
+        loginFormSymbol.setText(symbol)
     }
 
     override fun setErrorUsernameRequired() {
-        with(binding.loginFormUsernameLayout) {
+        with(loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorLoginRequired() {
-        with(binding.loginFormUsernameLayout) {
+        with(loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_invalid_login)
         }
     }
 
     override fun setErrorEmailRequired() {
-        with(binding.loginFormUsernameLayout) {
+        with(loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_invalid_email)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
     override fun setErrorPinRequired() {
-        with(binding.loginFormPinLayout) {
+        with(loginFormPinLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPinInvalid(message: String) {
-        with(binding.loginFormPinLayout) {
+        with(loginFormPinLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun setErrorSymbolRequired() {
-        with(binding.loginFormSymbolLayout) {
+        with(loginFormSymbolLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorSymbolInvalid(message: String) {
-        with(binding.loginFormSymbolLayout) {
+        with(loginFormSymbolLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun setErrorTokenRequired() {
-        with(binding.loginFormTokenLayout) {
+        with(loginFormTokenLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorTokenInvalid(message: String) {
-        with(binding.loginFormTokenLayout) {
+        with(loginFormTokenLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun clearUsernameError() {
-        binding.loginFormUsernameLayout.error = null
+        loginFormUsernameLayout.error = null
     }
 
     override fun clearPassError() {
-        binding.loginFormPassLayout.error = null
+        loginFormPassLayout.error = null
     }
 
     override fun clearPinKeyError() {
-        binding.loginFormPinLayout.error = null
+        loginFormPinLayout.error = null
     }
 
     override fun clearSymbolError() {
-        binding.loginFormSymbolLayout.error = null
+        loginFormSymbolLayout.error = null
     }
 
     override fun clearTokenError() {
-        binding.loginFormTokenLayout.error = null
+        loginFormTokenLayout.error = null
     }
 
     override fun showOnlyHybridModeInputs() {
-        with(binding) {
-            loginFormUsernameLayout.visibility = VISIBLE
-            loginFormPassLayout.visibility = VISIBLE
-            loginFormHostLayout.visibility = VISIBLE
-            loginFormPinLayout.visibility = GONE
-            loginFormSymbolLayout.visibility = VISIBLE
-            loginFormTokenLayout.visibility = GONE
-        }
+        loginFormUsernameLayout.visibility = VISIBLE
+        loginFormPassLayout.visibility = VISIBLE
+        loginFormHostLayout.visibility = VISIBLE
+        loginFormPinLayout.visibility = GONE
+        loginFormSymbolLayout.visibility = VISIBLE
+        loginFormTokenLayout.visibility = GONE
     }
 
     override fun showOnlyScrapperModeInputs() {
-        with(binding) {
-            loginFormUsernameLayout.visibility = VISIBLE
-            loginFormPassLayout.visibility = VISIBLE
-            loginFormHostLayout.visibility = VISIBLE
-            loginFormPinLayout.visibility = GONE
-            loginFormSymbolLayout.visibility = VISIBLE
-            loginFormTokenLayout.visibility = GONE
-        }
+        loginFormUsernameLayout.visibility = VISIBLE
+        loginFormPassLayout.visibility = VISIBLE
+        loginFormHostLayout.visibility = VISIBLE
+        loginFormPinLayout.visibility = GONE
+        loginFormSymbolLayout.visibility = VISIBLE
+        loginFormTokenLayout.visibility = GONE
     }
 
     override fun showOnlyMobileApiModeInputs() {
-        with(binding) {
-            loginFormUsernameLayout.visibility = GONE
-            loginFormPassLayout.visibility = GONE
-            loginFormHostLayout.visibility = GONE
-            loginFormPinLayout.visibility = VISIBLE
-            loginFormSymbolLayout.visibility = VISIBLE
-            loginFormTokenLayout.visibility = VISIBLE
-        }
+        loginFormUsernameLayout.visibility = GONE
+        loginFormPassLayout.visibility = GONE
+        loginFormHostLayout.visibility = GONE
+        loginFormPinLayout.visibility = VISIBLE
+        loginFormSymbolLayout.visibility = VISIBLE
+        loginFormTokenLayout.visibility = VISIBLE
     }
 
     override fun showSoftKeyboard() {
@@ -288,17 +279,17 @@ class LoginAdvancedFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
+        loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
+        loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, Triple(
-            binding.loginFormUsername.text.toString(),
-            binding.loginFormPass.text.toString(),
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
+            loginFormUsername.text.toString(),
+            loginFormPass.text.toString(),
             resources.getStringArray(R.array.hosts_values)[1]
         ))
     }
@@ -309,7 +300,7 @@ class LoginAdvancedFragment :
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index dfe82ad8b..3a0d4a0d8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -1,24 +1,23 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Single
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginAdvancedPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LoginAdvancedView) {
         super.onAttachView(view)
@@ -126,42 +125,35 @@ class LoginAdvancedPresenter @Inject constructor(
     fun onSignInClick() {
         if (!validateCredentials()) return
 
-        flowWithResource { getStudentsAppropriatesToLoginType() }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Login started")
+        disposable.add(getStudentsAppropriatesToLoginType()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Login result: Success")
-                    analytics.logEvent("registration_form",
-                        "success" to true,
-                        "students" to it.data!!.size,
-                        "error" to "No error"
-                    )
-                    view?.notifyParentAccountLogged(it.data)
-                }
-                Status.ERROR -> {
-                    Timber.i("Login result: An exception occurred")
-                    analytics.logEvent(
-                        "registration_form",
-                        "success" to false, "students" to -1,
-                        "error" to it.error!!.message.ifNullOrBlank { "No message" }
-                    )
-                    loginErrorHandler.dispatch(it.error)
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
                 }
             }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+            .subscribe({
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "error" to "No error")
+                view?.notifyParentAccountLogged(it)
+            }, {
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "error" to it.message.ifNullOrBlank { "No message" })
+                loginErrorHandler.dispatch(it)
+            }))
     }
 
-    private suspend fun getStudentsAppropriatesToLoginType(): List<StudentWithSemesters> {
+    private fun getStudentsAppropriatesToLoginType(): Single<List<Student>> {
         val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
@@ -170,7 +162,7 @@ class LoginAdvancedPresenter @Inject constructor(
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
 
-        return when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
+        return when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
             Sdk.Mode.API -> studentRepository.getStudentsApi(pin, symbol, token)
             Sdk.Mode.SCRAPPER -> studentRepository.getStudentsScrapper(email, password, endpoint, symbol)
             Sdk.Mode.HYBRID -> studentRepository.getStudentsHybrid(email, password, endpoint, symbol)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index 029a6b4d4..36c9a93f8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginAdvancedView : BaseView {
@@ -69,7 +69,7 @@ interface LoginAdvancedView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     fun setErrorPinRequired()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 41345686a..058e702e6 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
@@ -2,14 +2,14 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.FragmentLoginFormBinding
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
@@ -18,11 +18,10 @@ import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_form.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragment_login_form),
-    LoginFormView {
+class LoginFormFragment : BaseFragment(), LoginFormView {
 
     @Inject
     lateinit var presenter: LoginFormPresenter
@@ -35,16 +34,16 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override val formUsernameValue: String
-        get() = binding.loginFormUsername.text.toString()
+        get() = loginFormUsername.text.toString()
 
     override val formPassValue: String
-        get() = binding.loginFormPass.text.toString()
+        get() = loginFormPass.text.toString()
 
     override val formHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString())).orEmpty()
 
     override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(loginFormHost.text.toString())).orEmpty()
 
     override val nicknameLabel: String
         get() = getString(R.string.login_nickname_hint)
@@ -58,9 +57,12 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
 
     private lateinit var hostSymbols: Array<String>
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginFormBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_form, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
@@ -69,85 +71,81 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         hostValues = resources.getStringArray(R.array.hosts_values)
         hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        with(binding) {
-            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
-            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
-            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
-            loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
-            loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
-            loginFormFaq.setOnClickListener { presenter.onFaqClick() }
-            loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
-            loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() }
-            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
-        }
+        loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
+        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+        loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
+        loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
+        loginFormFaq.setOnClickListener { presenter.onFaqClick() }
+        loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
+        loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() }
+        loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
 
-        with(binding.loginFormHost) {
+        with(loginFormHost) {
             setText(hostKeys.getOrNull(0).orEmpty())
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
-            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
+            setOnClickListener { if (loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
     override fun setCredentials(username: String, pass: String) {
-        with(binding) {
-            loginFormUsername.setText(username)
-            loginFormPass.setText(pass)
-        }
+        loginFormUsername.setText(username)
+        loginFormPass.setText(pass)
     }
 
     override fun setUsernameLabel(label: String) {
-        binding.loginFormUsernameLayout.hint = label
+        loginFormUsernameLayout.hint = label
     }
 
     override fun setErrorUsernameRequired() {
-        with(binding.loginFormUsernameLayout) {
+        with(loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorLoginRequired() {
-        with(binding.loginFormUsernameLayout) {
+        with(loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_invalid_login)
         }
     }
 
     override fun setErrorEmailRequired() {
-        with(binding.loginFormUsernameLayout) {
+        with(loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_invalid_email)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        with(binding.loginFormPassLayout) {
+        with(loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
     override fun clearUsernameError() {
-        binding.loginFormUsernameLayout.error = null
+        loginFormUsernameLayout.error = null
     }
 
     override fun clearPassError() {
-        binding.loginFormPassLayout.error = null
+        loginFormPassLayout.error = null
     }
 
     override fun showSoftKeyboard() {
@@ -159,20 +157,20 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
+        loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
+        loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
-        binding.loginFormVersion.text = "v${appInfo.versionName}"
+        loginFormVersion.text = "v${appInfo.versionName}"
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, loginData)
+    override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
     }
 
     override fun openPrivacyPolicyPage() {
@@ -180,7 +178,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginFormContact.visibility = if (show) VISIBLE else GONE
+        loginFormContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun openAdvancedLogin() {
@@ -192,8 +190,8 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 
     override fun openFaqPage() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index b921140c7..997e1e85f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,22 +1,20 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginFormPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
@@ -76,44 +74,34 @@ class LoginFormPresenter @Inject constructor(
 
         if (!validateCredentials(email, password, host)) return
 
-        flowWithResource { studentRepository.getStudentsScrapper(email, password, host, symbol) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Login started")
+        disposable.add(studentRepository.getStudentsScrapper(email, password, host, symbol)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Login result: Success")
-                    analytics.logEvent(
-                        "registration_form",
-                        "success" to true,
-                        "students" to it.data!!.size,
-                        "scrapperBaseUrl" to host,
-                        "error" to "No error"
-                    )
-                    view?.notifyParentAccountLogged(it.data, Triple(email, password, host))
-                }
-                Status.ERROR -> {
-                    Timber.i("Login result: An exception occurred")
-                    analytics.logEvent(
-                        "registration_form",
-                        "success" to false,
-                        "students" to -1,
-                        "scrapperBaseUrl" to host,
-                        "error" to it.error!!.message.ifNullOrBlank { "No message" })
-                    loginErrorHandler.dispatch(it.error)
-                    lastError = it.error
-                    view?.showContact(true)
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
                 }
             }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+            .subscribe({
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to host, "error" to "No error")
+                view?.notifyParentAccountLogged(it, Triple(email, password, host))
+            }, {
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to host, "error" to it.message.ifNullOrBlank { "No message" })
+                loginErrorHandler.dispatch(it)
+                lastError = it
+                view?.showContact(true)
+            }))
     }
 
     fun onFaqClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 77e665389..6506fa88f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginFormView : BaseView {
@@ -49,7 +49,7 @@ interface LoginFormView : BaseView {
 
     fun showVersion()
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>)
+    fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
 
     fun openPrivacyPolicyPage()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
index f0c9652fb..1bff49262 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
@@ -3,30 +3,25 @@ package io.github.wulkanowy.ui.modules.login.recover
 import android.annotation.SuppressLint
 import android.graphics.Color
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentLoginRecoverBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_recover.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LoginRecoverFragment :
-    BaseFragment<FragmentLoginRecoverBinding>(R.layout.fragment_login_recover), LoginRecoverView {
-
-    private var _binding: FragmentLoginRecoverBinding? = null
-
-    private val bindingLocal: FragmentLoginRecoverBinding get() = _binding!!
+class LoginRecoverFragment : BaseFragment(), LoginRecoverView {
 
     @Inject
     lateinit var presenter: LoginRecoverPresenter
@@ -42,13 +37,13 @@ class LoginRecoverFragment :
     private lateinit var hostSymbols: Array<String>
 
     override val recoverHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
+        get() = hostValues.getOrNull(hostKeys.indexOf(loginRecoverHost.text.toString())).orEmpty()
 
     override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(loginRecoverHost.text.toString())).orEmpty()
 
     override val recoverNameValue: String
-        get() = bindingLocal.loginRecoverName.text.toString().trim()
+        get() = loginRecoverName.text.toString().trim()
 
     override val emailHintString: String
         get() = getString(R.string.login_email_hint)
@@ -59,90 +54,91 @@ class LoginRecoverFragment :
     override val invalidEmailString: String
         get() = getString(R.string.login_invalid_email)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentLoginRecoverBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_recover, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
+        loginRecoverWebView.setBackgroundColor(Color.TRANSPARENT)
         hostKeys = resources.getStringArray(R.array.hosts_keys)
         hostValues = resources.getStringArray(R.array.hosts_values)
         hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        with(bindingLocal) {
-            loginRecoverWebView.setBackgroundColor(Color.TRANSPARENT)
-            loginRecoverName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
-            loginRecoverHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-            loginRecoverButton.setOnClickListener { presenter.onRecoverClick() }
-            loginRecoverErrorRetry.setOnClickListener { presenter.onRecoverClick() }
-            loginRecoverErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-            loginRecoverLogin.setOnClickListener { (activity as LoginActivity).switchView(0) }
-        }
+        loginRecoverName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+        loginRecoverHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+        loginRecoverButton.setOnClickListener { presenter.onRecoverClick() }
+        loginRecoverErrorRetry.setOnClickListener { presenter.onRecoverClick() }
+        loginRecoverErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        loginRecoverLogin.setOnClickListener { (activity as LoginActivity).switchView(0) }
 
-        with(bindingLocal.loginRecoverHost) {
+        with(loginRecoverHost) {
             setText(hostKeys.getOrNull(0).orEmpty())
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
-            setOnClickListener { if (bindingLocal.loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
+            setOnClickListener { if (loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
     override fun setDefaultCredentials(username: String) {
-        bindingLocal.loginRecoverName.setText(username)
+        loginRecoverName.setText(username)
     }
 
     override fun setErrorNameRequired() {
-        with(bindingLocal.loginRecoverNameLayout) {
+        with(loginRecoverNameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setUsernameHint(hint: String) {
-        bindingLocal.loginRecoverNameLayout.hint = hint
+        loginRecoverNameLayout.hint = hint
     }
 
     override fun setUsernameError(message: String) {
-        with(bindingLocal.loginRecoverNameLayout) {
+        with(loginRecoverNameLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun clearUsernameError() {
-        bindingLocal.loginRecoverNameLayout.error = null
+        loginRecoverNameLayout.error = null
     }
 
     override fun showProgress(show: Boolean) {
-        bindingLocal.loginRecoverProgress.visibility = if (show) VISIBLE else GONE
+        loginRecoverProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showRecoverForm(show: Boolean) {
-        bindingLocal.loginRecoverFormContainer.visibility = if (show) VISIBLE else GONE
+        loginRecoverFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showCaptcha(show: Boolean) {
-        bindingLocal.loginRecoverCaptchaContainer.visibility = if (show) VISIBLE else GONE
+        loginRecoverCaptchaContainer.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        bindingLocal.loginRecoverError.visibility = if (show) VISIBLE else GONE
+        loginRecoverError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        bindingLocal.loginRecoverErrorMessage.text = message
+        loginRecoverErrorMessage.text = message
     }
 
     override fun showSuccessView(show: Boolean) {
-        bindingLocal.loginRecoverSuccess.visibility = if (show) VISIBLE else GONE
+        loginRecoverSuccess.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setSuccessTitle(title: String) {
-        bindingLocal.loginRecoverSuccessTitle.text = title
+        loginRecoverSuccessTitle.text = title
     }
 
     override fun setSuccessMessage(message: String) {
-        bindingLocal.loginRecoverSuccessMessage.text = message
+        loginRecoverSuccessMessage.text = message
     }
 
     override fun showSoftKeyboard() {
@@ -163,7 +159,7 @@ class LoginRecoverFragment :
             callback:e =>Android.captchaCallback(e)})</script>
         """.trimIndent()
 
-        with(bindingLocal.loginRecoverWebView) {
+        with(loginRecoverWebView) {
             settings.javaScriptEnabled = true
             webViewClient = object : WebViewClient() {
                 private var recoverWebViewSuccess: Boolean = true
@@ -185,8 +181,6 @@ class LoginRecoverFragment :
 
             loadDataWithBaseURL(url, html, "text/html", "UTF-8", null)
             addJavascriptInterface(object {
-
-                @Suppress("UNUSED")
                 @JavascriptInterface
                 fun captchaCallback(reCaptchaResponse: String) {
                     activity?.runOnUiThread {
@@ -203,10 +197,8 @@ class LoginRecoverFragment :
     }
 
     override fun onDestroyView() {
-        bindingLocal.loginRecoverWebView.destroy()
-        _binding = null
-        presenter.onDetachView()
-
         super.onDestroyView()
+        loginRecoverWebView.destroy()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
index e58377058..9a21fb910 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
@@ -1,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.login.recover
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.recover.RecoverRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginRecoverPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: RecoverErrorHandler,
     private val analytics: FirebaseAnalyticsHelper,
     private val recoverRepository: RecoverRepository
-) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -57,27 +55,24 @@ class LoginRecoverPresenter @Inject constructor(
 
         if (!validateInput(username, host)) return
 
-        flowWithResource { recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" }) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
+        disposable.add(recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" })
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     hideSoftKeyboard()
                     showRecoverForm(false)
                     showProgress(true)
                     showErrorView(false)
                     showCaptcha(false)
                 }
-                Status.SUCCESS -> view?.run {
-                    loadReCaptcha(url = it.data!!.first, siteKey = it.data.second)
-                    showProgress(false)
-                    showErrorView(false)
-                    showCaptcha(true)
-                }
-                Status.ERROR -> {
-                    Timber.i("Obtain captcha site key result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
             }
-        }.launch("captcha")
+            .subscribe({ (resetUrl, siteKey) ->
+                view?.loadReCaptcha(siteKey, resetUrl)
+            }) {
+                Timber.i("Obtain captcha site key result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun validateInput(username: String, host: String): Boolean {
@@ -101,28 +96,35 @@ class LoginRecoverPresenter @Inject constructor(
         val host = view?.recoverHostValue.orEmpty()
         val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
 
-        flowWithResource { recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    showProgress(true)
-                    showRecoverForm(false)
-                    showCaptcha(false)
+        with(disposable) {
+            clear()
+            add(recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showProgress(true)
+                        showRecoverForm(false)
+                        showCaptcha(false)
+                    }
                 }
-                Status.SUCCESS -> view?.run {
-                    showSuccessView(true)
-                    setSuccessTitle(it.data!!.substringBefore(". "))
-                    setSuccessMessage(it.data.substringAfter(". "))
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
+                    view?.run {
+                        showSuccessView(true)
+                        setSuccessTitle(it.substringBefore(". "))
+                        setSuccessMessage(it.substringAfter(". "))
+                    }
+
                     analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to true)
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Send recover request result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                     analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to false)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch("verified")
+                })
+        }
     }
 
     fun onDetailsClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
deleted file mode 100644
index c046c2ff5..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.studentselect
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
-import javax.inject.Inject
-
-class LoginStudentSelectAdapter @Inject constructor() :
-    RecyclerView.Adapter<LoginStudentSelectAdapter.ItemViewHolder>() {
-
-    private val checkedList = mutableMapOf<Int, Boolean>()
-
-    var items = emptyList<Pair<StudentWithSemesters, Boolean>>()
-        set(value) {
-            field = value
-            checkedList.clear()
-        }
-
-    var onClickListener: (StudentWithSemesters, alreadySaved: Boolean) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLoginStudentSelectBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (studentAndSemesters, alreadySaved) = items[position]
-        val student = studentAndSemesters.student
-        val semesters = studentAndSemesters.semesters
-        val diary = semesters.maxByOrNull { it.semesterId }
-
-        with(holder.binding) {
-            loginItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
-            loginItemSchool.text = student.schoolName
-            loginItemName.isEnabled = !alreadySaved
-            loginItemSchool.isEnabled = !alreadySaved
-            loginItemSignedIn.visibility = if (alreadySaved) View.VISIBLE else View.GONE
-
-            with(loginItemCheck) {
-                isEnabled = !alreadySaved
-                keyListener = null
-                isChecked = checkedList[position] ?: false
-            }
-
-            root.setOnClickListener {
-                onClickListener(studentAndSemesters, alreadySaved)
-
-                with(loginItemCheck) {
-                    if (isEnabled) {
-                        isChecked = !isChecked
-                        checkedList[position] = isChecked
-                    }
-                }
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemLoginStudentSelectBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index e71fc0f6f..9860af22f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -1,32 +1,33 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_login_student_select.*
 import java.io.Serializable
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LoginStudentSelectFragment :
-    BaseFragment<FragmentLoginStudentSelectBinding>(R.layout.fragment_login_student_select),
-    LoginStudentSelectView {
+class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
 
     @Inject
     lateinit var presenter: LoginStudentSelectPresenter
 
     @Inject
-    lateinit var loginAdapter: LoginStudentSelectAdapter
+    lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -37,32 +38,29 @@ class LoginStudentSelectFragment :
         fun newInstance() = LoginStudentSelectFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginStudentSelectBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_student_select, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_STUDENTS))
     }
 
     override fun initView() {
-        loginAdapter.onClickListener = presenter::onItemSelected
+        loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
+        loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
+        loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
+        loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
 
-        with(binding) {
-            loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
-            loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
-            loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
-
-            with(loginStudentSelectRecycler) {
-                layoutManager = LinearLayoutManager(context)
-                adapter = loginAdapter
-            }
+        loginStudentSelectRecycler.apply {
+            adapter = loginAdapter
+            layoutManager = SmoothScrollLinearLayoutManager(context)
         }
     }
 
-    override fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>) {
-        with(loginAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LoginStudentSelectItem>) {
+        loginAdapter.updateDataSet(data)
     }
 
     override fun openMainView() {
@@ -70,19 +68,19 @@ class LoginStudentSelectFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSignIn(enable: Boolean) {
-        binding.loginStudentSelectSignIn.isEnabled = enable
+        loginStudentSelectSignIn.isEnabled = enable
     }
 
-    fun onParentInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        presenter.onParentInitStudentSelectView(studentsWithSemesters)
+    fun onParentInitStudentSelectFragment(students: List<Student>) {
+        presenter.onParentInitStudentSelectView(students)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -91,7 +89,7 @@ class LoginStudentSelectFragment :
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
new file mode 100644
index 000000000..06be61387
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
@@ -0,0 +1,71 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_login_student_select.*
+
+class LoginStudentSelectItem(val student: Student, val alreadySaved: Boolean) :
+    AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_login_student_select
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ItemViewHolder {
+        return ItemViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>) {
+        holder.apply {
+            loginItemName.text = "${student.studentName} ${student.className}"
+            loginItemSchool.text = student.schoolName
+            loginItemName.isEnabled = !alreadySaved
+            loginItemSchool.isEnabled = !alreadySaved
+            loginItemCheck.isEnabled = !alreadySaved
+            loginItemSignedIn.visibility = if (alreadySaved) VISIBLE else GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as LoginStudentSelectItem
+
+        if (student != other.student) return false
+        if (alreadySaved != other.alreadySaved) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return student.hashCode()
+    }
+
+    class ItemViewHolder(view: View, val adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter), LayoutContainer {
+
+        override val containerView: View
+            get() = itemView
+
+        init {
+            loginItemCheck.keyListener = null
+        }
+
+        override fun onClick(view: View?) {
+            super.onClick(view)
+
+            if (loginItemCheck.isEnabled) {
+                loginItemCheck.apply { isChecked = !isChecked }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index 1384f25a0..82de5a887 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -1,34 +1,33 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.io.Serializable
 import javax.inject.Inject
 
 class LoginStudentSelectPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
-    var students = emptyList<StudentWithSemesters>()
+    var students = emptyList<Student>()
 
-    private val selectedStudents = mutableListOf<StudentWithSemesters>()
+    private var selectedStudents = mutableListOf<Student>()
 
     fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
         super.onAttachView(view)
-        with(view) {
+        view.run {
             initView()
             showContact(false)
             enableSignIn(false)
@@ -39,7 +38,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         }
 
         if (students is List<*> && students.isNotEmpty()) {
-            loadData(students.filterIsInstance<StudentWithSemesters>())
+            loadData(students.filterIsInstance<Student>())
         }
     }
 
@@ -47,19 +46,18 @@ class LoginStudentSelectPresenter @Inject constructor(
         registerStudents(selectedStudents)
     }
 
-    fun onParentInitStudentSelectView(studentsWithSemesters: List<StudentWithSemesters>) {
-        loadData(studentsWithSemesters)
-        if (studentsWithSemesters.size == 1) registerStudents(studentsWithSemesters)
+    fun onParentInitStudentSelectView(students: List<Student>) {
+        loadData(students)
+        if (students.size == 1) registerStudents(students)
     }
 
-    fun onItemSelected(studentWithSemester: StudentWithSemesters, alreadySaved: Boolean) {
-        if (alreadySaved) return
+    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is LoginStudentSelectItem && !item.alreadySaved) {
+            selectedStudents.removeAll { it == item.student }
+                .let { if (!it) selectedStudents.add(item.student) }
 
-        selectedStudents
-            .removeAll { it == studentWithSemester }
-            .let { if (!it) selectedStudents.add(studentWithSemester) }
-
-        view?.enableSignIn(selectedStudents.isNotEmpty())
+            view?.enableSignIn(selectedStudents.isNotEmpty())
+        }
     }
 
     private fun compareStudents(a: Student, b: Student): Boolean {
@@ -70,60 +68,56 @@ class LoginStudentSelectPresenter @Inject constructor(
             && a.classId == b.classId
     }
 
-    private fun loadData(studentsWithSemesters: List<StudentWithSemesters>) {
-        resetSelectedState()
-        this.students = studentsWithSemesters
-
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Login student select students load started")
-                Status.SUCCESS -> view?.updateData(studentsWithSemesters.map { studentWithSemesters ->
-                    studentWithSemesters to it.data!!.any { item -> compareStudents(studentWithSemesters.student, item.student) }
-                })
-                Status.ERROR -> {
-                    errorHandler.dispatch(it.error!!)
-                    lastError = it.error
-                    view?.updateData(studentsWithSemesters.map { student -> student to false })
+    private fun loadData(students: List<Student>) {
+        this.students = students
+        disposable.add(studentRepository.getSavedStudents()
+            .map { savedStudents ->
+                students.map { student ->
+                    Pair(student, savedStudents.any { compareStudents(student, it) })
                 }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view?.updateData(it.map { studentPair ->
+                    LoginStudentSelectItem(studentPair.first, studentPair.second)
+                })
+            }, {
+                errorHandler.dispatch(it)
+                lastError = it
+                view?.updateData(students.map { student -> LoginStudentSelectItem(student, false) })
+            })
+        )
     }
 
-    private fun resetSelectedState() {
-        selectedStudents.clear()
-        view?.enableSignIn(false)
-    }
-
-    private fun registerStudents(studentsWithSemesters: List<StudentWithSemesters>) {
-        flowWithResource {
-            val savedStudents = studentRepository.saveStudents(studentsWithSemesters)
-            val firstRegistered = studentsWithSemesters.first().apply { student.id = savedStudents.first() }
-            studentRepository.switchStudent(firstRegistered)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Registration started")
+    private fun registerStudents(students: List<Student>) {
+        disposable.add(studentRepository.saveStudents(students)
+            .map { students.first().apply { id = it.first() } }
+            .flatMapCompletable { studentRepository.switchStudent(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Registration result: Success")
-                    view?.openMainView()
-                    logRegisterEvent(studentsWithSemesters)
-                }
-                Status.ERROR -> {
-                    Timber.i("Registration result: An exception occurred ")
-                    view?.apply {
-                        showProgress(false)
-                        showContent(true)
-                        showContact(true)
-                    }
-                    lastError = it.error
-                    loginErrorHandler.dispatch(it.error!!)
-                    logRegisterEvent(studentsWithSemesters, it.error)
-                }
+                Timber.i("Registration started")
             }
-        }.launch("register")
+            .subscribe({
+                students.forEach { analytics.logEvent("registration_student_select", "success" to true, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to "No error") }
+                Timber.i("Registration result: Success")
+                view?.openMainView()
+            }, { error ->
+                students.forEach { analytics.logEvent("registration_student_select", "success" to false, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) }
+                Timber.i("Registration result: An exception occurred ")
+                loginErrorHandler.dispatch(error)
+                lastError = error
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
+                    showContact(true)
+                }
+            }))
     }
 
     fun onDiscordClick() {
@@ -133,15 +127,4 @@ class LoginStudentSelectPresenter @Inject constructor(
     fun onEmailClick() {
         view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
     }
-
-    private fun logRegisterEvent(studentsWithSemesters: List<StudentWithSemesters>, error: Throwable? = null) {
-        studentsWithSemesters.forEach { student ->
-            analytics.logEvent(
-                "registration_student_select",
-                "success" to (error != null),
-                "scrapperBaseUrl" to student.student.scrapperBaseUrl,
-                "symbol" to student.student.symbol,
-                "error" to (error?.message?.ifBlank { "No message" } ?: "No error"))
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index f2acd76c5..d80b059db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>)
+    fun updateData(data: List<LoginStudentSelectItem>)
 
     fun openMainView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index e2c37db61..5602b6248 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -1,17 +1,17 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
@@ -19,11 +19,10 @@ import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_symbol.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LoginSymbolFragment :
-    BaseFragment<FragmentLoginSymbolBinding>(R.layout.fragment_login_symbol), LoginSymbolView {
+class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
 
     @Inject
     lateinit var presenter: LoginSymbolPresenter
@@ -38,28 +37,29 @@ class LoginSymbolFragment :
     }
 
     override val symbolNameError: CharSequence?
-        get() = binding.loginSymbolNameLayout.error
+        get() = loginSymbolNameLayout.error
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLoginSymbolBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_symbol, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_LOGIN_DATA))
     }
 
     override fun initView() {
-        with(binding) {
-            loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
-            loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
-            loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
+        loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+        loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
+        loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
 
-            loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+        loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
-            loginSymbolName.apply {
-                setOnEditorActionListener { _, id, _ ->
-                    if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
-                }
-                setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+        loginSymbolName.apply {
+            setOnEditorActionListener { _, id, _ ->
+                if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
             }
+            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
         }
     }
 
@@ -68,25 +68,25 @@ class LoginSymbolFragment :
     }
 
     override fun setErrorSymbolIncorrect() {
-        binding.loginSymbolNameLayout.apply {
+        loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_incorrect_symbol)
         }
     }
 
     override fun setErrorSymbolRequire() {
-        binding.loginSymbolNameLayout.apply {
+        loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun clearSymbolError() {
-        binding.loginSymbolNameLayout.error = null
+        loginSymbolNameLayout.error = null
     }
 
     override fun clearAndFocusSymbol() {
-        binding.loginSymbolNameLayout.apply {
+        loginSymbolNameLayout.apply {
             editText?.text = null
             requestFocus()
         }
@@ -101,15 +101,15 @@ class LoginSymbolFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginSymbolProgress.visibility = if (show) VISIBLE else GONE
+        loginSymbolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
+        loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(studentsWithSemesters)
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(students)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -118,12 +118,12 @@ class LoginSymbolFragment :
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginSymbolContact.visibility = if (show) VISIBLE else GONE
+        loginSymbolContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 
     override fun openFaqPage() {
@@ -139,7 +139,7 @@ class LoginSymbolFragment :
                 "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                 appInfo.systemVersion.toString(),
                 appInfo.versionName,
-                "$host/${binding.loginSymbolName.text}",
+                "$host/${loginSymbolName.text}",
                 lastError
             )
         )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index a2cda4fc1..1f9e66b70 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -1,23 +1,22 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Single
 import timber.log.Timber
 import java.io.Serializable
 import javax.inject.Inject
 
 class LoginSymbolPresenter @Inject constructor(
     studentRepository: StudentRepository,
+    schedulers: SchedulersProvider,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
@@ -47,55 +46,44 @@ class LoginSymbolPresenter @Inject constructor(
             return
         }
 
-        flowWithResource { studentRepository.getStudentsScrapper(loginData!!.first, loginData!!.second, loginData!!.third, symbol) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
+        disposable.add(
+            Single.fromCallable { loginData }
+                .flatMap { studentRepository.getStudentsScrapper(it.first, it.second, it.third, symbol) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        hideSoftKeyboard()
+                        showProgress(true)
+                        showContent(false)
+                    }
                     Timber.i("Login with symbol started")
-                    hideSoftKeyboard()
-                    showProgress(true)
-                    showContent(false)
                 }
-                Status.SUCCESS -> {
-                    view?.run {
-                        if (it.data!!.isEmpty()) {
+                .doFinally {
+                    view?.apply {
+                        showProgress(false)
+                        showContent(true)
+                    }
+                }
+                .subscribe({
+                    analytics.logEvent("registration_symbol", "success" to true, "students" to it.size, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to "No error")
+                    view?.apply {
+                        if (it.isEmpty()) {
                             Timber.i("Login with symbol result: Empty student list")
                             setErrorSymbolIncorrect()
                             view?.showContact(true)
                         } else {
                             Timber.i("Login with symbol result: Success")
-                            notifyParentAccountLogged(it.data)
+                            notifyParentAccountLogged(it)
                         }
                     }
-                    analytics.logEvent(
-                        "registration_symbol",
-                        "success" to true,
-                        "students" to it.data!!.size,
-                        "scrapperBaseUrl" to loginData?.third,
-                        "symbol" to symbol,
-                        "error" to "No error"
-                    )
-                }
-                Status.ERROR -> {
+                }, {
                     Timber.i("Login with symbol result: An exception occurred")
-                    analytics.logEvent(
-                        "registration_symbol",
-                        "success" to false,
-                        "students" to -1,
-                        "scrapperBaseUrl" to loginData?.third,
-                        "symbol" to symbol,
-                        "error" to it.error!!.message.ifNullOrBlank { "No message" }
-                    )
-                    loginErrorHandler.dispatch(it.error)
-                    lastError = it.error
+                    analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" })
+                    loginErrorHandler.dispatch(it)
+                    lastError = it
                     view?.showContact(true)
-                }
-            }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+                }))
     }
 
     fun onParentInitSymbolView(loginData: Triple<String, String, String>) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 830c77d17..6938bf138 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginSymbolView : BaseView {
@@ -25,7 +25,7 @@ interface LoginSymbolView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     fun showContact(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
index 0f1d836d0..12bf1a132 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -1,21 +1,19 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.databinding.FragmentLuckyNumberBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import kotlinx.android.synthetic.main.fragment_lucky_number.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LuckyNumberFragment :
-    BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
-    MainView.TitledView {
+class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: LuckyNumberPresenter
@@ -27,57 +25,58 @@ class LuckyNumberFragment :
     override val titleStringId: Int
         get() = R.string.lucky_number_title
 
-    override val isViewEmpty get() = binding.luckyNumberText.text.isBlank()
+    override val isViewEmpty get() = luckyNumberText.text.isBlank()
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLuckyNumberBinding.bind(view)
-        messageContainer = binding.luckyNumberSwipe
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_lucky_number, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = luckyNumberSwipe
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding) {
-            luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
-            luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
+        luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
+        luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateData(data: LuckyNumber) {
-        binding.luckyNumberText.text = data.luckyNumber.toString()
+        luckyNumberText.text = data.luckyNumber.toString()
     }
 
     override fun hideRefresh() {
-        binding.luckyNumberSwipe.isRefreshing = false
+        luckyNumberSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
+        luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.luckyNumberError.visibility = if (show) VISIBLE else GONE
+        luckyNumberError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.luckyNumberErrorMessage.text = message
+        luckyNumberErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.luckyNumberProgress.visibility = if (show) VISIBLE else GONE
+        luckyNumberProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.luckyNumberSwipe.isEnabled = enable
+        luckyNumberSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.luckyNumberContent.visibility = if (show) VISIBLE else GONE
+        luckyNumberContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        presenter.onDetachView()
         super.onDestroyView()
+        presenter.onDetachView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index 90aea441e..1d3a17bdc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -1,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LuckyNumberPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository) {
+) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -34,47 +32,42 @@ class LuckyNumberPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            luckyNumberRepository.getLuckyNumber(student, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading lucky number started")
-                Status.SUCCESS -> {
-                    if (it.data != null) {
-                        Timber.i("Loading lucky number result: Success")
-                        view?.apply {
-                            updateData(it.data)
-                            showContent(true)
-                            showEmpty(false)
-                            showErrorView(false)
-                        }
-                        analytics.logEvent(
-                            "load_item",
-                            "type" to "lucky_number",
-                            "number" to it.data.luckyNumber
-                        )
-                    } else {
-                        Timber.i("Loading lucky number result: No lucky number found")
-                        view?.run {
-                            showContent(false)
-                            showEmpty(true)
-                            showErrorView(false)
-                        }
+        Timber.i("Loading lucky number started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
                     }
                 }
-                Status.ERROR -> {
+                .subscribe({
+                    Timber.i("Loading lucky number result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showContent(true)
+                        showEmpty(false)
+                        showErrorView(false)
+                    }
+                    analytics.logEvent("load_lucky_number", "lucky_number" to it.luckyNumber, "force_refresh" to forceRefresh)
+                }, {
                     Timber.i("Loading lucky number result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                }, {
+                    Timber.i("Loading lucky number result: No lucky number found")
+                    view?.run {
+                        showContent(false)
+                        showEmpty(true)
+                        showErrorView(false)
+                    }
+                })
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
index 692615d98..e8ce3bcfb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -4,41 +4,34 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class LuckyNumberWidgetConfigureActivity :
-    BaseActivity<LuckyNumberWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
+class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigurePresenter>(),
     LuckyNumberWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: WidgetConfigureAdapter
+    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     override lateinit var presenter: LuckyNumberWidgetConfigurePresenter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     private var dialog: AlertDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(R.layout.activity_widget_configure)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
@@ -46,35 +39,31 @@ class LuckyNumberWidgetConfigureActivity :
     }
 
     override fun initView() {
-        with(binding.widgetConfigureRecycler) {
+        with(widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = LinearLayoutManager(context)
+            layoutManager = SmoothScrollLinearLayoutManager(context)
         }
 
-        configureAdapter.onClickListener = presenter::onItemSelect
+        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
     }
 
     override fun showThemeDialog() {
-        var items = arrayOf(
+        val items = arrayOf(
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
-        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += (getString(R.string.widget_timetable_theme_system))
 
-        dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
+       dialog =  AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
             .setTitle(R.string.widget_timetable_theme_title)
-            .setOnDismissListener { presenter.onDismissThemeView() }
+           .setOnDismissListener { presenter.onDismissThemeView() }
             .setSingleChoiceItems(items, -1) { _, which ->
                 presenter.onThemeSelect(which)
             }
             .show()
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
-        with(configureAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LuckyNumberWidgetConfigureItem>) {
+        configureAdapter.updateDataSet(data)
     }
 
     override fun updateLuckyNumberWidget(widgetId: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
new file mode 100644
index 000000000..e260b7fcb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.ui.modules.luckynumberwidget
+
+import android.annotation.SuppressLint
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolean) :
+    AbstractFlexibleItem<LuckyNumberWidgetConfigureItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_account
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        val context = holder.contentView.context
+
+        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setColorFilter(colorImage)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TimetableWidgetConfigureItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 574120b36..6e4716bfa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -8,16 +8,15 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class LuckyNumberWidgetConfigurePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository) {
+) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
@@ -30,9 +29,11 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(student: Student) {
-        selectedStudent = student
-        view?.showThemeDialog()
+    fun onItemSelect(item: AbstractFlexibleItem<*>) {
+        if (item is LuckyNumberWidgetConfigureItem) {
+            selectedStudent = item.student
+            view?.showThemeDialog()
+        }
     }
 
     fun onThemeSelect(index: Int) {
@@ -42,30 +43,28 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView() {
+    fun onDismissThemeView(){
         view?.finishView()
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Lucky number widget configure students data load")
-                Status.SUCCESS -> {
-                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
-                    when {
-                        it.data!!.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
-                        else -> view?.updateData(it.data.map { entity ->
-                            entity.student to (entity.student.id == widgetId)
-                        })
-                    }
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> LuckyNumberWidgetConfigureItem(student, student.id == currentStudentId) }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 -> {
+                        selectedStudent = it.single().student
+                        view?.showThemeDialog()
+                    }
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 
     private fun registerStudent(student: Student?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
index c8c348ed3..fa4c0cc61 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberWidgetConfigureView : BaseView {
@@ -9,7 +8,7 @@ interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun showThemeDialog()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<LuckyNumberWidgetConfigureItem>)
 
     fun updateLuckyNumberWidget(widgetId: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index b7f4b740e..e4b1072b6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -7,25 +7,25 @@ import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
 import android.appwidget.AppWidgetProvider
 import android.content.Context
-import android.content.res.Configuration
+import android.content.Intent
 import android.os.Bundle
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.RemoteViews
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.toFirstResult
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Maybe
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberWidgetProvider : AppWidgetProvider() {
 
     @Inject
@@ -34,6 +34,12 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
     @Inject
     lateinit var luckyNumberRepository: LuckyNumberRepository
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
+    @Inject
+    lateinit var appWidgetManager: AppWidgetManager
+
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
@@ -48,15 +54,22 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        super.onReceive(context, intent)
+    }
+
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray?) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
         appWidgetIds?.forEach { appWidgetId ->
+            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
 
             val luckyNumber = getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
             val appIntent = PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
                 MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT)
 
-            val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context)).apply {
+            val remoteView = RemoteViews(context.packageName, layoutId).apply {
                 setTextViewText(R.id.luckyNumberWidgetNumber, luckyNumber?.luckyNumber?.toString() ?: "#")
                 setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
             }
@@ -69,19 +82,17 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
     override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
         super.onDeleted(context, appWidgetIds)
         appWidgetIds?.forEach { appWidgetId ->
-            with(sharedPref) {
-                delete(getHeightWidgetKey(appWidgetId))
-                delete(getStudentWidgetKey(appWidgetId))
-                delete(getThemeWidgetKey(appWidgetId))
-                delete(getWidthWidgetKey(appWidgetId))
-            }
+            if (appWidgetId != 0) sharedPref.delete(getStudentWidgetKey(appWidgetId))
         }
     }
 
     override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
 
-        val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context))
+        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
+
+        val remoteView = RemoteViews(context.packageName, layoutId)
 
         setStyles(remoteView, appWidgetId, newOptions)
         appWidgetManager.updateAppWidget(appWidgetId, remoteView)
@@ -91,10 +102,8 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         val width = options?.getInt(OPTION_APPWIDGET_MIN_WIDTH) ?: sharedPref.getLong(getWidthWidgetKey(appWidgetId), 74).toInt()
         val height = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: sharedPref.getLong(getHeightWidgetKey(appWidgetId), 74).toInt()
 
-        with(sharedPref) {
-            putLong(getWidthWidgetKey(appWidgetId), width.toLong())
-            putLong(getHeightWidgetKey(appWidgetId), height.toLong())
-        }
+        sharedPref.putLong(getWidthWidgetKey(appWidgetId), width.toLong())
+        sharedPref.putLong(getHeightWidgetKey(appWidgetId), height.toLong())
 
         val rows = getCellsForSize(height)
         val cols = getCellsForSize(width)
@@ -125,23 +134,27 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         return n - 1
     }
 
-    private fun getLuckyNumber(studentId: Long, appWidgetId: Int) = runBlocking {
-        try {
-            val students = studentRepository.getSavedStudents()
-            val student = students.singleOrNull { it.student.id == studentId }?.student
-            val currentStudent = when {
-                student != null -> student
-                studentId != 0L && studentRepository.isCurrentStudentSet() -> {
-                    studentRepository.getCurrentStudent(false).also {
-                        sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
+    private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
+        return try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                .flatMap { students ->
+                    val student = students.singleOrNull { student -> student.id == studentId }
+                    when {
+                        student != null -> Maybe.just(student)
+                        studentId != 0L -> {
+                            studentRepository.isCurrentStudentSet()
+                                .filter { true }
+                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                        }
+                        else -> Maybe.empty()
                     }
                 }
-                else -> null
-            }
-
-            currentStudent?.let {
-                luckyNumberRepository.getLuckyNumber(it, false).toFirstResult().data
-            }
+                .flatMap { luckyNumberRepository.getLuckyNumber(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
         } catch (e: Exception) {
             if (e.cause !is NoCurrentStudentException) {
                 Timber.e(e, "An error has occurred in lucky number provider")
@@ -149,15 +162,4 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
             null
         }
     }
-
-    private fun getCorrectLayoutId(appWidgetId: Int, context: Context): Int {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-
-        return if (savedTheme == 1L || (savedTheme == 2L && isSystemDarkMode)) {
-            R.layout.widget_luckynumber_dark
-        } else {
-            R.layout.widget_luckynumber
-        }
-    }
 }
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 035608893..864ad4239 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,6 +9,7 @@ import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.core.graphics.ColorUtils
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -17,9 +18,8 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
@@ -31,26 +31,24 @@ 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.timetable.TimetableFragment
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
+import kotlinx.android.synthetic.main.activity_main.*
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView {
+class MainActivity : BaseActivity<MainPresenter>(), MainView {
 
     @Inject
     override lateinit var presenter: MainPresenter
 
     @Inject
-    lateinit var analytics: FirebaseAnalyticsHelper
+    lateinit var navController: FragNavController
 
-    private val overlayProvider by lazy { ElevationOverlayProvider(this) }
-
-    private val navController = FragNavController(supportFragmentManager, R.id.mainFragmentContainer)
+    @Inject
+    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
 
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
@@ -85,9 +83,9 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
-        setSupportActionBar(binding.mainToolbar)
-        messageContainer = binding.mainFragmentContainer
+        setContentView(R.layout.activity_main)
+        setSupportActionBar(mainToolbar)
+        messageContainer = mainFragmentContainer
 
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
 
@@ -103,12 +101,12 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     override fun initView() {
-        with(binding.mainToolbar) {
+        with(mainToolbar) {
             if (SDK_INT >= LOLLIPOP) stateListAnimator = null
-            setBackgroundColor(overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
+            setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
         }
 
-        with(binding.mainBottomNav) {
+        with(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),
@@ -117,8 +115,8 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
                 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))
+            inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153)
+            defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
@@ -139,10 +137,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
     }
 
-    override fun setCurrentScreen(name: String?) {
-        analytics.setCurrentScreen(this, name)
-    }
-
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         return if (item?.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
         else false
@@ -173,7 +167,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     override fun showActionBarElevation(show: Boolean) {
-        ViewCompat.setElevation(binding.mainToolbar, if (show) dpToPx(4f) else 0f)
+        ViewCompat.setElevation(mainToolbar, if (show) dpToPx(4f) else 0f)
     }
 
     override fun notifyMenuViewReselected() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
new file mode 100644
index 000000000..1610d0298
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -0,0 +1,141 @@
+package io.github.wulkanowy.ui.modules.main
+
+import com.google.android.material.elevation.ElevationOverlayProvider
+import com.ncapdevi.fragnav.FragNavController
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.R
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.modules.about.AboutFragment
+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.license.LicenseModule
+import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
+import io.github.wulkanowy.ui.modules.account.AccountDialog
+import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.attendance.AttendanceModule
+import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
+import io.github.wulkanowy.ui.modules.exam.ExamFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeModule
+import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.message.MessageModule
+import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
+import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
+import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceModule
+import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
+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.schoolandteachers.SchoolAndTeachersModule
+import io.github.wulkanowy.ui.modules.settings.SettingsFragment
+import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
+
+@Suppress("unused")
+@Module
+abstract class MainModule {
+
+    companion object {
+
+        @Provides
+        fun provideFragNavController(activity: MainActivity) =
+            FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
+
+        //In activities must be injected as Lazy
+        @Provides
+        fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
+    }
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [AttendanceModule::class])
+    abstract fun bindAttendanceFragment(): AttendanceFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAttendanceSummaryFragment(): AttendanceSummaryFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindExamFragment(): ExamFragment
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [GradeModule::class])
+    abstract fun bindGradeFragment(): GradeFragment
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [MessageModule::class])
+    abstract fun bindMessagesFragment(): MessageFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMessagePreviewFragment(): MessagePreviewFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMoreFragment(): MoreFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindTimetableFragment(): TimetableFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAboutFragment(): AboutFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindSettingsFragment(): SettingsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindNoteFragment(): NoteFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindHomeworkFragment(): HomeworkFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindHomeworkDetailsDialog(): HomeworkDetailsDialog
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindCompletedLessonsFragment(): CompletedLessonsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAccountDialog(): AccountDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [MobileDeviceModule::class])
+    abstract fun bindMobileDevices(): MobileDeviceFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [LicenseModule::class])
+    abstract fun bindLicenseFragment(): LicenseFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLogViewerFragment(): LogViewerFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindContributorFragment(): ContributorFragment
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [SchoolAndTeachersModule::class])
+    abstract fun bindSchoolAndTeachersFragment(): SchoolAndTeachersFragment
+}
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 8d5c9d67f..f5a490044 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
@@ -9,16 +9,18 @@ import io.github.wulkanowy.ui.modules.main.MainView.Section.GRADE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.MESSAGE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.SCHOOL
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val prefRepository: PreferencesRepository,
     private val syncManager: SyncManager,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MainView>(errorHandler, studentRepository) {
+) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
 
     fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
@@ -35,9 +37,8 @@ class MainPresenter @Inject constructor(
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onViewChange(section: MainView.Section?, name: String?) {
+    fun onViewChange(section: MainView.Section?) {
         view?.apply {
-            setCurrentScreen(name)
             showActionBarElevation(section != GRADE && section != MESSAGE && section != SCHOOL)
             currentViewTitle?.let { setViewTitle(it) }
             currentViewSubtitle?.let { setViewSubTitle(it.ifBlank { null }) }
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 7e5831471..97b556e3e 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
@@ -24,8 +24,6 @@ interface MainView : BaseView {
 
     fun showAccountPicker()
 
-    fun setCurrentScreen(name: String?)
-
     fun showActionBarElevation(show: Boolean)
 
     fun notifyMenuViewReselected()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 16e0184a0..7a3e135dd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -1,15 +1,16 @@
 package io.github.wulkanowy.ui.modules.message
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
-import io.github.wulkanowy.databinding.FragmentMessageBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -17,16 +18,16 @@ import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.fragment_message.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
-    MessageView, MainView.TitledView {
+class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = MessageFragment()
@@ -34,17 +35,20 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
 
     override val titleStringId get() = R.string.message_title
 
-    override val currentPageIndex get() = binding.messageViewPager.currentItem
+    override val currentPageIndex get() = messageViewPager.currentItem
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMessageBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_message, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = binding.messageViewPager.id
+            containerId = messageViewPager.id
             addFragmentsWithTitle(mapOf(
                 MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
                 MessageTabFragment.newInstance(SENT) to getString(R.string.message_sent),
@@ -52,29 +56,31 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
             ))
         }
 
-        with(binding.messageViewPager) {
+        with(messageViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(binding.messageTabLayout) {
-            setupWithViewPager(binding.messageViewPager)
+        with(messageTabLayout) {
+            setupWithViewPager(messageViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
 
-        binding.openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
+        openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
 
     override fun showContent(show: Boolean) {
-        with(binding) {
-            messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
-            messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
+        messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showProgress(show: Boolean) {
-        binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
+        messageProgress.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    fun onDeleteMessage(message: Message) {
+        presenter.onDeleteMessage(message)
     }
 
     fun onChildFragmentLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
new file mode 100644
index 000000000..7e52233c9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
@@ -0,0 +1,67 @@
+package io.github.wulkanowy.ui.modules.message
+
+import android.graphics.Typeface.BOLD
+import android.graphics.Typeface.NORMAL
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_message.*
+
+class MessageItem(val message: Message, private val noSubjectString: String) :
+    AbstractFlexibleItem<MessageItem.ViewHolder>() {
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun getLayoutRes() = R.layout.item_message
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            val style = if (message.unread) BOLD else NORMAL
+
+            messageItemAuthor.run {
+                text = if (message.folderId == MessageFolder.SENT.id) message.recipient else message.sender
+                setTypeface(null, style)
+            }
+            messageItemSubject.run {
+                text = if (message.subject.isNotBlank()) message.subject else noSubjectString
+                setTypeface(null, style)
+            }
+            messageItemDate.run {
+                text = message.date.toFormattedString()
+                setTypeface(null, style)
+            }
+            with(messageItemAttachmentIcon) {
+                visibility = if (message.hasAttachments) View.VISIBLE else View.GONE
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MessageItem
+
+        if (message != other.message) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return message.hashCode()
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
new file mode 100644
index 000000000..bf7950209
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.ui.modules.message
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerChildFragment
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
+
+@Suppress("unused")
+@Module
+abstract class MessageModule {
+
+    companion object {
+
+        @PerFragment
+        @Provides
+        fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
+    }
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun bindMessageTabFragment(): MessageTabFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 0fb454b31..0f5598b23 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -1,26 +1,29 @@
 package io.github.wulkanowy.ui.modules.message
 
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class MessagePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<MessageView>(errorHandler, studentRepository) {
+) : BasePresenter<MessageView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MessageView) {
         super.onAttachView(view)
-        launch {
-            delay(150)
-            view.initView()
-            Timber.i("Message view was initialized")
-            loadData()
-        }
+        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                view.initView()
+                Timber.i("Message view was initialized")
+                loadData()
+            })
     }
 
     fun onPageSelected(index: Int) {
@@ -43,6 +46,15 @@ class MessagePresenter @Inject constructor(
         }
     }
 
+    fun onDeleteMessage(message: Message) {
+        view?.notifyChildMessageDeleted(
+            when (message.removed) {
+                true -> 2
+                else -> message.folderId - 1
+            }
+        )
+    }
+
     fun onSendMessageButtonClicked() {
         view?.openSendMessage()
     }
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..a0ac6ec70 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
@@ -9,11 +9,11 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.databinding.ItemMessageAttachmentBinding
-import io.github.wulkanowy.databinding.ItemMessageDividerBinding
-import io.github.wulkanowy.databinding.ItemMessagePreviewBinding
+import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.item_message_attachment.view.*
+import kotlinx.android.synthetic.main.item_message_preview.view.*
 import javax.inject.Inject
 
 class MessagePreviewAdapter @Inject constructor() :
@@ -45,47 +45,44 @@ 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(inflater.inflate(R.layout.item_message_preview, parent, false))
+            ViewType.DIVIDER.id -> DividerViewHolder(inflater.inflate(R.layout.item_message_divider, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(inflater.inflate(R.layout.item_message_attachment, 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.view, requireNotNull(messageWithAttachment).message)
+            is AttachmentViewHolder -> bindAttachment(holder.view, requireNotNull(messageWithAttachment).attachments[position - 2])
         }
     }
 
     @SuppressLint("SetTextI18n")
-    private fun bindMessage(holder: MessageViewHolder, message: Message) {
-        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"))
+    private fun bindMessage(view: View, message: Message) {
+        with(view) {
+            messagePreviewSubject.text = if (message.subject.isNotBlank()) message.subject else context.getString(R.string.message_no_subject)
+            messagePreviewDate.text = context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
             messagePreviewContent.text = message.content
-            messagePreviewFromSender.text = message.sender
-            messagePreviewToRecipient.text = message.recipient
+            messagePreviewAuthor.text = if (message.folderId == MessageFolder.SENT.id) "${context.getString(R.string.message_to)} ${message.recipient}"
+            else "${context.getString(R.string.message_from)} ${message.sender}"
         }
     }
 
-    private fun bindAttachment(holder: AttachmentViewHolder, attachment: MessageAttachment) {
-        with(holder.binding) {
+    private fun bindAttachment(view: View, attachment: MessageAttachment) {
+        with(view) {
             messagePreviewAttachment.visibility = View.VISIBLE
             messagePreviewAttachment.text = attachment.filename
-            root.setOnClickListener {
-                root.context.openInternetBrowser(attachment.url) { }
+            setOnClickListener {
+                context.openInternetBrowser(attachment.url) { }
             }
         }
     }
 
-    class MessageViewHolder(val binding: ItemMessagePreviewBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class MessageViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
-    class DividerViewHolder(val binding: ItemMessageDividerBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class DividerViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 
-    class AttachmentViewHolder(val binding: ItemMessageAttachmentBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    class AttachmentViewHolder(val view: View) : RecyclerView.ViewHolder(view)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 740f4927c..953238c08 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -1,38 +1,27 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.os.Build
 import android.os.Bundle
-import android.print.PrintAttributes
-import android.print.PrintManager
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.annotation.RequiresApi
-import androidx.core.content.getSystemService
+import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.databinding.FragmentMessagePreviewBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.shareText
+import kotlinx.android.synthetic.main.fragment_message_preview.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MessagePreviewFragment :
-    BaseFragment<FragmentMessagePreviewBinding>(R.layout.fragment_message_preview),
-    MessagePreviewView, MainView.TitledView {
+class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePreviewPresenter
@@ -40,31 +29,18 @@ class MessagePreviewFragment :
     @Inject
     lateinit var previewAdapter: MessagePreviewAdapter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     private var menuReplyButton: MenuItem? = null
 
     private var menuForwardButton: MenuItem? = null
 
     private var menuDeleteButton: MenuItem? = null
 
-    private var menuShareButton: MenuItem? = null
-
-    private var menuPrintButton: MenuItem? = null
-
     override val titleStringId: Int
         get() = R.string.message_title
 
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
-    override val messageNoSubjectString: String
-        get() = getString(R.string.message_no_subject)
-
-    override val printHTML: String
-        get() = requireContext().assets.open("message-print-page.html").bufferedReader().use { it.readText() }
-
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
@@ -80,17 +56,20 @@ class MessagePreviewFragment :
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMessagePreviewBinding.bind(view)
-        messageContainer = binding.messagePreviewContainer
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_message_preview, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = messagePreviewContainer
         presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message)
     }
 
     override fun initView() {
-        binding.messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        with(binding.messagePreviewRecycler) {
+        with(messagePreviewRecycler) {
             layoutManager = LinearLayoutManager(context)
             adapter = previewAdapter
         }
@@ -101,8 +80,6 @@ class MessagePreviewFragment :
         menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
         menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
         menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
-        menuShareButton = menu.findItem(R.id.messagePreviewMenuShare)
-        menuPrintButton = menu.findItem(R.id.messagePreviewMenuPrint)
         presenter.onCreateOptionsMenu()
     }
 
@@ -111,8 +88,6 @@ class MessagePreviewFragment :
             R.id.messagePreviewMenuReply -> presenter.onReply()
             R.id.messagePreviewMenuForward -> presenter.onForward()
             R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
-            R.id.messagePreviewMenuShare -> presenter.onShare()
-            R.id.messagePreviewMenuPrint -> presenter.onPrint()
             else -> false
         }
     }
@@ -125,19 +100,17 @@ class MessagePreviewFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.messagePreviewProgress.visibility = if (show) VISIBLE else GONE
+        messagePreviewProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
+        messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showOptions(show: Boolean) {
         menuReplyButton?.isVisible = show
         menuForwardButton?.isVisible = show
         menuDeleteButton?.isVisible = show
-        menuShareButton?.isVisible = show
-        menuPrintButton?.isVisible = show && appInfo.systemVersion >= Build.VERSION_CODES.LOLLIPOP
     }
 
     override fun setDeletedOptionsLabels() {
@@ -149,15 +122,15 @@ class MessagePreviewFragment :
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.messagePreviewError.visibility = if (show) VISIBLE else GONE
+        messagePreviewError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.messagePreviewErrorMessage.text = message
+        messagePreviewErrorMessage.text = message
     }
 
     override fun setErrorRetryCallback(callback: () -> Unit) {
-        binding.messagePreviewErrorRetry.setOnClickListener { callback() }
+        messagePreviewErrorRetry.setOnClickListener { callback() }
     }
 
     override fun openMessageReply(message: Message?) {
@@ -168,42 +141,14 @@ class MessagePreviewFragment :
         context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message)) }
     }
 
-    override fun shareText(text: String, subject: String) {
-        context?.shareText(text, subject)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    override fun printDocument(html: String, jobName: String) {
-        val webView = WebView(activity)
-        webView.webViewClient = object : WebViewClient() {
-
-            override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) = false
-
-            override fun onPageFinished(view: WebView, url: String) {
-                createWebPrintJob(view, jobName)
-            }
-        }
-
-        webView.loadDataWithBaseURL("file:///android_asset/", html, "text/HTML", "UTF-8", null)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    private fun createWebPrintJob(webView: WebView, jobName: String) {
-        activity?.getSystemService<PrintManager>()?.let { printManager ->
-            val printAdapter = webView.createPrintDocumentAdapter(jobName)
-
-            printManager.print(
-                jobName,
-                printAdapter,
-                PrintAttributes.Builder().build()
-            )
-        }
-    }
-
     override fun popView() {
         (activity as MainActivity).popView()
     }
 
+    override fun notifyParentMessageDeleted(message: Message) {
+        parentFragmentManager.fragments.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
         super.onSaveInstanceState(outState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index d261d1ee1..62ac5a532 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -1,37 +1,25 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.annotation.SuppressLint
-import android.os.Build
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.student.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.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MessagePreviewPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val analytics: FirebaseAnalyticsHelper,
-    private var appInfo: AppInfo
-) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository, schedulers) {
 
     var message: Message? = null
 
-    var attachments: List<MessageAttachment>? = null
-
     private lateinit var lastError: Throwable
 
     private var retryCallback: () -> Unit = {}
@@ -57,35 +45,28 @@ class MessagePreviewPresenter @Inject constructor(
     }
 
     private fun loadData(message: Message) {
-        flowWithResourceIn {
-            val student = studentRepository.getStudentById(message.studentId)
-            messageRepository.getMessage(student, message, true)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading message ${message.messageId} preview started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading message ${it.data!!.message.messageId} preview result: Success ")
-                    this@MessagePreviewPresenter.message = it.data.message
-                    this@MessagePreviewPresenter.attachments = it.data.attachments
+        Timber.i("Loading message ${message.messageId} preview started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getStudentById(message.studentId)
+                .flatMap { messageRepository.getMessage(it, message, true) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally { view?.showProgress(false) }
+                .subscribe({ message ->
+                    Timber.i("Loading message ${message.message.messageId} preview result: Success ")
+                    this@MessagePreviewPresenter.message = message.message
                     view?.apply {
-                        setMessageWithAttachment(it.data)
+                        setMessageWithAttachment(message)
                         initOptions()
                     }
-                    analytics.logEvent(
-                        "load_item",
-                        "type" to "message_preview",
-                        "length" to it.data.message.content.length
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_message_preview", "length" to message.message.content.length)
+                }) {
                     Timber.i("Loading message ${message.messageId} preview result: An exception occurred ")
                     retryCallback = { onMessageLoadRetry(message) }
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     fun onReply(): Boolean {
@@ -102,92 +83,35 @@ class MessagePreviewPresenter @Inject constructor(
         } else false
     }
 
-    fun onShare(): Boolean {
-        message?.let {
-            var text = "Temat: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}\n" + when (it.sender.isNotEmpty()) {
-                true -> "Od: ${it.sender}\n"
-                false -> "Do: ${it.recipient}\n"
-            } + "Data: ${it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${it.content}"
-
-            attachments?.let { attachments ->
-                if (attachments.isNotEmpty()) {
-                    text += "\n\nZałączniki:"
-
-                    attachments.forEach { attachment ->
-                        text += "\n${attachment.filename}: ${attachment.url}"
+    private fun deleteMessage() {
+        message?.let { message ->
+            disposable.add(studentRepository.getCurrentStudent()
+                .flatMap { messageRepository.deleteMessage(it, message) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showContent(false)
+                        showProgress(true)
+                        showOptions(false)
+                        showErrorView(false)
                     }
                 }
-            }
-
-            view?.shareText(text, "FW: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}")
-            return true
-        }
-        return false
-    }
-
-    @SuppressLint("NewApi")
-    fun onPrint(): Boolean {
-        if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP) return false
-        message?.let {
-            val dateString = it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
-            val infoContent = "<div><h4>Data wysłania</h4>$dateString</div>" + when {
-                it.sender.isNotEmpty() -> "<div><h4>Od</h4>${it.sender}</div>"
-                else -> "<div><h4>Do</h4>${it.recipient}</div>"
-            }
-
-            val messageContent = "<p>${it.content}</p>"
-                .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
-                .replace(Regex("[\\n\\r]"), "<br>")
-
-            val jobName = "Wiadomość " + when {
-                it.sender.isNotEmpty() -> "od ${it.sender}"
-                else -> "do ${it.recipient}"
-            } + " $dateString: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }} | Wulkanowy"
-
-            view?.apply {
-                val html = printHTML
-                    .replace("%SUBJECT%", it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() })
-                    .replace("%CONTENT%", messageContent)
-                    .replace("%INFO%", infoContent)
-                printDocument(html, jobName)
-            }
-            return true
-        }
-        return false
-    }
-
-    private fun deleteMessage() {
-        message ?: return
-
-        view?.run {
-            showContent(false)
-            showProgress(true)
-            showOptions(false)
-            showErrorView(false)
-        }
-
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            messageRepository.deleteMessage(student, message!!)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Message ${message?.id} delete started")
-                Status.SUCCESS -> {
-                    Timber.d("Message ${message?.id} delete success")
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
                     view?.run {
+                        notifyParentMessageDeleted(message)
                         showMessage(deleteMessageSuccessString)
                         popView()
                     }
-                }
-                Status.ERROR -> {
-                    Timber.d("Message ${message?.id} delete failed")
+                }, { error ->
                     retryCallback = { onMessageDelete() }
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch("delete")
+                    errorHandler.dispatch(error)
+                })
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -208,7 +132,7 @@ class MessagePreviewPresenter @Inject constructor(
         view?.apply {
             showOptions(message != null)
             message?.let {
-                when (it.folderId == MessageFolder.TRASHED.id) {
+                when (it.removed) {
                     true -> setDeletedOptionsLabels()
                     false -> setNotDeletedOptionsLabels()
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index fa6d735ed..3d620459c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -1,7 +1,5 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.ui.base.BaseView
@@ -10,10 +8,6 @@ interface MessagePreviewView : BaseView {
 
     val deleteMessageSuccessString: String
 
-    val messageNoSubjectString: String
-
-    val printHTML: String
-
     fun initView()
 
     fun setMessageWithAttachment(item: MessageWithAttachment)
@@ -22,6 +16,8 @@ interface MessagePreviewView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun notifyParentMessageDeleted(message: Message)
+
     fun showErrorView(show: Boolean)
 
     fun setErrorDetails(message: String)
@@ -38,10 +34,5 @@ interface MessagePreviewView : BaseView {
 
     fun openMessageForward(message: Message?)
 
-    fun shareText(text: String, subject: String)
-
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    fun printDocument(html: String, jobName: String)
-
     fun popView()
 }
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 2267279c2..232b05d79 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
@@ -11,19 +11,17 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.activity_send_message.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
+class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageView {
 
     @Inject
     override lateinit var presenter: SendMessagePresenter
@@ -43,17 +41,17 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override val isDropdownListVisible: Boolean
-        get() = binding.sendMessageTo.isDropdownListVisible
+        get() = sendMessageTo.isDropdownListVisible
 
     @Suppress("UNCHECKED_CAST")
     override val formRecipientsData: List<RecipientChipItem>
-        get() = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
+        get() = sendMessageTo.addedChipItems as List<RecipientChipItem>
 
     override val formSubjectValue: String
-        get() = binding.sendMessageSubject.text.toString()
+        get() = sendMessageSubject.text.toString()
 
     override val formContentValue: String
-        get() = binding.sendMessageMessageContent.text.toString()
+        get() = sendMessageMessageContent.text.toString()
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -64,22 +62,20 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     override val messageSuccess: String
         get() = getString(R.string.message_send_successful)
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
-        setSupportActionBar(binding.sendMessageToolbar)
+        setContentView(R.layout.activity_send_message)
+        setSupportActionBar(sendMessageToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        messageContainer = binding.sendMessageContainer
+        messageContainer = sendMessageContainer
 
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
     override fun initView() {
         setUpExtendedHitArea()
-        with(binding) {
-            sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
-            sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
-        }
+        sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+        sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -97,27 +93,27 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun setReportingUnit(unit: ReportingUnit) {
-        binding.sendMessageFrom.text = unit.senderName
+        sendMessageFrom.text = unit.senderName
     }
 
     override fun setRecipients(recipients: List<RecipientChipItem>) {
-        binding.sendMessageTo.filterableChipItems = recipients
+        sendMessageTo.filterableChipItems = recipients
     }
 
     override fun setSelectedRecipients(recipients: List<RecipientChipItem>) {
-        binding.sendMessageTo.addChips(recipients)
+        sendMessageTo.addChips(recipients)
     }
 
     override fun showProgress(show: Boolean) {
-        binding.sendMessageProgress.visibility = if (show) VISIBLE else GONE
+        sendMessageProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        binding.sendMessageContent.visibility = if (show) VISIBLE else GONE
+        sendMessageContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.sendMessageEmpty.visibility = if (show) VISIBLE else GONE
+        sendMessageEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showActionBar(show: Boolean) {
@@ -125,11 +121,11 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun setSubject(subject: String) {
-        binding.sendMessageSubject.setText(subject)
+        sendMessageSubject.setText(subject)
     }
 
     override fun setContent(content: String) {
-        binding.sendMessageMessageContent.setText(content)
+        sendMessageMessageContent.setText(content)
     }
 
     override fun showMessage(text: String) {
@@ -141,14 +137,12 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun hideDropdownList() {
-        binding.sendMessageTo.hideDropdownList()
+        sendMessageTo.hideDropdownList()
     }
 
     override fun scrollToRecipients() {
-        with(binding.sendMessageScroll) {
-            post {
-                scrollTo(0, binding.sendMessageTo.bottom - dpToPx(53f).toInt())
-            }
+        sendMessageScroll.post {
+            sendMessageScroll.scrollTo(0, sendMessageTo.bottom - dpToPx(53f).toInt())
         }
     }
 
@@ -159,24 +153,24 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     private fun setUpExtendedHitArea() {
         fun extendHitArea() {
             val containerHitRect = Rect().apply {
-                binding.sendMessageContent.getHitRect(this)
+                sendMessageContent.getHitRect(this)
             }
 
             val contentHitRect = Rect().apply {
-                binding.sendMessageMessageContent.getHitRect(this)
+                sendMessageMessageContent.getHitRect(this)
             }
 
             contentHitRect.top = contentHitRect.bottom
             contentHitRect.bottom = containerHitRect.bottom
 
-            binding.sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, binding.sendMessageMessageContent)
+            sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, sendMessageMessageContent)
         }
 
-        with(binding.sendMessageMessageContent) {
-            post {
-                addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> extendHitArea() }
+        sendMessageMessageContent.post {
+            sendMessageMessageContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
                 extendHitArea()
             }
+            extendHitArea()
         }
     }
 }
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 f877c8096..aec79f9db 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -1,8 +1,8 @@
 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.db.entities.ReportingUnit
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
@@ -12,14 +12,14 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Completable
 import timber.log.Timber
 import javax.inject.Inject
 
 class SendMessagePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
@@ -28,14 +28,14 @@ class SendMessagePresenter @Inject constructor(
     private val recipientRepository: RecipientRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SendMessageView>(errorHandler, studentRepository) {
+) : BasePresenter<SendMessageView>(errorHandler, studentRepository, schedulers) {
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
-        with(view) {
+        view.apply {
             message?.let {
                 setSubject(when (reply) {
                     true -> "RE: "
@@ -93,89 +93,90 @@ class SendMessagePresenter @Inject constructor(
     }
 
     private fun loadData(message: Message?, reply: Boolean?) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            val unit = reportingUnitRepository.getReportingUnit(student, semester.unitId)
+        var reportingUnit: ReportingUnit? = null
+        var recipientChips: List<RecipientChipItem> = emptyList()
+        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
 
-            Timber.i("Loading recipients started")
-            val recipients = when {
-                unit != null -> recipientRepository.getRecipients(student, 2, unit)
-                else -> listOf()
-            }.let { createChips(it) }
-            Timber.i("Loading recipients result: Success, fetched %d recipients", recipients.size)
-
-            Timber.i("Loading message recipients started")
-            val messageRecipients = when {
-                message != null && reply == true -> recipientRepository.getMessageRecipients(student, message)
-                else -> emptyList()
-            }.let { createChips(it) }
-            Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", messageRecipients.size)
-
-            Triple(unit, recipients, messageRecipients)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Loading recipients started")
+        Timber.i("Loading recipients started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> it to semester } }
+            .flatMapCompletable { (student, semester) ->
+                reportingUnitRepository.getReportingUnit(student, semester.unitId)
+                    .doOnSuccess { reportingUnit = it }
+                    .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
+                    .doOnSuccess {
+                        Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
+                        recipientChips = createChips(it)
+                    }
+                    .flatMapCompletable {
+                        if (message == null || reply != true) Completable.complete()
+                        else recipientRepository.getMessageRecipients(student, message)
+                            .doOnSuccess {
+                                Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
+                                selectedRecipientChips = createChips(it)
+                            }
+                            .ignoreElement()
+                    }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     showProgress(true)
                     showContent(false)
                 }
-                Status.SUCCESS -> it.data!!.let { (reportingUnit, recipientChips, selectedRecipientChips) ->
-                    view?.run {
-                        if (reportingUnit != null) {
-                            setReportingUnit(reportingUnit)
-                            setRecipients(recipientChips)
-                            if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
-                            showContent(true)
-                        } else {
-                            Timber.i("Loading recipients result: Can't find the reporting unit")
-                            view?.showEmpty(true)
-                        }
+            }
+            .doFinally { view?.run { showProgress(false) } }
+            .subscribe({
+                view?.run {
+                    if (reportingUnit !== null) {
+                        reportingUnit?.let { setReportingUnit(it) }
+                        setRecipients(recipientChips)
+                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
+                        showContent(true)
+                    } else {
+                        Timber.i("Loading recipients result: Can't find the reporting unit")
+                        view?.showEmpty(true)
                     }
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading recipients result: An exception occurred")
-                    view?.showContent(true)
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run { showProgress(false) }
-        }.launch()
+            }, {
+                Timber.i("Loading recipients result: An exception occurred")
+                view?.showContent(true)
+                errorHandler.dispatch(it)
+            }))
     }
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            messageRepository.sendMessage(student, subject, content, recipients)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Sending message started")
+        Timber.i("Sending message started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { messageRepository.sendMessage(it, subject, content, recipients) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     showSoftInput(false)
                     showContent(false)
                     showProgress(true)
                     showActionBar(false)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Sending message result: Success")
-                    view?.run {
-                        showMessage(messageSuccess)
-                        popView()
-                    }
-                    analytics.logEvent("send_message", "recipients" to recipients.size)
-                }
-                Status.ERROR -> {
-                    Timber.i("Sending message result: An exception occurred")
-                    view?.run {
-                        showContent(true)
-                        showProgress(false)
-                        showActionBar(true)
-                    }
-                    errorHandler.dispatch(it.error!!)
-                }
             }
-        }.launch("send")
+            .subscribe({
+                Timber.i("Sending message result: Success")
+                analytics.logEvent("send_message", "recipients" to recipients.size)
+                view?.run {
+                    showMessage(messageSuccess)
+                    popView()
+                }
+            }, {
+                Timber.i("Sending message result: An exception occurred")
+                view?.run {
+                    showContent(true)
+                    showProgress(false)
+                    showActionBar(true)
+                }
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
deleted file mode 100644
index e9b34da33..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.github.wulkanowy.ui.modules.message.tab
-
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.message.MessageFolder
-import io.github.wulkanowy.databinding.ItemMessageBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class MessageTabAdapter @Inject constructor() :
-    RecyclerView.Adapter<MessageTabAdapter.ItemViewHolder>() {
-
-    var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
-
-    var onChangesDetectedListener = {}
-
-    private var items = mutableListOf<Message>()
-
-    fun setDataItems(data: List<Message>) {
-        if (items.size != data.size) onChangesDetectedListener()
-        val diffResult = DiffUtil.calculateDiff(MessageTabDiffUtil(items, data))
-        items = data.toMutableList()
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        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)
-            }
-            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) }
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
-
-    private class MessageTabDiffUtil(private val old: List<Message>, private val new: List<Message>) :
-        DiffUtil.Callback() {
-        override fun getOldListSize(): Int = old.size
-
-        override fun getNewListSize(): Int = new.size
-
-        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition].id == new[newItemPosition].id
-        }
-
-        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return old[oldItemPosition] == new[newItemPosition]
-        }
-    }
-}
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 44ad4bf18..ce0fc7805 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
@@ -1,36 +1,35 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.appcompat.widget.SearchView
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
-import io.github.wulkanowy.databinding.FragmentMessageTabBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import kotlinx.coroutines.FlowPreview
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_message_tab.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.fragment_message_tab),
-    MessageTabView {
+class MessageTabFragment : BaseFragment(), MessageTabView {
 
     @Inject
     lateinit var presenter: MessageTabPresenter
 
     @Inject
-    lateinit var tabAdapter: MessageTabAdapter
+    lateinit var tabAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
@@ -44,92 +43,78 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         }
     }
 
-    override val isViewEmpty
-        get() = tabAdapter.itemCount == 0
+    override val noSubjectString: String
+        get() = getString(R.string.message_no_subject)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
+    override val isViewEmpty
+        get() = tabAdapter.isEmpty
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_message_tab, container, false)
     }
 
-    @FlowPreview
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMessageTabBinding.bind(view)
-        messageContainer = binding.messageTabRecycler
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = messageTabRecycler
         presenter.onAttachView(this, MessageFolder.valueOf(
             (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
         ))
     }
 
     override fun initView() {
-        with(tabAdapter) {
-            onClickListener = presenter::onMessageItemSelected
-            onChangesDetectedListener = ::resetListPosition
-        }
+        tabAdapter.setOnItemClickListener { presenter.onMessageItemSelected(it) }
 
-        with(binding.messageTabRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        messageTabRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = tabAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        with(binding) {
-            messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
-            messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
+        messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
+        messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.action_menu_message_tab, menu)
-
-        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
-        searchView.queryHint = getString(R.string.all_search_hint)
-        searchView.maxWidth = Int.MAX_VALUE
-        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String) = false
-            override fun onQueryTextChange(query: String): Boolean {
-                presenter.onSearchQueryTextChange(query)
-                return true
-            }
-        })
+    override fun updateData(data: List<MessageItem>) {
+        tabAdapter.updateDataSet(data)
     }
 
-    override fun updateData(data: List<Message>) {
-        tabAdapter.setDataItems(data)
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        tabAdapter.updateItem(item)
+    }
+
+    override fun clearView() {
+        tabAdapter.clear()
     }
 
     override fun showProgress(show: Boolean) {
-        binding.messageTabProgress.visibility = if (show) VISIBLE else GONE
+        messageTabProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.messageTabSwipe.isEnabled = enable
-    }
-
-    override fun resetListPosition() {
-        binding.messageTabRecycler.scrollToPosition(0)
+        messageTabSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.messageTabError.visibility = if (show) VISIBLE else GONE
+        messageTabError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.messageTabErrorMessage.text = message
+        messageTabErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        binding.messageTabSwipe.isRefreshing = show
+        messageTabSwipe.isRefreshing = show
     }
 
     override fun openMessage(message: Message) {
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 79062dcfc..cbdb89b2e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -1,55 +1,34 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.Message
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-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.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import me.xdrop.fuzzywuzzy.FuzzySearch
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
-import java.util.Locale
 import javax.inject.Inject
-import kotlin.math.pow
 
 class MessageTabPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
+) : BasePresenter<MessageTabView>(errorHandler, studentRepository, schedulers) {
 
     lateinit var folder: MessageFolder
 
     private lateinit var lastError: Throwable
 
-    private var lastSearchQuery = ""
-
-    private var messages = emptyList<Message>()
-
-    private val searchChannel = Channel<String>()
-
-    @FlowPreview
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
-        initializeSearchStream()
         errorHandler.showErrorMessage = ::showErrorViewOnError
         this.folder = folder
     }
@@ -72,50 +51,60 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onDeleteMessage() {
-        loadData(true)
+        loadData(false)
     }
 
     fun onParentViewLoadData(forceRefresh: Boolean) {
         loadData(forceRefresh)
     }
 
-    fun onMessageItemSelected(message: Message, position: Int) {
-        Timber.i("Select message ${message.id} item (position: $position)")
-        view?.openMessage(message)
+    fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item is MessageItem) {
+            Timber.i("Select message ${item.message.id} item")
+            view?.run {
+                openMessage(item.message)
+                if (item.message.unread) {
+                    item.message.unread = false
+                    updateItem(item)
+                }
+            }
+        }
     }
 
     private fun loadData(forceRefresh: Boolean) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            messageRepository.getMessages(student, semester, folder, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading $folder message data started")
-                Status.SUCCESS -> {
+        Timber.i("Loading $folder message data started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student)
+                        .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+                        .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
+                }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        showRefresh(false)
+                        showProgress(false)
+                        enableSwipe(true)
+                        notifyParentDataLoaded()
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading $folder message result: Success")
-                    messages = it.data!!
-                    updateData(getFilteredData(lastSearchQuery))
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "messages",
-                        "items" to it.data.size,
-                        "folder" to folder.name
-                    )
-                }
-                Status.ERROR -> {
+                    view?.run {
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                        showErrorView(false)
+                        updateData(it)
+                    }
+                    analytics.logEvent("load_messages", "items" to it.size, "folder" to folder.name)
+                }) {
                     Timber.i("Loading $folder message result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -128,87 +117,4 @@ class MessageTabPresenter @Inject constructor(
             } else showError(message, error)
         }
     }
-
-    fun onSearchQueryTextChange(query: String) {
-        launch {
-            searchChannel.send(query)
-        }
-    }
-
-    @FlowPreview
-    private fun initializeSearchStream() {
-        launch {
-            searchChannel.consumeAsFlow()
-                .debounce(250)
-                .map { query ->
-                    lastSearchQuery = query
-                    getFilteredData(query)
-                }
-                .catch { Timber.e(it) }
-                .collect {
-                    Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${it.size}")
-                    updateData(it)
-                    view?.resetListPosition()
-                }
-        }
-    }
-
-    private fun getFilteredData(query: String): List<Message> {
-        return if (query.trim().isEmpty()) {
-            messages.sortedByDescending { it.date }
-        } else {
-            messages
-                .map { it to calculateMatchRatio(it, query) }
-                .sortedByDescending { it.second }
-                .filter { it.second > 5000 }
-                .map { it.first }
-        }
-    }
-
-    private fun updateData(data: List<Message>) {
-        view?.run {
-            showEmpty(data.isEmpty())
-            showContent(data.isNotEmpty())
-            showErrorView(false)
-            updateData(data)
-        }
-    }
-
-    private fun calculateMatchRatio(message: Message, query: String): Int {
-        val subjectRatio = FuzzySearch.tokenSortPartialRatio(
-            query.toLowerCase(Locale.getDefault()),
-            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())
-        )
-
-        val dateRatio = listOf(
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("dd.MM").toLowerCase(Locale.getDefault())
-            ),
-            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())
-            )
-        ).maxOrNull() ?: 0
-
-
-        return (subjectRatio.toDouble().pow(2)
-            + senderOrRecipientRatio.toDouble().pow(2)
-            + dateRatio.toDouble().pow(2) * 2
-            ).toInt()
-    }
 }
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..92115ed33 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -1,17 +1,23 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.message.MessageItem
 
 interface MessageTabView : BaseView {
 
+    val noSubjectString: String
+
     val isViewEmpty: Boolean
 
     fun initView()
 
-    fun resetListPosition()
+    fun updateData(data: List<MessageItem>)
 
-    fun updateData(data: List<Message>)
+    fun updateItem(item: AbstractFlexibleItem<*>)
+
+    fun clearView()
 
     fun showProgress(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
index 4bc3097d6..27c72ce69 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
@@ -1,38 +1,10 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.databinding.ItemMobileDeviceBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
 
-class MobileDeviceAdapter @Inject constructor() :
-    RecyclerView.Adapter<MobileDeviceAdapter.ItemViewHolder>() {
-
-    var items = mutableListOf<MobileDevice>()
+class MobileDeviceAdapter<T : IFlexible<*>> : FlexibleAdapter<T>(null, null, true) {
 
     var onDeviceUnregisterListener: (device: MobileDevice, position: Int) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMobileDeviceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val device = items[position]
-
-        with(holder.binding) {
-            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
-            mobileDeviceItemName.text = device.name
-            mobileDeviceItemUnregister.setOnClickListener {
-                onDeviceUnregisterListener(device, position)
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemMobileDeviceBinding) :
-        RecyclerView.ViewHolder(binding.root)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
index 8065e9b60..d47574f60 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
@@ -1,33 +1,31 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.core.view.postDelayed
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.helpers.UndoHelper
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.databinding.FragmentMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import kotlinx.android.synthetic.main.fragment_mobile_device.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MobileDeviceFragment :
-    BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
-    MainView.TitledView {
+class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MobileDevicePresenter
 
     @Inject
-    lateinit var devicesAdapter: MobileDeviceAdapter
+    lateinit var devicesAdapter: MobileDeviceAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = MobileDeviceFragment()
@@ -37,95 +35,92 @@ class MobileDeviceFragment :
         get() = R.string.mobile_devices_title
 
     override val isViewEmpty: Boolean
-        get() = devicesAdapter.items.isEmpty()
+        get() = devicesAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMobileDeviceBinding.bind(view)
-        messageContainer = binding.mobileDevicesRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_mobile_device, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = mobileDevicesRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        devicesAdapter.onDeviceUnregisterListener = presenter::onUnregisterDevice
-
-        with(binding.mobileDevicesRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(mobileDevicesRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = devicesAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
-
-        with(binding) {
-            mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
-            mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-            mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
-        }
-    }
-
-    override fun updateData(data: List<MobileDevice>) {
         with(devicesAdapter) {
-            items = data.toMutableList()
-            notifyDataSetChanged()
+            isPermanentDelete = false
+            onDeviceUnregisterListener = presenter::onUnregisterDevice
         }
+        mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
+        mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
     }
 
-    override fun deleteItem(device: MobileDevice, position: Int) {
-        with(devicesAdapter) {
-            items.removeAt(position)
-            notifyItemRemoved(position)
-            notifyItemRangeChanged(position, itemCount)
-        }
+    override fun updateData(data: List<MobileDeviceItem>) {
+        devicesAdapter.updateDataSet(data)
     }
 
-    override fun restoreDeleteItem(device: MobileDevice, position: Int) {
-        with(devicesAdapter) {
-            items.add(position, device)
-            notifyItemInserted(position)
-            notifyItemRangeChanged(position, itemCount)
-        }
+    override fun restoreDeleteItem() {
+        devicesAdapter.restoreDeletedItems()
     }
 
-    override fun showUndo(device: MobileDevice, position: Int) {
-        var confirmed = true
+    override fun clearData() {
+        devicesAdapter.clear()
+    }
 
-        Snackbar.make(binding.mobileDevicesRecycler, getString(R.string.mobile_device_removed), 3000)
-            .setAction(R.string.all_undo) {
-                confirmed = false
-                presenter.onUnregisterCancelled(device, position)
-            }.show()
+    override fun showUndo(position: Int, device: MobileDevice) {
+        val onActionListener = object : UndoHelper.OnActionListener {
+            override fun onActionConfirmed(action: Int, event: Int) {
+                presenter.onUnregisterConfirmed(device)
+            }
 
-        view?.postDelayed(3000) {
-            if (confirmed) presenter.onUnregisterConfirmed(device)
+            override fun onActionCanceled(action: Int, positions: MutableList<Int>?) {
+                presenter.onUnregisterCancelled()
+            }
         }
+
+        UndoHelper(devicesAdapter, onActionListener)
+            .withConsecutive(false)
+            .withAction(UndoHelper.Action.REMOVE)
+            .start(listOf(position), mobileDevicesRecycler, R.string.mobile_device_removed, R.string.all_undo, 3000)
     }
 
     override fun hideRefresh() {
-        binding.mobileDevicesSwipe.isRefreshing = false
+        mobileDevicesSwipe.isRefreshing = false
     }
 
     override fun showProgress(show: Boolean) {
-        binding.mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
+        mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
+        mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.mobileDevicesError.visibility = if (show) VISIBLE else GONE
+        mobileDevicesError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.mobileDevicesErrorMessage.text = message
+        mobileDevicesErrorMessage.text = message
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.mobileDevicesSwipe.isEnabled = enable
+        mobileDevicesSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
+        mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showTokenDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
new file mode 100644
index 000000000..436c2d0e2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.mobiledevice
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_mobile_device.*
+
+class MobileDeviceItem(val device: MobileDevice) : AbstractFlexibleItem<MobileDeviceItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_mobile_device
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
+            mobileDeviceItemName.text = device.name
+            mobileDeviceItemUnregister.setOnClickListener {
+                (adapter as MobileDeviceAdapter).onDeviceUnregisterListener(device, holder.flexibleAdapterPosition)
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MobileDeviceItem
+
+        if (device.id != other.device.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = device.hashCode()
+        result = 31 * result + device.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
new file mode 100644
index 000000000..59bbaa9f8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.mobiledevice
+
+import dagger.Module
+import dagger.Provides
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+
+@Module
+class MobileDeviceModule {
+
+    @Provides
+    fun provideMobileDeviceFlexibleAdapter() = MobileDeviceAdapter<AbstractFlexibleItem<*>>()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
index 6314c2c31..a6a83f8a9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,21 +7,18 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDevicePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val mobileDeviceRepository: MobileDeviceRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository) {
+) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -51,39 +47,35 @@ class MobileDevicePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.getDevices(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading mobile devices data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading mobile devices result: Success")
-                    view?.run {
-                        updateData(it.data!!)
-                        showContent(it.data.isNotEmpty())
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "devices",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading mobile devices result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading mobile devices data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getDevices(student, semester, forceRefresh)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            .map { items -> items.map { MobileDeviceItem(it) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                }
+            }.subscribe({
+                Timber.i("Loading mobile devices result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                }
+                analytics.logEvent("load_devices", "items" to it.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.i("Loading mobile devices result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -103,39 +95,47 @@ class MobileDevicePresenter @Inject constructor(
 
     fun onUnregisterDevice(device: MobileDevice, position: Int) {
         view?.run {
-            deleteItem(device, position)
-            showUndo(device, position)
+            showUndo(position, device)
             showEmpty(isViewEmpty)
         }
     }
 
-    fun onUnregisterCancelled(device: MobileDevice, position: Int) {
+    fun onUnregisterCancelled() {
         view?.run {
-            restoreDeleteItem(device, position)
+            restoreDeleteItem()
             showEmpty(isViewEmpty)
         }
     }
 
     fun onUnregisterConfirmed(device: MobileDevice) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.unregisterDevice(student, semester, device)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Unregister device started")
-                Status.SUCCESS -> {
-                    Timber.i("Unregister device result: Success")
-                    view?.run {
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Unregister device result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Unregister device started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.unregisterDevice(student, semester, device)
+                        .flatMap { mobileDeviceRepository.getDevices(student, semester, it) }
                 }
             }
-        }.launchIn(this)
+            .map { items -> items.map { MobileDeviceItem(it) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showProgress(false)
+                    enableSwipe(true)
+                }
+            }
+            .subscribe({
+                Timber.i("Unregister device result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                }
+            }) {
+                Timber.i("Unregister device result: An exception occurred")
+                errorHandler.dispatch(it)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
index ec2d3f87f..869b59bb1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
@@ -9,16 +9,14 @@ interface MobileDeviceView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<MobileDevice>)
+    fun updateData(data: List<MobileDeviceItem>)
 
-    fun deleteItem(device: MobileDevice, position: Int)
-
-    fun restoreDeleteItem(device: MobileDevice, position: Int)
-
-    fun showUndo(device: MobileDevice, position: Int)
+    fun restoreDeleteItem()
 
     fun hideRefresh()
 
+    fun clearData()
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -31,5 +29,7 @@ interface MobileDeviceView : BaseView {
 
     fun setErrorDetails(message: String)
 
+    fun showUndo(position: Int, device: MobileDevice)
+
     fun showTokenDialog()
 }
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 48150d8de..8b81156b1 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
@@ -12,15 +12,13 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.getSystemService
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.databinding.DialogMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import kotlinx.android.synthetic.main.dialog_mobile_device.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(), MobileDeviceTokenVIew {
+class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
 
     @Inject
     lateinit var presenter: MobileDeviceTokenPresenter
@@ -35,7 +33,7 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_mobile_device, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -44,24 +42,24 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun initView() {
-        binding.mobileDeviceDialogClose.setOnClickListener { dismiss() }
+        mobileDeviceDialogClose.setOnClickListener { dismiss() }
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        with(binding.mobileDeviceDialogToken) {
+        with(mobileDeviceDialogToken) {
             text = token.token
             setOnClickListener { clickCopy(token.token) }
         }
-        with(binding.mobileDeviceDialogSymbol) {
+        with(mobileDeviceDialogSymbol) {
             text = token.symbol
             setOnClickListener { clickCopy(token.symbol) }
         }
-        with(binding.mobileDeviceDialogPin) {
+        with(mobileDeviceDialogPin) {
             text = token.pin
             setOnClickListener { clickCopy(token.pin) }
         }
 
-        binding.mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
+        mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
             BitmapFactory.decodeByteArray(it, 0, it.size)
         })
     }
@@ -73,11 +71,11 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun hideLoading() {
-        binding.mobileDeviceDialogProgress.visibility = GONE
+        mobileDeviceDialogProgress.visibility = GONE
     }
 
     override fun showContent() {
-        binding.mobileDeviceDialogContent.visibility = VISIBLE
+        mobileDeviceDialogContent.visibility = VISIBLE
     }
 
     override fun closeDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
index f6d0de992..6a2a6b98b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.mobiledevice.token
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDeviceTokenPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val mobileDeviceRepository: MobileDeviceRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository) {
+) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MobileDeviceTokenVIew) {
         super.onAttachView(view)
@@ -29,29 +27,28 @@ class MobileDeviceTokenPresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.getToken(student, semester)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Mobile device registration data started")
-                Status.SUCCESS -> {
-                    Timber.i("Mobile device registration result: Success")
-                    view?.run {
-                        updateData(it.data!!)
-                        showContent()
-                    }
-                    analytics.logEvent("device_register", "symbol" to it.data!!.token.substring(0, 3))
-                }
-                Status.ERROR -> {
-                    Timber.i("Mobile device registration result: An exception occurred")
-                    view?.closeDialog()
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Mobile device registration data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getToken(student, semester)
                 }
             }
-        }.afterLoading {
-            view?.hideLoading()
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.hideLoading() }
+            .subscribe({
+                Timber.i("Mobile device registration result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent()
+                }
+                analytics.logEvent("device_register", "symbol" to it.token.substring(0, 3))
+            }) {
+                Timber.i("Mobile device registration result: An exception occurred")
+                view?.closeDialog()
+                errorHandler.dispatch(it)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
deleted file mode 100644
index 70587b0cf..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.ui.modules.more
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemMoreBinding
-import javax.inject.Inject
-
-class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Pair<String, Drawable?>>()
-
-    var onClickListener: (name: String) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMoreBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (title, drawable) = items[position]
-
-        with(holder.binding) {
-            moreItemTitle.text = title
-            moreItemImage.setImageDrawable(drawable)
-
-            root.setOnClickListener { onClickListener(title) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemMoreBinding) : RecyclerView.ViewHolder(binding.root)
-}
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 1bdcc26fa..ef9c36fab 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
@@ -2,11 +2,13 @@ package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 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.homework.HomeworkFragment
@@ -19,17 +21,17 @@ import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.utils.getCompatDrawable
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_more.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more), MoreView,
-    MainView.TitledView, MainView.MainChildView {
+class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: MorePresenter
 
     @Inject
-    lateinit var moreAdapter: MoreAdapter
+    lateinit var moreAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = MoreFragment()
@@ -62,17 +64,20 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val aboutRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentMoreBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_more, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        moreAdapter.onClickListener = presenter::onItemSelected
+        moreAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
 
-        with(binding.moreRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        moreRecycler.apply {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = moreAdapter
         }
     }
@@ -81,11 +86,8 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
-    override fun updateData(data: List<Pair<String, Drawable?>>) {
-        with(moreAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<MoreItem>) {
+        moreAdapter.updateDataSet(data)
     }
 
     override fun openMessagesView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
new file mode 100644
index 000000000..85b604e77
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
@@ -0,0 +1,47 @@
+package io.github.wulkanowy.ui.modules.more
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_more.*
+
+class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFlexibleItem<MoreItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_more
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            moreItemTitle.text = title
+            moreItemImage.setImageDrawable(drawable)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as MoreItem
+
+        if (title != other.title) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return title.hashCode()
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
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 6d80f4181..096f89e9b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -1,15 +1,18 @@
 package io.github.wulkanowy.ui.modules.more
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MorePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<MoreView>(errorHandler, studentRepository) {
+) : BasePresenter<MoreView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
@@ -18,10 +21,11 @@ class MorePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(title: String) {
-        Timber.i("Select more item \"${title}\"")
+    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item !is MoreItem) return
+        Timber.i("Select more item \"${item.title}\"")
         view?.run {
-            when (title) {
+            when (item.title) {
                 messagesRes?.first -> openMessagesView()
                 homeworkRes?.first -> openHomeworkView()
                 noteRes?.first -> openNoteView()
@@ -43,15 +47,15 @@ class MorePresenter @Inject constructor(
         Timber.i("Load items for more view")
         view?.run {
             updateData(listOfNotNull(
-                messagesRes,
-                homeworkRes,
-                noteRes,
-                luckyNumberRes,
-                mobileDevicesRes,
-                schoolAndTeachersRes,
-                settingsRes,
-                aboutRes
-            ))
+                messagesRes?.let { MoreItem(it.first, it.second) },
+                homeworkRes?.let { MoreItem(it.first, it.second) },
+                noteRes?.let { MoreItem(it.first, it.second) },
+                luckyNumberRes?.let { MoreItem(it.first, it.second) },
+                mobileDevicesRes?.let { MoreItem(it.first, it.second) },
+                schoolAndTeachersRes?.let { MoreItem(it.first, it.second) },
+                settingsRes?.let { MoreItem(it.first, it.second) },
+                aboutRes?.let { MoreItem(it.first, it.second) })
+            )
         }
     }
 }
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 922afdfd5..41008176d 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
@@ -23,7 +23,7 @@ interface MoreView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<String, Drawable?>>)
+    fun updateData(data: List<MoreItem>)
 
     fun openSettingsView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
deleted file mode 100644
index 48482cb75..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.ui.modules.note
-
-import android.annotation.SuppressLint
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.databinding.ItemNoteBinding
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class NoteAdapter @Inject constructor() : RecyclerView.Adapter<NoteAdapter.ItemViewHolder>() {
-
-    var items = mutableListOf<Note>()
-
-    var onClickListener: (Note, position: Int) -> Unit = { _, _ -> }
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemNoteBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            with(noteItemDate) {
-                text = item.date.toFormattedString()
-                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
-            }
-            with(noteItemType) {
-                text = item.category
-                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
-            }
-            with(noteItemPoints) {
-                text = "${if (item.points > 0) "+" else ""}${item.points}"
-                visibility = if (item.isPointsShow) View.VISIBLE else View.GONE
-                setTextColor(when (NoteCategory.getByValue(item.categoryType)) {
-                    NoteCategory.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
-                    NoteCategory.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
-                    else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
-                })
-            }
-            noteItemTeacher.text = item.teacher
-            noteItemContent.text = item.content
-
-            root.setOnClickListener { onClickListener(item, position) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemNoteBinding) : RecyclerView.ViewHolder(binding.root)
-}
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 e016fe0b9..20ffea4eb 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
@@ -9,16 +9,13 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.databinding.DialogNoteBinding
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.synthetic.main.dialog_note.*
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
 
 class NoteDialog : DialogFragment() {
 
-    private var binding: DialogNoteBinding by lifecycleAwareVariable()
-
     private lateinit var note: Note
 
     companion object {
@@ -40,31 +37,27 @@ class NoteDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogNoteBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_note, container, false)
     }
 
     @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(binding) {
-            noteDialogDate.text = note.date.toFormattedString()
-            noteDialogCategory.text = note.category
-            noteDialogTeacher.text = note.teacher
-            noteDialogContent.text = note.content
-        }
-
+        noteDialogDate.text = note.date.toFormattedString()
+        noteDialogCategory.text = note.category
+        noteDialogTeacher.text = note.teacher
+        noteDialogContent.text = note.content
         if (note.isPointsShow) {
-            with(binding.noteDialogPoints) {
+            with(noteDialogPoints) {
                 text = "${if (note.points > 0) "+" else ""}${note.points}"
-                setTextColor(when (NoteCategory.getByValue(note.categoryType)) {
-                    NoteCategory.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
-                    NoteCategory.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
+                setTextColor(when (CategoryType.getByValue(note.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
                     else -> requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
                 })
             }
         }
-
-        binding.noteDialogClose.setOnClickListener { dismiss() }
+        noteDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index 079285a80..e5335e459 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -1,29 +1,31 @@
 package io.github.wulkanowy.ui.modules.note
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.databinding.FragmentNoteBinding
 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.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_note.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
-    MainView.TitledView {
+class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: NotePresenter
 
     @Inject
-    lateinit var noteAdapter: NoteAdapter
+    lateinit var noteAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = NoteFragment()
@@ -33,80 +35,77 @@ class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note),
         get() = R.string.note_title
 
     override val isViewEmpty: Boolean
-        get() = noteAdapter.items.isEmpty()
+        get() = noteAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentNoteBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_note, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        noteAdapter.onClickListener = presenter::onNoteItemSelected
+        noteAdapter.run {
+            setOnItemClickListener { presenter.onNoteItemSelected(it) }
+        }
 
-        with(binding.noteRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        noteRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = noteAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        with(binding) {
-            noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            noteErrorRetry.setOnClickListener { presenter.onRetry() }
-            noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
+        noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        noteErrorRetry.setOnClickListener { presenter.onRetry() }
+        noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun showNoteDialog(note: Note) {
         (activity as? MainActivity)?.showDialogFragment(NoteDialog.newInstance(note))
     }
 
-    override fun updateData(data: List<Note>) {
-        with(noteAdapter) {
-            items = data.toMutableList()
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<NoteItem>) {
+        noteAdapter.updateDataSet(data, true)
     }
 
-    override fun updateItem(item: Note, position: Int) {
-        with(noteAdapter) {
-            items[position] = item
-            notifyItemChanged(position)
-        }
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        noteAdapter.updateItem(item)
     }
 
     override fun clearData() {
-        with(noteAdapter) {
-            items = mutableListOf()
-            notifyDataSetChanged()
-        }
+        noteAdapter.clear()
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.noteEmpty.visibility = if (show) VISIBLE else GONE
+        noteEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.noteError.visibility = if (show) VISIBLE else GONE
+        noteError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.noteErrorMessage.text = message
+        noteErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.noteProgress.visibility = if (show) VISIBLE else GONE
+        noteProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.noteSwipe.isEnabled = enable
+        noteSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.noteRecycler.visibility = if (show) VISIBLE else GONE
+        noteRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.noteSwipe.isRefreshing = false
+        noteSwipe.isRefreshing = false
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
new file mode 100644
index 000000000..53fe6fa91
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
@@ -0,0 +1,77 @@
+package io.github.wulkanowy.ui.modules.note
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface.BOLD
+import android.graphics.Typeface.NORMAL
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.core.content.ContextCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_note.*
+
+class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_note
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            with(noteItemDate) {
+                text = note.date.toFormattedString()
+                setTypeface(null, if (note.isRead) NORMAL else BOLD)
+            }
+            with(noteItemType) {
+                text = note.category
+                setTypeface(null, if (note.isRead) NORMAL else BOLD)
+            }
+            with(noteItemPoints) {
+                text = "${if (note.points > 0) "+" else ""}${note.points}"
+                visibility = if (note.isPointsShow) VISIBLE else GONE
+                setTextColor(when(CategoryType.getByValue(note.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
+                    else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
+                })
+            }
+            noteItemTeacher.text = note.teacher
+            noteItemContent.text = note.content
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as NoteItem
+
+        if (note != other.note) return false
+        if (note.id != other.note.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = note.hashCode()
+        result = 31 * result + note.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
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 db3b495a8..7acf37a4c 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
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.note
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,21 +8,18 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class NotePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val noteRepository: NoteRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<NoteView>(errorHandler, studentRepository) {
+) : BasePresenter<NoteView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -52,39 +49,34 @@ class NotePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            noteRepository.getNotes(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading note data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading note result: Success")
-                    view?.apply {
-                        updateData(it.data!!.sortedByDescending { item -> item.date })
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                        showContent(it.data.isNotEmpty())
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "note",
-                        "items" to it.data!!.size
-                    )
+        Timber.i("Loading note data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
+            .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
+            .map { items -> items.map { NoteItem(it) } }
+            .map { items -> items.sortedByDescending { it.note.date } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading note result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+            }.subscribe({
+                Timber.i("Loading note result: Success")
+                view?.apply {
+                    updateData(it)
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                    showContent(it.isNotEmpty())
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                analytics.logEvent("load_note", "items" to it.size, "force_refresh" to forceRefresh)
+            }, {
+                Timber.i("Loading note result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -98,28 +90,29 @@ class NotePresenter @Inject constructor(
         }
     }
 
-    fun onNoteItemSelected(note: Note, position: Int) {
-        Timber.i("Select note item ${note.id}")
-        view?.run {
-            showNoteDialog(note)
-            if (!note.isRead) {
-                note.isRead = true
-                updateItem(note, position)
-                updateNote(note)
+    fun onNoteItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is NoteItem) {
+            Timber.i("Select note item ${item.note.id}")
+            view?.run {
+                showNoteDialog(item.note)
+                if (!item.note.isRead) {
+                    item.note.isRead = true
+                    updateItem(item)
+                    updateNote(item.note)
+                }
             }
         }
     }
 
     private fun updateNote(note: Note) {
-        flowWithResource { noteRepository.updateNote(note) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to update note ${note.id}")
-                Status.SUCCESS -> Timber.i("Update note result: Success")
-                Status.ERROR -> {
-                    Timber.i("Update note result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.launchIn(this)
+        Timber.i("Attempt to update note ${note.id}")
+        disposable.add(noteRepository.updateNote(note)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({ Timber.i("Update note result: Success") })
+            { error ->
+                Timber.i("Update note result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
index a7cbab8f4..a9c9f4f2f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.note
 
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -9,9 +10,9 @@ interface NoteView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Note>)
+    fun updateData(data: List<NoteItem>)
 
-    fun updateItem(item: Note, position: Int)
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
index c1c569611..5f9c0b9a0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
@@ -1,12 +1,12 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
 import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.FragmentSchoolandteachersBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -14,17 +14,16 @@ import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
+import kotlinx.android.synthetic.main.fragment_schoolandteachers.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class SchoolAndTeachersFragment :
-    BaseFragment<FragmentSchoolandteachersBinding>(R.layout.fragment_schoolandteachers),
-    SchoolAndTeachersView, MainView.TitledView {
+class SchoolAndTeachersFragment : BaseFragment(), SchoolAndTeachersView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: SchoolAndTeachersPresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = SchoolAndTeachersFragment()
@@ -32,44 +31,45 @@ class SchoolAndTeachersFragment :
 
     override val titleStringId: Int get() = R.string.schoolandteachers_title
 
-    override val currentPageIndex get() = binding.schoolandteachersViewPager.currentItem
+    override val currentPageIndex get() = schoolandteachersViewPager.currentItem
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentSchoolandteachersBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_schoolandteachers, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = binding.schoolandteachersViewPager.id
+            containerId = schoolandteachersViewPager.id
             addFragmentsWithTitle(mapOf(
                 SchoolFragment.newInstance() to getString(R.string.school_title),
                 TeacherFragment.newInstance() to getString(R.string.teachers_title)
             ))
         }
 
-        with(binding.schoolandteachersViewPager) {
+        with(schoolandteachersViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(binding.schoolandteachersTabLayout) {
-            setupWithViewPager(binding.schoolandteachersViewPager)
+        with(schoolandteachersTabLayout) {
+            setupWithViewPager(schoolandteachersViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
     }
 
     override fun showContent(show: Boolean) {
-        with(binding) {
-            schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
-            schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
-        }
+        schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
+        schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showProgress(show: Boolean) {
-        binding.schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
+        schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     fun onChildFragmentLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
new file mode 100644
index 000000000..2087b0b42
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers
+
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerChildFragment
+import io.github.wulkanowy.di.scopes.PerFragment
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
+import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
+
+@Suppress("unused")
+@Module
+abstract class SchoolAndTeachersModule {
+
+    companion object {
+
+        @PerFragment
+        @Provides
+        fun provideSchoolAndTeachersAdapter(fragment: SchoolAndTeachersFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
+    }
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun provideSchoolFragment(): SchoolFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun provideTeacherFragment(): TeacherFragment
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
index 305f4e7d5..1856803c6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
@@ -3,24 +3,26 @@ package io.github.wulkanowy.ui.modules.schoolandteachers
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class SchoolAndTeachersPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository) {
+) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SchoolAndTeachersView) {
         super.onAttachView(view)
-        launch {
-            delay(150)
-            view.initView()
-            Timber.i("Message view was initialized")
-            loadData()
-        }
+        disposable.add(Completable.timer(150, TimeUnit.MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                view.initView()
+                Timber.i("Message view was initialized")
+                loadData()
+            })
     }
 
     fun onPageSelected(index: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
index d3f110073..5a7c4cade 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
@@ -1,91 +1,89 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.databinding.FragmentSchoolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.utils.openDialer
 import io.github.wulkanowy.utils.openNavigation
+import kotlinx.android.synthetic.main.fragment_school.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_school), SchoolView,
-    MainView.TitledView, SchoolAndTeachersChildView {
+class SchoolFragment : BaseFragment(), SchoolView, MainView.TitledView, SchoolAndTeachersChildView {
 
     @Inject
     lateinit var presenter: SchoolPresenter
 
     override val titleStringId get() = R.string.school_title
 
-    override val isViewEmpty get() = binding.schoolName.text.isBlank()
+    override val isViewEmpty get() = schoolName.text.isBlank()
 
     companion object {
         fun newInstance() = SchoolFragment()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentSchoolBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_school, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding) {
-            schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            schoolErrorRetry.setOnClickListener { presenter.onRetry() }
-            schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        schoolErrorRetry.setOnClickListener { presenter.onRetry() }
+        schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
-            schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
-        }
+        schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
+        schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
     }
 
     override fun updateData(data: School) {
-        with(binding) {
-            schoolName.text = data.name
-            schoolAddress.text = data.address.ifBlank { "-" }
-            schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
-            schoolTelephone.text = data.contact.ifBlank { "-" }
-            schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
-            schoolHeadmaster.text = data.headmaster
-            schoolPedagogue.text = data.pedagogue
-        }
+        schoolName.text = data.name
+        schoolAddress.text = data.address.ifBlank { "-" }
+        schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
+        schoolTelephone.text = data.contact.ifBlank { "-" }
+        schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
+        schoolHeadmaster.text = data.headmaster
+        schoolPedagogue.text = data.pedagogue
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.schoolEmpty.visibility = if (show) VISIBLE else GONE
+        schoolEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.schoolError.visibility = if (show) VISIBLE else GONE
+        schoolError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.schoolErrorMessage.text = message
+        schoolErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.schoolProgress.visibility = if (show) VISIBLE else GONE
+        schoolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.schoolSwipe.isEnabled = enable
+        schoolSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.schoolContent.visibility = if (show) VISIBLE else GONE
+        schoolContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.schoolSwipe.isRefreshing = false
+        schoolSwipe.isRefreshing = false
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
index 4cda5d33c..e2eb614dc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.school.SchoolRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class SchoolPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val schoolRepository: SchoolRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SchoolView>(errorHandler, studentRepository) {
+) : BasePresenter<SchoolView>(errorHandler, studentRepository, schedulers) {
 
     private var address: String? = null
 
@@ -64,46 +62,44 @@ class SchoolPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            schoolRepository.getSchoolInfo(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading school info started")
-                Status.SUCCESS -> if (it.data != null) {
-                    Timber.i("Loading teachers result: Success")
-                    view?.run {
-                        address = it.data.address.ifBlank { null }
-                        contact = it.data.contact.ifBlank { null }
-                        updateData(it.data)
-                        showContent(true)
-                        showEmpty(false)
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_item",
-                        "type" to "school"
-                    )
-                } else view?.run {
-                    Timber.i("Loading school result: No school info found")
+        Timber.i("Loading school info started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMapMaybe { student ->
+                semesterRepository.getCurrentSemester(student).flatMapMaybe {
+                    schoolRepository.getSchoolInfo(student, it, forceRefresh)
+                }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded()
+                }
+            }.subscribe({
+                Timber.i("Loading teachers result: Success")
+                view?.run {
+                    address = it.address.ifBlank { null }
+                    contact = it.contact.ifBlank { null }
+                    updateData(it)
+                    showContent(true)
+                    showEmpty(false)
+                    showErrorView(false)
+                }
+                analytics.logEvent("load_school", "force_refresh" to forceRefresh)
+            }, {
+                Timber.i("Loading school result: An exception occurred")
+                errorHandler.dispatch(it)
+            }, {
+                Timber.i("Loading school result: No school info found")
+                view?.run {
                     showContent(!isViewEmpty)
                     showEmpty(isViewEmpty)
                     showErrorView(false)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading school result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+            }))
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
deleted file mode 100644
index 8deeae05b..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.databinding.ItemTeacherBinding
-import javax.inject.Inject
-
-class TeacherAdapter @Inject constructor() : RecyclerView.Adapter<TeacherAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Teacher>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemTeacherBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val teacher = items[position]
-
-        with(holder.binding) {
-            teacherItemName.text = teacher.name
-            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else root.context.getString(R.string.teacher_no_subject)
-            if (teacher.shortName.isNotBlank()) {
-                teacherItemShortName.visibility = View.VISIBLE
-                teacherItemShortName.text = "[${teacher.shortName}]"
-            } else {
-                teacherItemShortName.visibility = View.GONE
-            }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemTeacherBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
index 5914945b9..b6bb9c101 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
@@ -1,30 +1,31 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import android.view.ViewGroup
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.databinding.FragmentTeacherBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import kotlinx.android.synthetic.main.fragment_teacher.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_teacher),
-    TeacherView, MainView.TitledView, SchoolAndTeachersChildView {
+class TeacherFragment : BaseFragment(), TeacherView, MainView.TitledView,
+    SchoolAndTeachersChildView {
 
     @Inject
     lateinit var presenter: TeacherPresenter
 
     @Inject
-    lateinit var teacherAdapter: TeacherAdapter
+    lateinit var teacherAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         fun newInstance() = TeacherFragment()
@@ -36,60 +37,69 @@ class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_t
     override val noSubjectString get() = getString(R.string.teacher_no_subject)
 
     override val isViewEmpty: Boolean
-        get() = teacherAdapter.items.isEmpty()
+        get() = teacherAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTeacherBinding.bind(view)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_teacher, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(binding.teacherRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        teacherRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = teacherAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-        with(binding) {
-            teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-            teacherErrorRetry.setOnClickListener { presenter.onRetry() }
-            teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
+        teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        teacherErrorRetry.setOnClickListener { presenter.onRetry() }
+        teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun updateData(data: List<Teacher>) {
-        with(teacherAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<TeacherItem>) {
+        teacherAdapter.updateDataSet(data, true)
+    }
+
+    override fun updateItem(item: AbstractFlexibleItem<*>) {
+        teacherAdapter.updateItem(item)
+    }
+
+    override fun clearData() {
+        teacherAdapter.clear()
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.teacherEmpty.visibility = if (show) VISIBLE else GONE
+        teacherEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.teacherError.visibility = if (show) VISIBLE else GONE
+        teacherError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.teacherErrorMessage.text = message
+        teacherErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.teacherProgress.visibility = if (show) VISIBLE else GONE
+        teacherProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.teacherSwipe.isEnabled = enable
+        teacherSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.teacherRecycler.visibility = if (show) VISIBLE else GONE
+        teacherRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        binding.teacherSwipe.isRefreshing = false
+        teacherSwipe.isRefreshing = false
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
new file mode 100644
index 000000000..368317744
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Teacher
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_teacher.*
+
+class TeacherItem(val teacher: Teacher, private val noSubjectText: String) : AbstractFlexibleItem<TeacherItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_teacher
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): TeacherItem.ViewHolder {
+        return TeacherItem.ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: TeacherItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        holder.apply {
+            teacherItemName.text = teacher.name
+            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else noSubjectText
+            if (teacher.shortName.isNotBlank()) {
+                teacherItemShortName.visibility = VISIBLE
+                teacherItemShortName.text = "[${teacher.shortName}]"
+            } else {
+                teacherItemShortName.visibility = GONE
+            }
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TeacherItem
+
+        if (teacher != other.teacher) return false
+        if (teacher.id != other.teacher.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = teacher.hashCode()
+        result = 31 * result + teacher.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
index ff02116b9..c5b6cfd69 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class TeacherPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val teacherRepository: TeacherRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TeacherView>(errorHandler, studentRepository) {
+) : BasePresenter<TeacherView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -40,7 +38,7 @@ class TeacherPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData()
+        loadData(true)
     }
 
     fun onDetailsClick() {
@@ -52,40 +50,37 @@ class TeacherPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            teacherRepository.getTeachers(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading teachers data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading teachers result: Success")
-                    view?.run {
-                        updateData(it.data!!.filter { item -> item.name.isNotBlank() })
-                        showContent(it.data.isNotEmpty())
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "teachers",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading teachers result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading teachers data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    teacherRepository.getTeachers(student, semester, forceRefresh)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+            .map { it.filter { teacher -> teacher.name.isNotBlank() } }
+            .map { items -> items.map { TeacherItem(it, view?.noSubjectString.orEmpty()) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded()
+                }
+            }.subscribe({
+                Timber.i("Loading teachers result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                }
+                analytics.logEvent("load_teachers", "items" to it.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.i("Loading teachers result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
index c655bfad8..b16be8ff9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
-import io.github.wulkanowy.data.db.entities.Teacher
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 
@@ -12,10 +12,14 @@ interface TeacherView : BaseView, SchoolAndTeachersChildView {
 
     fun initView()
 
-    fun updateData(data: List<Teacher>)
+    fun updateData(data: List<TeacherItem>)
+
+    fun updateItem(item: AbstractFlexibleItem<*>)
 
     fun hideRefresh()
 
+    fun clearData()
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 6f4a695d6..fe0a97632 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -6,19 +6,15 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.thelittlefireman.appkillermanager.AppKillerManager
-import com.thelittlefireman.appkillermanager.exceptions.NoActionFoundException
 import com.yariksoffice.lingver.Lingver
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.support.AndroidSupportInjection
 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 javax.inject.Inject
 
-@AndroidEntryPoint
 class SettingsFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener,
     MainView.TitledView, SettingsView {
@@ -43,6 +39,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
     override val syncFailedString get() = getString(R.string.pref_services_message_sync_failed)
 
     override fun onAttach(context: Context) {
+        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 
@@ -53,13 +50,6 @@ class SettingsFragment : PreferenceFragmentCompat(),
                 true
             }
         }
-        findPreference<Preference>(getString(R.string.pref_key_notifications_fix_issues))?.run {
-            isVisible = AppKillerManager.isDeviceSupported() && AppKillerManager.isAnyActionAvailable(requireContext())
-            setOnPreferenceClickListener {
-                presenter.onFixSyncIssuesClicked()
-                true
-            }
-        }
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -101,39 +91,31 @@ class SettingsFragment : PreferenceFragmentCompat(),
     }
 
     override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*, *>)?.showError(text, error)
+        (activity as? BaseActivity<*>)?.showError(text, error)
     }
 
     override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
+        (activity as? BaseActivity<*>)?.showMessage(text)
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+        (activity as? BaseActivity<*>)?.openClearLoginView()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
-    override fun showFixSyncDialog() {
+    override fun showForceSyncDialog() {
         AlertDialog.Builder(requireContext())
-            .setTitle(R.string.pref_notify_fix_sync_issues)
-            .setMessage(R.string.pref_notify_fix_sync_issues_message)
+            .setTitle(R.string.pref_services_dialog_force_sync_title)
+            .setMessage(R.string.pref_services_dialog_force_sync_summary)
+            .setPositiveButton(android.R.string.ok) { _, _ -> presenter.onForceSyncDialogSubmit() }
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            .setPositiveButton(R.string.pref_notify_fix_sync_issues_settings_button) { _, _ ->
-                try {
-                    AppKillerManager.doActionPowerSaving(requireContext())
-                    AppKillerManager.doActionAutoStart(requireContext())
-                    AppKillerManager.doActionNotification(requireContext())
-                } catch (e: NoActionFoundException) {
-                    requireContext().openInternetBrowser("https://dontkillmyapp.com/${AppKillerManager.getDevice()?.manufacturer}", ::showMessage)
-                }
-            }
             .show()
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 3d1e063e2..c8545ac0e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -4,29 +4,27 @@ import androidx.work.WorkInfo
 import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.services.sync.SyncManager
 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.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.isHolidays
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate.now
 import javax.inject.Inject
 
 class SettingsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
-    private val timetableNotificationHelper: TimetableNotificationSchedulerHelper,
     private val analytics: FirebaseAnalyticsHelper,
     private val syncManager: SyncManager,
     private val chuckerCollector: ChuckerCollector,
     private val appInfo: AppInfo
-) : BasePresenter<SettingsView>(errorHandler, studentRepository) {
+) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SettingsView) {
         super.onAttachView(view)
@@ -38,49 +36,53 @@ class SettingsPresenter @Inject constructor(
     fun onSharedPreferenceChanged(key: String) {
         Timber.i("Change settings $key")
 
-        preferencesRepository.apply {
+        with(preferencesRepository) {
             when (key) {
                 serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startPeriodicSyncWorker() else stopSyncWorker() }
                 servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startPeriodicSyncWorker(true)
                 isDebugNotificationEnableKey -> chuckerCollector.showNotification = isDebugNotificationEnable
                 appThemeKey -> view?.recreateView()
-                isUpcomingLessonsNotificationsEnableKey -> if (!isUpcomingLessonsNotificationsEnable) timetableNotificationHelper.cancelNotification()
                 appLanguageKey -> view?.run {
                     updateLanguage(if (appLanguage == "system") appInfo.systemLanguage else appLanguage)
                     recreateView()
                 }
+                else -> Unit
             }
         }
         analytics.logEvent("setting_changed", "name" to key)
     }
 
     fun onSyncNowClicked() {
-        view?.run {
-            syncManager.startOneTimeSyncWorker().onEach { workInfo ->
-                when (workInfo.state) {
-                    WorkInfo.State.ENQUEUED -> {
-                        setSyncInProgress(true)
-                        Timber.i("Setting sync now started")
-                        analytics.logEvent("sync_now", "status" to "started")
-                    }
-                    WorkInfo.State.SUCCEEDED -> {
-                        showMessage(syncSuccessString)
-                        analytics.logEvent("sync_now", "status" to "success")
-                    }
-                    WorkInfo.State.FAILED -> {
-                        showError(syncFailedString, Throwable(workInfo.outputData.getString("error")))
-                        analytics.logEvent("sync_now", "status" to "failed")
-                    }
-                    else -> Timber.d("Sync now state: ${workInfo.state}")
-                }
-                if (workInfo.state.isFinished) setSyncInProgress(false)
-            }.catch {
-                Timber.e(it, "Sync now failed")
-            }.launch("sync")
-        }
+        view?.showForceSyncDialog()
     }
 
-    fun onFixSyncIssuesClicked() {
-        view?.showFixSyncDialog()
+    fun onForceSyncDialogSubmit() {
+        view?.run {
+            val successString = syncSuccessString
+            val failedString = syncFailedString
+            disposable.add(syncManager.startOneTimeSyncWorker()
+                .doOnSubscribe {
+                    setSyncInProgress(true)
+                    Timber.i("Setting sync now started")
+                    analytics.logEvent("sync_now", "status" to "started")
+                }
+                .doFinally { setSyncInProgress(false) }
+                .subscribe({ workInfo ->
+                    when (workInfo.state) {
+                        WorkInfo.State.SUCCEEDED -> {
+                            showMessage(successString)
+                            analytics.logEvent("sync_now", "status" to "success")
+                        }
+                        WorkInfo.State.FAILED -> {
+                            showError(failedString, Throwable(workInfo.outputData.getString("error")))
+                            analytics.logEvent("sync_now", "status" to "failed")
+                        }
+                        else -> Timber.d("Sync now state: ${workInfo.state}")
+                    }
+                }, {
+                    Timber.e(it, "Sync now failed")
+                })
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index b647c0b76..4a1b0c766 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -18,5 +18,5 @@ interface SettingsView : BaseView {
 
     fun setSyncInProgress(inProgress: Boolean)
 
-    fun showFixSyncDialog()
+    fun showForceSyncDialog()
 }
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 7fc20d238..3e0106d1a 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,15 +3,12 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.viewbinding.ViewBinding
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
+class SplashActivity : BaseActivity<SplashPresenter>(), SplashView {
 
     @Inject
     override lateinit var presenter: SplashPresenter
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 d16ca4a80..44b53c5f9 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,30 +1,27 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<SplashView>(errorHandler, studentRepository) {
+) : BasePresenter<SplashView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SplashView) {
         super.onAttachView(view)
-        flowWithResource { studentRepository.isCurrentStudentSet() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Is current user set check started")
-                Status.SUCCESS -> with(view) {
-                    if (it.data!!) openMainView()
+        disposable.add(studentRepository.isCurrentStudentSet()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view.apply {
+                    if (it) openMainView()
                     else openLoginView()
                 }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.launch()
+            }, { errorHandler.dispatch(it) }))
     }
 }
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
deleted file mode 100644
index d87f06207..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable
-
-import android.graphics.Paint
-import android.view.LayoutInflater
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.databinding.ItemTimetableBinding
-import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.isJustFinished
-import io.github.wulkanowy.utils.isShowTimeUntil
-import io.github.wulkanowy.utils.left
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.until
-import timber.log.Timber
-import java.time.LocalDateTime
-import java.util.Timer
-import javax.inject.Inject
-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)
-    }
-
-    var items = mutableListOf<Timetable>()
-        set(value) {
-            field = value
-            resetTimers()
-        }
-
-    var onClickListener: (Timetable) -> Unit = {}
-
-    var showWholeClassPlan: String = "no"
-
-    var showTimers: Boolean = false
-
-    private val timers = mutableMapOf<Int, Timer>()
-
-    private fun resetTimers() {
-        Timber.d("Timetable timers reset")
-        with(timers) {
-            forEach { (_, timer) -> timer.cancel() }
-            clear()
-        }
-    }
-
-    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
-    }
-
-    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))
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        resetTimers()
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val lesson = items[position]
-
-        when (holder) {
-            is ItemViewHolder -> bindNormalView(holder.binding, lesson, position)
-            is SmallItemViewHolder -> bindSmallView(holder.binding, lesson)
-        }
-    }
-
-    private fun bindSmallView(binding: ItemTimetableSmallBinding, lesson: Timetable) {
-        with(binding) {
-            timetableSmallItemNumber.text = lesson.number.toString()
-            timetableSmallItemSubject.text = lesson.subject
-            timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
-            timetableSmallItemRoom.text = lesson.room
-            timetableSmallItemTeacher.text = lesson.teacher
-
-            bindSubjectStyle(timetableSmallItemSubject, lesson)
-            bindSmallDescription(binding, lesson)
-            bindSmallColors(binding, lesson)
-
-            root.setOnClickListener { onClickListener(lesson) }
-        }
-    }
-
-    private fun bindNormalView(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
-        with(binding) {
-            timetableItemNumber.text = lesson.number.toString()
-            timetableItemSubject.text = lesson.subject
-            timetableItemRoom.text = lesson.room
-            timetableItemTeacher.text = lesson.teacher
-            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
-            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
-
-            bindSubjectStyle(timetableItemSubject, lesson)
-            bindNormalDescription(binding, lesson)
-            bindNormalColors(binding, lesson)
-
-            if (lesson.isStudentPlan && showTimers) timers[position] = timer(period = 1000) {
-                root.post { updateTimeLeft(binding, lesson, position) }
-            } else {
-                // reset item on set changed
-                timetableItemTimeUntil.visibility = GONE
-                timetableItemTimeLeft.visibility = GONE
-            }
-
-            root.setOnClickListener { onClickListener(lesson) }
-        }
-    }
-
-    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
-        }
-    }
-
-    private fun updateTimeLeft(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
-        val isShowTimeUntil = lesson.isShowTimeUntil(getPreviousLesson(position))
-        val until = lesson.until
-        val left = lesson.left
-        val isJustFinished = lesson.isJustFinished
-
-        with(binding) {
-            when {
-                // before lesson
-                isShowTimeUntil -> {
-                    Timber.d("Show time until lesson: $position")
-                    timetableItemTimeLeft.visibility = GONE
-                    with(timetableItemTimeUntil) {
-                        visibility = VISIBLE
-                        text = context.getString(R.string.timetable_time_until,
-                            if (until.seconds <= 60) {
-                                context.getString(R.string.timetable_seconds, until.seconds.toString(10))
-                            } else {
-                                context.getString(R.string.timetable_minutes, until.toMinutes().toString(10))
-                            }
-                        )
-                    }
-                }
-                // after lesson start
-                left != null -> {
-                    Timber.d("Show time left lesson: $position")
-                    timetableItemTimeUntil.visibility = GONE
-                    with(timetableItemTimeLeft) {
-                        visibility = VISIBLE
-                        text = context.getString(
-                            R.string.timetable_time_left,
-                            if (left.seconds < 60) {
-                                context.getString(R.string.timetable_seconds, left.seconds.toString(10))
-                            } else {
-                                context.getString(R.string.timetable_minutes, left.toMinutes().toString(10))
-                            }
-                        )
-                    }
-                }
-                // right after lesson finish
-                isJustFinished -> {
-                    Timber.d("Show just finished lesson: $position")
-                    timetableItemTimeUntil.visibility = GONE
-                    timetableItemTimeLeft.visibility = VISIBLE
-                    timetableItemTimeLeft.text = root.context.getString(R.string.timetable_finished)
-                }
-                else -> {
-                    timetableItemTimeUntil.visibility = GONE
-                    timetableItemTimeLeft.visibility = GONE
-                }
-            }
-        }
-    }
-
-    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()
-    }
-
-    private fun bindSmallDescription(binding: ItemTimetableSmallBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                timetableSmallItemDescription.visibility = VISIBLE
-                timetableSmallItemDescription.text = lesson.info
-
-                timetableSmallItemRoom.visibility = GONE
-                timetableSmallItemTeacher.visibility = GONE
-
-                timetableSmallItemDescription.setTextColor(root.context.getThemeAttrColor(
-                    if (lesson.canceled) R.attr.colorPrimary
-                    else R.attr.colorTimetableChange
-                ))
-            } else {
-                timetableSmallItemDescription.visibility = GONE
-                timetableSmallItemRoom.visibility = VISIBLE
-                timetableSmallItemTeacher.visibility = VISIBLE
-            }
-        }
-    }
-
-    private fun bindNormalDescription(binding: ItemTimetableBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                timetableItemDescription.visibility = VISIBLE
-                timetableItemDescription.text = lesson.info
-
-                timetableItemRoom.visibility = GONE
-                timetableItemTeacher.visibility = GONE
-
-                timetableItemDescription.setTextColor(root.context.getThemeAttrColor(
-                    if (lesson.canceled) R.attr.colorPrimary
-                    else R.attr.colorTimetableChange
-                ))
-            } else {
-                timetableItemDescription.visibility = GONE
-                timetableItemRoom.visibility = VISIBLE
-                timetableItemTeacher.visibility = VISIBLE
-            }
-        }
-    }
-
-    private fun bindSmallColors(binding: ItemTimetableSmallBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.canceled) {
-                updateNumberAndSubjectCanceledColor(timetableSmallItemNumber, timetableSmallItemSubject)
-            } else {
-                updateNumberColor(timetableSmallItemNumber, lesson)
-                updateSubjectColor(timetableSmallItemSubject, lesson)
-                updateRoomColor(timetableSmallItemRoom, lesson)
-                updateTeacherColor(timetableSmallItemTeacher, lesson)
-            }
-        }
-    }
-
-    private fun bindNormalColors(binding: ItemTimetableBinding, lesson: Timetable) {
-        with(binding) {
-            if (lesson.canceled) {
-                updateNumberAndSubjectCanceledColor(timetableItemNumber, timetableItemSubject)
-            } else {
-                updateNumberColor(timetableItemNumber, lesson)
-                updateSubjectColor(timetableItemSubject, lesson)
-                updateRoomColor(timetableItemRoom, lesson)
-                updateTeacherColor(timetableItemTeacher, lesson)
-            }
-        }
-    }
-
-    private fun updateNumberAndSubjectCanceledColor(numberView: TextView, subjectView: TextView) {
-        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorPrimary))
-        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorPrimary))
-    }
-
-    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
-        ))
-    }
-
-    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
-        ))
-    }
-
-    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
-        ))
-    }
-
-    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
-        ))
-    }
-
-    private class ItemViewHolder(val binding: ItemTimetableBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class SmallItemViewHolder(val binding: ItemTimetableSmallBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
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 f7d5b1ed9..57ec5998d 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
@@ -11,16 +11,13 @@ import android.view.ViewGroup
 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.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import java.time.LocalDateTime
+import kotlinx.android.synthetic.main.dialog_timetable.*
+import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
-    private var binding: DialogTimetableBinding by lifecycleAwareVariable()
-
     private lateinit var lesson: Timetable
 
     companion object {
@@ -42,13 +39,13 @@ class TimetableDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_timetable, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        with(lesson) {
+        lesson.run {
             setInfo(info, teacher, canceled, changes)
             setSubject(subject, subjectOld)
             setTeacher(teacher, teacherOld)
@@ -57,81 +54,74 @@ class TimetableDialog : DialogFragment() {
             setTime(start, end)
         }
 
-        binding.timetableDialogClose.setOnClickListener { dismiss() }
+        timetableDialogClose.setOnClickListener { dismiss() }
     }
 
     private fun setSubject(subject: String, subjectOld: String) {
-        with(binding) {
-            timetableDialogSubject.text = subject
-            if (subjectOld.isNotBlank() && subjectOld != subject) {
-                timetableDialogSubject.run {
-                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                    text = subjectOld
-                }
-                timetableDialogSubjectNew.run {
-                    visibility = VISIBLE
-                    text = subject
-                }
+        timetableDialogSubject.text = subject
+        if (subjectOld.isNotBlank() && subjectOld != subject) {
+            timetableDialogSubject.run {
+                paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                text = subjectOld
+            }
+            timetableDialogSubjectNew.run {
+                visibility = VISIBLE
+                text = subject
             }
         }
     }
 
     private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
-        with(binding) {
-            when {
-                info.isNotBlank() -> {
-                    if (canceled) {
-                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                    } else {
-                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                    }
+        when {
+            info.isNotBlank() -> {
+                if (canceled) {
+                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                } else {
+                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                }
 
-                    timetableDialogChanges.text = when {
-                        canceled && !changes -> "Lekcja odwołana: $info"
-                        changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
-                        changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
-                        else -> info.capitalize()
-                    }
-                }
-                else -> {
-                    timetableDialogChangesTitle.visibility = GONE
-                    timetableDialogChanges.visibility = GONE
+                timetableDialogChanges.text = when {
+                    canceled && !changes -> "Lekcja odwołana: $info"
+                    changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                    changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                    else -> info.capitalize()
                 }
+            } else -> {
+                timetableDialogChangesTitle.visibility = GONE
+                timetableDialogChanges.visibility = GONE
             }
         }
     }
 
     private fun setTeacher(teacher: String, teacherOld: String) {
-        with(binding) {
-            when {
-                teacherOld.isNotBlank() && teacherOld != teacher -> {
-                    timetableDialogTeacher.run {
+        when {
+            teacherOld.isNotBlank() && teacherOld != teacher -> {
+                timetableDialogTeacher.run {
+                    visibility = VISIBLE
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = teacherOld
+                }
+                if (teacher.isNotBlank()) {
+                    timetableDialogTeacherNew.run {
                         visibility = VISIBLE
-                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                        text = teacherOld
-                    }
-                    if (teacher.isNotBlank()) {
-                        timetableDialogTeacherNew.run {
-                            visibility = VISIBLE
-                            text = teacher
-                        }
+                        text = teacher
                     }
                 }
-                teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
-                else -> {
-                    timetableDialogTeacherTitle.visibility = GONE
-                    timetableDialogTeacher.visibility = GONE
-                }
+            }
+            teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+            else -> {
+                timetableDialogTeacherTitle.visibility = GONE
+                timetableDialogTeacher.visibility = GONE
             }
         }
     }
 
     private fun setGroup(group: String) {
-        with(binding) {
+        group.let {
             when {
-                group.isNotBlank() -> timetableDialogGroup.text = group
+                it.isNotBlank() -> timetableDialogGroup.text = it
                 else -> {
                     timetableDialogGroupTitle.visibility = GONE
                     timetableDialogGroup.visibility = GONE
@@ -141,32 +131,30 @@ class TimetableDialog : DialogFragment() {
     }
 
     private fun setRoom(room: String, roomOld: String) {
-        with(binding) {
-            when {
-                roomOld.isNotBlank() && roomOld != room -> {
-                    timetableDialogRoom.run {
+        when {
+            roomOld.isNotBlank() && roomOld != room -> {
+                timetableDialogRoom.run {
+                    visibility = VISIBLE
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = roomOld
+                }
+                if (room.isNotBlank()) {
+                    timetableDialogRoomNew.run {
                         visibility = VISIBLE
-                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                        text = roomOld
-                    }
-                    if (room.isNotBlank()) {
-                        timetableDialogRoomNew.run {
-                            visibility = VISIBLE
-                            text = room
-                        }
+                        text = room
                     }
                 }
-                room.isNotBlank() -> timetableDialogRoom.text = room
-                else -> {
-                    timetableDialogRoomTitle.visibility = GONE
-                    timetableDialogRoom.visibility = GONE
-                }
+            }
+            room.isNotBlank() -> timetableDialogRoom.text = room
+            else -> {
+                timetableDialogRoomTitle.visibility = GONE
+                timetableDialogRoom.visibility = GONE
             }
         }
     }
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        binding.timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
+        timetableDialogTime.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 2c5e136dd..ef6057dfa 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
@@ -1,37 +1,40 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.databinding.FragmentTimetableBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
-import java.time.LocalDate
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_timetable.*
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragment_timetable),
-    TimetableView, MainView.MainChildView, MainView.TitledView {
+class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: TimetablePresenter
 
     @Inject
-    lateinit var timetableAdapter: TimetableAdapter
+    lateinit var timetableAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -41,7 +44,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.isEmpty
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
@@ -50,33 +53,37 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         setHasOptionsMenu(true)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTimetableBinding.bind(view)
-        messageContainer = binding.timetableRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_timetable, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = timetableRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        timetableAdapter.onClickListener = presenter::onTimetableItemSelected
+        timetableAdapter.setOnItemClickListener(presenter::onTimetableItemSelected)
 
-        with(binding.timetableRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(timetableRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = timetableAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
 
-        with(binding) {
-            timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            timetableErrorRetry.setOnClickListener { presenter.onRetry() }
-            timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        timetableErrorRetry.setOnClickListener { presenter.onRetry() }
+        timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            timetableNavDate.setOnClickListener { presenter.onPickDate() }
-            timetableNextButton.setOnClickListener { presenter.onNextDay() }
+        timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        timetableNavDate.setOnClickListener { presenter.onPickDate() }
+        timetableNextButton.setOnClickListener { presenter.onNextDay() }
 
-            timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -88,32 +95,24 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         else false
     }
 
-    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean) {
-        with(timetableAdapter) {
-            items = data.toMutableList()
-            showTimers = showTimetableTimers
-            showWholeClassPlan = showWholeClassPlanType
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<TimetableItem>) {
+        timetableAdapter.updateDataSet(data, true)
     }
 
     override fun clearData() {
-        with(timetableAdapter) {
-            items = mutableListOf()
-            notifyDataSetChanged()
-        }
+        timetableAdapter.clear()
     }
 
     override fun updateNavigationDay(date: String) {
-        binding.timetableNavDate.text = date
+        timetableNavDate.text = date
     }
 
     override fun hideRefresh() {
-        binding.timetableSwipe.isRefreshing = false
+        timetableSwipe.isRefreshing = false
     }
 
     override fun resetView() {
-        binding.timetableRecycler.smoothScrollToPosition(0)
+        timetableRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -125,35 +124,35 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.timetableEmpty.visibility = if (show) VISIBLE else GONE
+        timetableEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.timetableError.visibility = if (show) VISIBLE else GONE
+        timetableError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.timetableErrorMessage.text = message
+        timetableErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        binding.timetableProgress.visibility = if (show) VISIBLE else GONE
+        timetableProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.timetableSwipe.isEnabled = enable
+        timetableSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.timetableRecycler.visibility = if (show) VISIBLE else GONE
+        timetableRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(lesson: Timetable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
new file mode 100644
index 000000000..5b35b85d1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -0,0 +1,197 @@
+package io.github.wulkanowy.ui.modules.timetable
+
+import android.annotation.SuppressLint
+import android.graphics.Paint
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.TextView
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_timetable.*
+import kotlinx.android.synthetic.main.item_timetable_small.*
+
+class TimetableItem(val lesson: Timetable, private val showWholeClassPlan: String) :
+    AbstractFlexibleItem<TimetableItem.ViewHolder>() {
+
+    override fun getLayoutRes() = when {
+        showWholeClassPlan == "small" && !lesson.isStudentPlan -> R.layout.item_timetable_small
+        else -> R.layout.item_timetable
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
+        when (itemViewType) {
+            R.layout.item_timetable_small -> bindSmallView(holder)
+            R.layout.item_timetable -> bindNormalView(holder)
+        }
+    }
+
+    private fun bindSmallView(holder: ViewHolder) {
+        with(holder) {
+            timetableSmallItemNumber.text = lesson.number.toString()
+            timetableSmallItemSubject.text = lesson.subject
+            timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+            timetableSmallItemRoom.text = lesson.room
+            timetableSmallItemTeacher.text = lesson.teacher
+
+            updateSubjectStyle(timetableSmallItemSubject)
+            updateSmallDescription(this)
+            updateSmallColors(this)
+        }
+    }
+
+    private fun bindNormalView(holder: ViewHolder) {
+        with(holder) {
+            timetableItemNumber.text = lesson.number.toString()
+            timetableItemSubject.text = lesson.subject
+            timetableItemRoom.text = lesson.room
+            timetableItemTeacher.text = lesson.teacher
+            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
+
+            updateSubjectStyle(timetableItemSubject)
+            updateNormalDescription(this)
+            updateNormalColors(this)
+        }
+    }
+
+    private fun updateSubjectStyle(subjectView: TextView) {
+        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 updateSmallDescription(holder: ViewHolder) {
+        with(holder) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                timetableSmallItemDescription.visibility = VISIBLE
+                timetableSmallItemDescription.text = lesson.info
+
+                timetableSmallItemRoom.visibility = GONE
+                timetableSmallItemTeacher.visibility = GONE
+
+                timetableSmallItemDescription.setTextColor(holder.view.context.getThemeAttrColor(
+                    if (lesson.canceled) R.attr.colorPrimary
+                    else R.attr.colorTimetableChange
+                ))
+            } else {
+                timetableSmallItemDescription.visibility = GONE
+                timetableSmallItemRoom.visibility = VISIBLE
+                timetableSmallItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun updateNormalDescription(holder: ViewHolder) {
+        with(holder) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                timetableItemDescription.visibility = VISIBLE
+                timetableItemDescription.text = lesson.info
+
+                timetableItemRoom.visibility = GONE
+                timetableItemTeacher.visibility = GONE
+
+                timetableItemDescription.setTextColor(holder.view.context.getThemeAttrColor(
+                    if (lesson.canceled) R.attr.colorPrimary
+                    else R.attr.colorTimetableChange
+                ))
+            } else {
+                timetableItemDescription.visibility = GONE
+                timetableItemRoom.visibility = VISIBLE
+                timetableItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun updateSmallColors(holder: ViewHolder) {
+        with(holder) {
+            if (lesson.canceled) {
+                updateNumberAndSubjectCanceledColor(timetableSmallItemNumber, timetableSmallItemSubject)
+            } else {
+                updateNumberColor(timetableSmallItemNumber)
+                updateSubjectColor(timetableSmallItemSubject)
+                updateRoomColor(timetableSmallItemRoom)
+                updateTeacherColor(timetableSmallItemTeacher)
+            }
+        }
+    }
+
+    private fun updateNormalColors(holder: ViewHolder) {
+        with(holder) {
+            if (lesson.canceled) {
+                updateNumberAndSubjectCanceledColor(timetableItemNumber, timetableItemSubject)
+            } else {
+                updateNumberColor(timetableItemNumber)
+                updateSubjectColor(timetableItemSubject)
+                updateRoomColor(timetableItemRoom)
+                updateTeacherColor(timetableItemTeacher)
+            }
+        }
+    }
+
+    private fun updateNumberAndSubjectCanceledColor(numberView: TextView, subjectView: TextView) {
+        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorPrimary))
+        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorPrimary))
+    }
+
+    private fun updateNumberColor(numberView: TextView) {
+        numberView.setTextColor(numberView.context.getThemeAttrColor(
+            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateSubjectColor(subjectView: TextView) {
+        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) {
+        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) {
+        teacherTextView.setTextColor(teacherTextView.context.getThemeAttrColor(
+            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TimetableItem
+
+        if (lesson != other.lesson) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = lesson.hashCode()
+        result = 31 * result + lesson.id.toInt()
+        return result
+    }
+
+    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) :
+        FlexibleViewHolder(view, adapter), LayoutContainer {
+        override val containerView: View
+            get() = contentView
+    }
+}
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 8581b73c6..2e9d0a0b3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -10,33 +10,30 @@ import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.lang.NullPointerException
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class TimetablePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val timetableRepository: TimetableRepository,
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TimetableView>(errorHandler, studentRepository) {
+) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -105,9 +102,11 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
-    fun onTimetableItemSelected(lesson: Timetable) {
-        Timber.i("Select timetable item ${lesson.id}")
-        view?.showTimetableDialog(lesson)
+    fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is TimetableItem) {
+            Timber.i("Select timetable item ${item.lesson.id}")
+            view?.showTimetableDialog(item.lesson)
+        }
     }
 
     fun onCompletedLessonsSwitchSelected(): Boolean {
@@ -116,60 +115,56 @@ class TimetablePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading timetable data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading timetable data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .delay(200, MILLISECONDS)
+                .map { createTimetableItems(it) }
+                .map { items -> items.sortedWith(compareBy({ it.lesson.number }, { !it.lesson.isStudentPlan })) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(
-                            showWholeClassPlanType = prefRepository.showWholeClassPlan,
-                            showTimetableTimers = prefRepository.showTimetableTimers,
-                            data = it.data!!
-                                .filter { item -> if (prefRepository.showWholeClassPlan == "no") item.isStudentPlan else true }
-                                .sortedWith(compareBy({ item -> item.number }, { item -> !item.isStudentPlan }))
-                        )
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "timetable",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_timetable", "items" to it.size, "force_refresh" to forceRefresh)
+                }) {
                     Timber.i("Loading timetable result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -183,6 +178,12 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
+    private fun createTimetableItems(items: List<Timetable>): List<TimetableItem> {
+        return items
+            .filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true }
+            .map { TimetableItem(it, prefRepository.showWholeClassPlan) }
+    }
+
     private fun reloadView() {
         Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
         view?.apply {
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 fe34f1ee9..f730a2712 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
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface TimetableView : BaseView {
 
@@ -12,7 +12,7 @@ interface TimetableView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean)
+    fun updateData(data: List<TimetableItem>)
 
     fun updateNavigationDay(date: String)
 
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 56ea16cfa..8f7b1ec5b 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
@@ -6,14 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.databinding.DialogLessonCompletedBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import kotlinx.android.synthetic.main.dialog_lesson_completed.*
 
 class CompletedLessonDialog : DialogFragment() {
 
-    private var binding: DialogLessonCompletedBinding by lifecycleAwareVariable()
-
     private lateinit var completedLesson: CompletedLesson
 
     companion object {
@@ -30,54 +28,46 @@ class CompletedLessonDialog : DialogFragment() {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
         arguments?.run {
-            completedLesson = getSerializable(ARGUMENT_KEY) as CompletedLesson
+            completedLesson = getSerializable(CompletedLessonDialog.ARGUMENT_KEY) as CompletedLesson
         }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
+        return inflater.inflate(R.layout.dialog_lesson_completed, container, false)
     }
 
     @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(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
-        }
+        completedLessonDialogSubject.text = completedLesson.subject
+        completedLessonDialogTopic.text = completedLesson.topic
+        completedLessonDialogTeacher.text = completedLesson.teacher
+        completedLessonDialogAbsence.text = completedLesson.absence
+        completedLessonDialogChanges.text = completedLesson.substitution
+        completedLessonDialogResources.text = completedLesson.resources
 
         completedLesson.substitution.let {
             if (it.isBlank()) {
-                with(binding) {
-                    completedLessonDialogChangesTitle.visibility = View.GONE
-                    completedLessonDialogChanges.visibility = View.GONE
-                }
-            } else binding.completedLessonDialogChanges.text = it
+                completedLessonDialogChangesTitle.visibility = View.GONE
+                completedLessonDialogChanges.visibility = View.GONE
+            } else completedLessonDialogChanges.text = it
         }
 
         completedLesson.absence.let {
             if (it.isBlank()) {
-                with(binding) {
-                    completedLessonDialogAbsenceTitle.visibility = View.GONE
-                    completedLessonDialogAbsence.visibility = View.GONE
-                }
-            } else binding.completedLessonDialogAbsence.text = it
+                completedLessonDialogAbsenceTitle.visibility = View.GONE
+                completedLessonDialogAbsence.visibility = View.GONE
+            } else completedLessonDialogAbsence.text = it
         }
 
         completedLesson.resources.let {
             if (it.isBlank()) {
-                with(binding) {
-                    completedLessonDialogResourcesTitle.visibility = View.GONE
-                    completedLessonDialogResources.visibility = View.GONE
-                }
-            } else binding.completedLessonDialogResources.text = it
+                completedLessonDialogResourcesTitle.visibility = View.GONE
+                completedLessonDialogResources.visibility = View.GONE
+            } else completedLessonDialogResources.text = it
         }
 
-        binding.completedLessonDialogClose.setOnClickListener { dismiss() }
+        completedLessonDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
new file mode 100644
index 000000000..fd6dc8a66
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
@@ -0,0 +1,58 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_completed_lesson.*
+
+class CompletedLessonItem(val completedLesson: CompletedLesson) : AbstractFlexibleItem<CompletedLessonItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_completed_lesson
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): CompletedLessonItem.ViewHolder {
+        return CompletedLessonItem.ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: CompletedLessonItem.ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
+            completedLessonItemNumber.text = completedLesson.number.toString()
+            completedLessonItemNumber.setTextColor(holder.contentView.context.getThemeAttrColor(
+                if (completedLesson.substitution.isNotEmpty()) R.attr.colorTimetableChange
+                else android.R.attr.textColorPrimary
+            ))
+            completedLessonItemSubject.text = completedLesson.subject
+            completedLessonItemTopic.text = completedLesson.topic
+            completedLessonItemAlert.visibility = if (completedLesson.substitution.isNotEmpty()) VISIBLE else GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as CompletedLessonItem
+
+        if (completedLesson != other.completedLesson) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return completedLesson.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
deleted file mode 100644
index 3399a8a23..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.completed
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.databinding.ItemCompletedLessonBinding
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-class CompletedLessonsAdapter @Inject constructor() :
-    RecyclerView.Adapter<CompletedLessonsAdapter.ItemViewHolder>() {
-
-    var items = emptyList<CompletedLesson>()
-
-    var onClickListener: (CompletedLesson) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemCompletedLessonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            completedLessonItemNumber.text = item.number.toString()
-            completedLessonItemNumber.setTextColor(root.context.getThemeAttrColor(
-                if (item.substitution.isNotEmpty()) R.attr.colorTimetableChange
-                else android.R.attr.textColorPrimary
-            ))
-            completedLessonItemSubject.text = item.subject
-            completedLessonItemTopic.text = item.topic
-            completedLessonItemAlert.visibility = if (item.substitution.isNotEmpty()) View.VISIBLE else View.GONE
-
-            root.setOnClickListener { onClickListener(item) }
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemCompletedLessonBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
index 767c2f313..c1389cedd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.content.res.Resources
 import com.chuckerteam.chucker.api.ChuckerCollector
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
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 5b77fc1f3..60c16b2dc 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
@@ -1,36 +1,36 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
+import android.view.ViewGroup
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.databinding.FragmentTimetableCompletedBinding
 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.dpToPx
 import io.github.wulkanowy.utils.getCompatDrawable
-import java.time.LocalDate
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_timetable_completed.*
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class CompletedLessonsFragment :
-    BaseFragment<FragmentTimetableCompletedBinding>(R.layout.fragment_timetable_completed),
-    CompletedLessonsView, MainView.TitledView {
+class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: CompletedLessonsPresenter
 
     @Inject
-    lateinit var completedLessonsAdapter: CompletedLessonsAdapter
+    lateinit var completedLessonsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -40,96 +40,88 @@ class CompletedLessonsFragment :
 
     override val titleStringId get() = R.string.completed_lessons_title
 
-    override val isViewEmpty get() = completedLessonsAdapter.items.isEmpty()
+    override val isViewEmpty get() = completedLessonsAdapter.isEmpty
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTimetableCompletedBinding.bind(view)
-        messageContainer = binding.completedLessonsRecycler
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = completedLessonsRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        completedLessonsAdapter.onClickListener = presenter::onCompletedLessonsItemSelected
+        completedLessonsAdapter.setOnItemClickListener(presenter::onCompletedLessonsItemSelected)
 
-        with(binding.completedLessonsRecycler) {
-            layoutManager = LinearLayoutManager(context)
+        with(completedLessonsRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = completedLessonsAdapter
-            addItemDecoration(DividerItemDecoration(context))
         }
 
-        with(binding) {
-            completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
-            completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
+        completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-            completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
-            completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+        completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
+        completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
 
-            completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
+        completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
-    override fun updateData(data: List<CompletedLesson>) {
-        with(completedLessonsAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<CompletedLessonItem>) {
+        completedLessonsAdapter.updateDataSet(data, true)
     }
 
     override fun clearData() {
-        with(completedLessonsAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
+        completedLessonsAdapter.clear()
     }
 
     override fun updateNavigationDay(date: String) {
-        binding.completedLessonsNavDate.text = date
+        completedLessonsNavDate.text = date
     }
 
     override fun hideRefresh() {
-        binding.completedLessonsSwipe.isRefreshing = false
+        completedLessonsSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        binding.completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
+        completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        binding.completedLessonError.visibility = if (show) VISIBLE else GONE
+        completedLessonError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        binding.completedLessonErrorMessage.text = message
+        completedLessonErrorMessage.text = message
     }
 
     override fun showFeatureDisabled() {
-        with(binding) {
-            completedLessonsInfo.text = getString(R.string.error_feature_disabled)
-            completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
-        }
+        completedLessonsInfo.text = getString(R.string.error_feature_disabled)
+        completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
     }
 
     override fun showProgress(show: Boolean) {
-        binding.completedLessonsProgress.visibility = if (show) VISIBLE else GONE
+        completedLessonsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        binding.completedLessonsSwipe.isEnabled = enable
+        completedLessonsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        binding.completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
+        completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        binding.completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
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 f1c2cedc6..001fed97b 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
@@ -1,37 +1,34 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.CompletedLesson
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class CompletedLessonsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val completedLessonsErrorHandler: CompletedLessonsErrorHandler,
     private val semesterRepository: SemesterRepository,
     private val completedLessonsRepository: CompletedLessonsRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository) {
+) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -47,7 +44,6 @@ class CompletedLessonsPresenter @Inject constructor(
         completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
-            this.view?.showEmpty(true)
             Timber.i("Completed lessons feature disabled by school")
         }
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
@@ -91,60 +87,64 @@ class CompletedLessonsPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onCompletedLessonsItemSelected(completedLesson: CompletedLesson) {
-        Timber.i("Select completed lessons item ${completedLesson.id}")
-        view?.showCompletedLessonDialog(completedLesson)
+    fun onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is CompletedLessonItem) {
+            Timber.i("Select completed lessons item ${item.completedLesson.id}")
+            view?.showCompletedLessonDialog(item.completedLesson)
+        }
     }
 
     private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading completed lessons data started")
         currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            completedLessonsRepository.getCompletedLessons(student, semester, date, date, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading completed lessons data started")
-                Status.SUCCESS -> {
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        completedLessonsRepository.getCompletedLessons(student, semester, currentDate, currentDate, forceRefresh)
+                    }
+                }
+                .delay(200, TimeUnit.MILLISECONDS)
+                .map { items -> items.map { CompletedLessonItem(it) } }
+                .map { items -> items.sortedBy { it.completedLesson.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading completed lessons lessons result: Success")
                     view?.apply {
-                        updateData(it.data!!.sortedBy { item -> item.number })
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "completed_lessons",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
+                    analytics.logEvent("load_completed_lessons", "items" to it.size, "force_refresh" to forceRefresh)
+                }) {
                     Timber.i("Loading completed lessons result: An exception occurred")
-                    completedLessonsErrorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    completedLessonsErrorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
index 7e92cc63c..a6a327e2d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface CompletedLessonsView : BaseView {
 
@@ -10,7 +10,7 @@ interface CompletedLessonsView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<CompletedLesson>)
+    fun updateData(data: List<CompletedLessonItem>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index 23d1f27ab..7636637f4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -4,43 +4,36 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_PROVIDER
-import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.activity_widget_configure.*
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TimetableWidgetConfigureActivity :
-    BaseActivity<TimetableWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
+class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePresenter>(),
     TimetableWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: WidgetConfigureAdapter
+    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     override lateinit var presenter: TimetableWidgetConfigurePresenter
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     private var dialog: AlertDialog? = null
 
-    override public fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(R.layout.activity_widget_configure)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
@@ -48,20 +41,19 @@ class TimetableWidgetConfigureActivity :
     }
 
     override fun initView() {
-        with(binding.widgetConfigureRecycler) {
+        with(widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = LinearLayoutManager(context)
+            layoutManager = SmoothScrollLinearLayoutManager(context)
         }
 
-        configureAdapter.onClickListener = presenter::onItemSelect
+        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
     }
 
     override fun showThemeDialog() {
-        var items = arrayOf(
+        val items = arrayOf(
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
-        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += getString(R.string.widget_timetable_theme_system)
 
         dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
             .setTitle(R.string.widget_timetable_theme_title)
@@ -72,11 +64,8 @@ class TimetableWidgetConfigureActivity :
             .show()
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
-        with(configureAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<TimetableWidgetConfigureItem>) {
+        configureAdapter.updateDataSet(data)
     }
 
     override fun updateTimetableWidget(widgetId: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
new file mode 100644
index 000000000..a3338c684
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import android.annotation.SuppressLint
+import android.view.View
+import androidx.core.graphics.ColorUtils
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_account.*
+
+class TimetableWidgetConfigureItem(val student: Student, private val isCurrent: Boolean) :
+    AbstractFlexibleItem<TimetableWidgetConfigureItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_account
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    @SuppressLint("SetTextI18n")
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        val context = holder.contentView.context
+
+        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+            accountItemImage.setColorFilter(colorImage)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TimetableWidgetConfigureItem
+
+        if (student != other.student) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = student.hashCode()
+        result = 31 * result + student.id.toInt()
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index 2274ecb90..e16851083 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import io.github.wulkanowy.data.Status
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -8,16 +8,15 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class TimetableWidgetConfigurePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository) {
+) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
@@ -33,11 +32,13 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(student: Student) {
-        selectedStudent = student
+    fun onItemSelect(item: AbstractFlexibleItem<*>) {
+        if (item is TimetableWidgetConfigureItem) {
+            selectedStudent = item.student
 
-        if (isFromProvider) registerStudent(selectedStudent)
-        else view?.showThemeDialog()
+            if (isFromProvider) registerStudent(selectedStudent)
+            else view?.showThemeDialog()
+        }
     }
 
     fun onThemeSelect(index: Int) {
@@ -47,30 +48,28 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView() {
+    fun onDismissThemeView(){
         view?.finishView()
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Timetable widget configure students data load")
-                Status.SUCCESS -> {
-                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
-                    when {
-                        it.data!!.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 && !isFromProvider -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
-                        else -> view?.updateData(it.data.map { entity ->
-                            entity.student to (entity.student.id == widgetId)
-                        })
-                    }
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> TimetableWidgetConfigureItem(student, student.id == currentStudentId) }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 && !isFromProvider -> {
+                        selectedStudent = it.single().student
+                        view?.showThemeDialog()
+                    }
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 
     private fun registerStudent(student: Student?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
index 056225ab5..7cac892d9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -1,13 +1,12 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface TimetableWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<TimetableWidgetConfigureItem>)
 
     fun updateTimetableWidget(widgetId: Int)
 
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 c7b4d4a84..fb8c59586 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
@@ -18,15 +18,15 @@ import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getCurrentThemeWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.toFirstResult
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import timber.log.Timber
-import java.time.LocalDate
 
 class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
@@ -34,13 +34,16 @@ class TimetableWidgetFactory(
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val sharedPref: SharedPrefProvider,
+    private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
 ) : RemoteViewsService.RemoteViewsFactory {
 
     private var lessons = emptyList<Timetable>()
 
-    private var savedCurrentTheme: Long? = null
+    private var savedTheme: Long? = null
+
+    private var layoutId: Int? = null
 
     private var primaryColor: Int? = null
 
@@ -68,52 +71,55 @@ class TimetableWidgetFactory(
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
             updateTheme(appWidgetId)
-            lessons = getLessons(date, studentId)
+
+            updateLessons(date, studentId)
         }
     }
 
     private fun updateTheme(appWidgetId: Int) {
-        savedCurrentTheme = sharedPref.getLong(getCurrentThemeWidgetKey(appWidgetId), 0)
+        savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        layoutId = if (savedTheme == 0L) R.layout.item_widget_timetable else R.layout.item_widget_timetable_dark
 
-        if (savedCurrentTheme == 0L) {
-            primaryColor = R.color.colorPrimary
-            textColor = android.R.color.black
-            timetableChangeColor = R.color.timetable_change_dark
-        } else {
-            primaryColor = R.color.colorPrimaryLight
-            textColor = android.R.color.white
-            timetableChangeColor = R.color.timetable_change_light
-        }
+        primaryColor = if (savedTheme == 0L) R.color.colorPrimary else R.color.colorPrimaryLight
+        textColor = if (savedTheme == 0L) android.R.color.black else android.R.color.white
+        timetableChangeColor = if (savedTheme == 0L) R.color.timetable_change_dark else R.color.timetable_change_light
     }
 
     private fun getItemLayout(lesson: Timetable): Int {
         return when {
             prefRepository.showWholeClassPlan == "small" && !lesson.isStudentPlan -> {
-                if (savedCurrentTheme == 0L) R.layout.item_widget_timetable_small
+                if (savedTheme == 0L) R.layout.item_widget_timetable_small
                 else R.layout.item_widget_timetable_small_dark
             }
-            savedCurrentTheme == 1L -> R.layout.item_widget_timetable_dark
-            else -> R.layout.item_widget_timetable
+            savedTheme == 0L -> R.layout.item_widget_timetable
+            else -> R.layout.item_widget_timetable_dark
         }
     }
 
-    private fun getLessons(date: LocalDate, studentId: Long) = try {
-        runBlocking {
-            if (!studentRepository.isStudentSaved()) return@runBlocking emptyList<Timetable>()
+    private fun updateLessons(date: LocalDate, studentId: Long) {
+        lessons = try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents().toMaybe() }
+                .flatMap {
+                    val student = it.singleOrNull { student -> student.id == studentId }
 
-            val students = studentRepository.getSavedStudents()
-            val student = students.singleOrNull { it.student.id == studentId }?.student
-                ?: return@runBlocking emptyList<Timetable>()
-
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, date, date, false)
-                .toFirstResult().data.orEmpty()
-                .sortedWith(compareBy({ it.number }, { !it.isStudentPlan }))
-                .filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true }
+                    if (student != null) Maybe.just(student)
+                    else Maybe.empty()
+                }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).toMaybe().flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, date, date).toMaybe()
+                    }
+                }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .map { lessons -> lessons.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet(emptyList())
+        } catch (e: Exception) {
+            Timber.e(e, "An error has occurred in timetable widget factory")
+            emptyList()
         }
-    } catch (e: Exception) {
-        Timber.e(e, "An error has occurred in timetable widget factory")
-        emptyList<Timetable>()
     }
 
     @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 60ad9d5cc..62192a1b0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -8,36 +8,34 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
 import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.content.res.Configuration
 import android.widget.RemoteViews
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
 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.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TimetableWidgetProvider : HiltBroadcastReceiver() {
+class TimetableWidgetProvider : BroadcastReceiver() {
 
     @Inject
     lateinit var appWidgetManager: AppWidgetManager
@@ -48,6 +46,9 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     @Inject
     lateinit var analytics: FirebaseAnalyticsHelper
 
@@ -70,21 +71,17 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
         fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
 
         fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
-
-        fun getCurrentThemeWidgetKey(appWidgetId: Int) = "timetable_widget_current_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
-        GlobalScope.launch {
-            when (intent.action) {
-                ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-                ACTION_APPWIDGET_DELETED -> onDelete(intent)
-            }
+        AndroidInjection.inject(this, context)
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
         }
     }
 
-    private suspend fun onUpdate(context: Context, intent: Intent) {
+    private fun onUpdate(context: Context, intent: Intent) {
         if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
             intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
                 val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
@@ -113,23 +110,14 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
             with(sharedPref) {
                 delete(getStudentWidgetKey(appWidgetId))
                 delete(getDateWidgetKey(appWidgetId))
-                delete(getThemeWidgetKey(appWidgetId))
-                delete(getCurrentThemeWidgetKey(appWidgetId))
             }
         }
     }
 
     @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
-        val savedConfigureTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-        var currentTheme = 0L
-        var layoutId = R.layout.widget_timetable
-
-        if (savedConfigureTheme == 1L || (savedConfigureTheme == 2L && isSystemDarkMode)) {
-            currentTheme = 1L
-            layoutId = R.layout.widget_timetable_dark
-        }
+        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val layoutId = if (savedTheme == 0L) R.layout.widget_timetable else R.layout.widget_timetable_dark
 
         val nextNavIntent = createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT)
         val prevNavIntent = createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV)
@@ -162,15 +150,10 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
             setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
         }
 
-        with(sharedPref) {
-            putLong(getCurrentThemeWidgetKey(appWidgetId), currentTheme)
-            putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
-        }
-
+        sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
         with(appWidgetManager) {
-            updateAppWidget(appWidgetId, remoteView)
             notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
-            Timber.d("TimetableWidgetProvider updated")
+            updateAppWidget(appWidgetId, remoteView)
         }
     }
 
@@ -183,22 +166,31 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
             }, FLAG_UPDATE_CURRENT)
     }
 
-    private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
-        val students = studentRepository.getSavedStudents(false)
-        val student = students.singleOrNull { it -> it.student.id == studentId }?.student
-        when {
-            student != null -> student
-            studentId != 0L && studentRepository.isCurrentStudentSet() -> {
-                studentRepository.getCurrentStudent(false).also {
-                    sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
+    private fun getStudent(studentId: Long, appWidgetId: Int): Student? {
+        return try {
+            studentRepository.isStudentSaved()
+                .filter { true }
+                .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
+                .flatMap { students ->
+                    val student = students.singleOrNull { student -> student.id == studentId }
+                    when {
+                        student != null -> Maybe.just(student)
+                        studentId != 0L -> {
+                            studentRepository.isCurrentStudentSet()
+                                .filter { true }
+                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
+                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
+                        }
+                        else -> Maybe.empty()
+                    }
                 }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
+        } catch (e: Exception) {
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in timetable widget provider")
             }
-            else -> null
+            null
         }
-    } catch (e: Exception) {
-        if (e.cause !is NoCurrentStudentException) {
-            Timber.e(e, "An error has occurred in timetable widget provider")
-        }
-        null
     }
 }
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
deleted file mode 100644
index b0b6999eb..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-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) {
-
-    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)
-            val params = child.layoutParams as RecyclerView.LayoutParams
-            val dividerTop: Int = child.bottom + params.bottomMargin
-            val dividerBottom = dividerTop + drawable!!.intrinsicHeight
-            drawable?.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom)
-            drawable?.draw(canvas)
-        }
-        canvas.restore()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
index 1098a9a06..a444da6fe 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -4,14 +4,16 @@ import android.content.res.Resources
 import android.os.Build.MANUFACTURER
 import android.os.Build.MODEL
 import android.os.Build.VERSION.SDK_INT
+import io.github.wulkanowy.BuildConfig.CRASHLYTICS_ENABLED
 import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_CODE
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
-import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-open class AppInfo @Inject constructor() {
+open class AppInfo {
+
+    open val isCrashlyticsEnabled get() = CRASHLYTICS_ENABLED
 
     open val isDebug get() = DEBUG
 
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 cf715e657..582b1c835 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -9,8 +9,6 @@ import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
-import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
@@ -22,11 +20,6 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
     }
 }
 
-@ColorInt
-fun Context.getThemeAttrColor(@AttrRes colorAttr: Int, alpha: Int): Int {
-    return ColorUtils.setAlphaComponent(getThemeAttrColor(colorAttr), alpha)
-}
-
 @ColorInt
 fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
 
@@ -39,12 +32,6 @@ fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -
     }
 }
 
-fun Context.openAppInMarket(onActivityNotFound: (uri: String) -> Unit) {
-    openInternetBrowser("market://details?id=${APPLICATION_ID}") {
-        openInternetBrowser("https://github.com/wulkanowy/wulkanowy/releases", onActivityNotFound)
-    }
-}
-
 fun Context.openEmailClient(chooserTitle: String, email: String, subject: String, body: String, onActivityNotFound: () -> Unit = {}) {
     val intent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:")).apply {
         putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
@@ -71,17 +58,4 @@ fun Context.openDialer(phone: String) {
     startActivity(intent)
 }
 
-fun Context.shareText(text: String, subject: String?) {
-    val sendIntent: Intent = Intent().apply {
-        action = Intent.ACTION_SEND
-        putExtra(Intent.EXTRA_TEXT, text)
-        if (subject != null) {
-            putExtra(Intent.EXTRA_SUBJECT, subject)
-        }
-        type = "text/plain"
-    }
-    val shareIntent = Intent.createChooser(sendIntent, null)
-    startActivity(shareIntent)
-}
-
 fun Context.dpToPx(dp: Float) = dp * resources.displayMetrics.densityDpi / DENSITY_DEFAULT
diff --git a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
deleted file mode 100644
index ecc8e05eb..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.github.wulkanowy.utils
-
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-open class DispatchersProvider {
-
-    open val backgroundThread: CoroutineDispatcher
-        get() = Dispatchers.IO
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
new file mode 100644
index 000000000..bd6867a38
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.utils
+
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+
+inline fun FlexibleAdapter<*>.setOnItemClickListener(crossinline listener: (item: AbstractFlexibleItem<*>) -> Unit) {
+    addListener(FlexibleAdapter.OnItemClickListener { _, position ->
+        listener(getItem(position) as AbstractFlexibleItem<*>)
+        true
+    })
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
deleted file mode 100644
index 314994054..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.takeWhile
-
-inline fun <ResultType, RequestType> networkBoundResource(
-    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> Unit = { Unit },
-    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline filterResult: (ResultType) -> ResultType = { it }
-) = flow {
-    emit(Resource.loading())
-
-    val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        if (showSavedOnLoading) emit(Resource.loading(filterResult(data)))
-
-        try {
-            saveFetchResult(data, fetch(data))
-            query().map { Resource.success(filterResult(it)) }
-        } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            query().map { Resource.error(throwable, filterResult(it)) }
-        }
-    } else {
-        query().map { Resource.success(filterResult(it)) }
-    })
-}
-
-@JvmName("networkBoundResourceWithMap")
-inline fun <ResultType, RequestType, T> networkBoundResource(
-    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> Unit = { Unit },
-    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline mapResult: (ResultType) -> T
-) = flow {
-    emit(Resource.loading())
-
-    val data = query().first()
-    emitAll(if (shouldFetch(data)) {
-        if (showSavedOnLoading) emit(Resource.loading(mapResult(data)))
-
-        try {
-            saveFetchResult(data, fetch(data))
-            query().map { Resource.success(mapResult(it)) }
-        } catch (throwable: Throwable) {
-            onFetchFailed(throwable)
-            query().map { Resource.error(throwable, mapResult(it)) }
-        }
-    } else {
-        query().map { Resource.success(mapResult(it)) }
-    })
-}
-
-fun <T> flowWithResource(block: suspend () -> T) = flow {
-    emit(Resource.loading())
-    emit(try {
-        Resource.success(block())
-    } catch (e: Throwable) {
-        Resource.error(e)
-    })
-}
-
-fun <T> flowWithResourceIn(block: suspend () -> Flow<Resource<T>>) = flow {
-    emit(Resource.loading())
-
-    try {
-        block()
-            .catch { emit(Resource.error(it)) }
-            .collect {
-                if (it.status != Status.LOADING) { // LOADING is already emitted
-                    emit(it)
-                }
-            }
-    } catch (e: Throwable) {
-        emit(Resource.error(e))
-    }
-}
-
-fun <T> Flow<Resource<T>>.afterLoading(callback: () -> Unit) = onEach {
-    if (it.status != Status.LOADING) callback()
-}
-
-suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it.status != Status.LOADING }.first()
-
-suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it.status == Status.LOADING }.collect()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
index 9dc1e18a0..9cec331f8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
@@ -4,14 +4,14 @@ import androidx.fragment.app.Fragment
 import com.ncapdevi.fragnav.FragNavController
 import io.github.wulkanowy.ui.modules.main.MainView
 
-inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?, name: String?) -> Unit) {
+inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?) -> Unit) {
     transactionListener = object : FragNavController.TransactionListener {
         override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {
-            listener(fragment?.toSection(), fragment?.let { it::class.java.simpleName })
+            listener(fragment?.toSection())
         }
 
         override fun onTabTransaction(fragment: Fragment?, index: Int) {
-            listener(fragment?.toSection(), fragment?.let { it::class.java.simpleName })
+            listener(fragment?.toSection())
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
deleted file mode 100644
index b96faeb21..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.github.wulkanowy.utils
-
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-class LifecycleAwareVariable<T : Any> : ReadWriteProperty<Fragment, T>, LifecycleObserver {
-
-    private var _value: T? = null
-
-    override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
-        thisRef.viewLifecycleOwner.lifecycle.removeObserver(this)
-        _value = value
-        thisRef.viewLifecycleOwner.lifecycle.addObserver(this)
-    }
-
-    override fun getValue(thisRef: Fragment, property: KProperty<*>) = _value
-        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
-
-    @Suppress("unused")
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    fun onDestroyView() {
-        _value = null
-    }
-}
-
-class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>, LifecycleObserver {
-
-    private var _value: T? = null
-
-    override fun setValue(thisRef: AppCompatActivity, property: KProperty<*>, value: T) {
-        thisRef.lifecycle.removeObserver(this)
-        _value = value
-        thisRef.lifecycle.addObserver(this)
-    }
-
-    override fun getValue(thisRef: AppCompatActivity, property: KProperty<*>) = _value
-        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
-
-    @Suppress("unused")
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    fun onDestroyView() {
-        _value = null
-    }
-}
-
-
-@Suppress("unused")
-fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
-
-fun <T : Any> lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
index de9f656a2..a2d0384e3 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
@@ -2,11 +2,11 @@ package io.github.wulkanowy.utils
 
 import android.content.res.Resources
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
-import io.github.wulkanowy.sdk.scrapper.login.NotLoggedInException
-import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
+import io.github.wulkanowy.sdk.exception.NotLoggedInException
+import io.github.wulkanowy.sdk.exception.PasswordChangeRequiredException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 import java.io.InterruptedIOException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
new file mode 100644
index 000000000..e426d4d5d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.utils
+
+import io.reactivex.Scheduler
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+open class SchedulersProvider {
+
+    open val mainThread: Scheduler
+        get() = AndroidSchedulers.mainThread()
+
+    open val backgroundThread: Scheduler
+        get() = Schedulers.io()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
index e7c51745c..922aafbd8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
@@ -3,8 +3,8 @@ 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 org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
 import java.util.Calendar
 
 @Suppress("UNUSED_PARAMETER")
@@ -17,7 +17,7 @@ class SchooldaysRangeLimiter : DateRangeLimiter {
     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
+        return dayOfWeek == DayOfWeek.SUNDAY || dayOfWeek == DayOfWeek.SATURDAY || date.isHolidays
     }
 
     override fun getStartDate(): Calendar {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
index 63a30db8c..e4d4163b4 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -23,8 +23,6 @@ fun Sdk.init(student: Student): Sdk {
     certKey = student.certificateKey
     privateKey = student.privateKey
 
-    emptyCookieJarInterceptor = true
-
     Timber.d("Sdk in ${student.loginMode} mode reinitialized")
 
     return this
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
index 6e11a8b2c..b3c479c38 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.utils
 
 import io.github.wulkanowy.data.db.entities.Semester
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate.now
 
 inline val Semester.isCurrent: Boolean
     get() = now() in start..end
@@ -13,7 +13,7 @@ fun List<Semester>.getCurrentOrLast(): Semester {
     singleOrNull { it.isCurrent }?.let { return it }
 
     // when there is more than one current semester - find one with higher id
-    singleOrNull { semester -> semester.semesterId == maxByOrNull { it.semesterId }?.semesterId }?.let { return it }
+    singleOrNull { semester -> semester.semesterId == maxBy { it.semesterId }?.semesterId }?.let { return it }
 
     throw IllegalArgumentException("Duplicated last semester! Semesters: ${joinToString(separator = "\n")}")
 }
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 d1aba1605..a91f823fa 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,40 +1,32 @@
 package io.github.wulkanowy.utils
 
-import android.annotation.SuppressLint
-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.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.ofInstant
-import java.time.Month
-import java.time.ZoneId
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter.ofPattern
-import java.time.format.TextStyle.FULL_STANDALONE
-import java.time.format.TextStyle.*
-import java.time.temporal.TemporalAdjusters.firstInMonth
-import java.time.temporal.TemporalAdjusters.next
-import java.time.temporal.TemporalAdjusters.previous
+import org.threeten.bp.DayOfWeek.FRIDAY
+import org.threeten.bp.DayOfWeek.MONDAY
+import org.threeten.bp.DayOfWeek.SATURDAY
+import org.threeten.bp.DayOfWeek.SUNDAY
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month
+import org.threeten.bp.format.DateTimeFormatter.ofPattern
+import org.threeten.bp.format.TextStyle.FULL_STANDALONE
+import org.threeten.bp.temporal.TemporalAdjusters.firstInMonth
+import org.threeten.bp.temporal.TemporalAdjusters.next
+import org.threeten.bp.temporal.TemporalAdjusters.previous
 import java.util.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
 
 fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.parse(this, ofPattern(format))
 
-fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
-
-fun Long.toLocalDateTime(): LocalDateTime = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
-
 fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
 fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
-@SuppressLint("DefaultLocale")
+/**
+ * https://github.com/ThreeTen/threetenbp/issues/55
+ */
 fun Month.getFormattedName(): String {
-    return getDisplayName(FULL, Locale.getDefault())
+    return getDisplayName(FULL_STANDALONE, Locale.getDefault())
         .let {
             when (it) {
                 "stycznia" -> "Styczeń"
@@ -51,7 +43,7 @@ fun Month.getFormattedName(): String {
                 "grudnia" -> "Grudzień"
                 else -> it
             }
-        }.capitalize()
+        }
 }
 
 inline val LocalDate.nextSchoolDay: LocalDate
@@ -92,8 +84,8 @@ inline val LocalDate.weekDayName: String
 inline val LocalDate.monday: LocalDate
     get() = with(MONDAY)
 
-inline val LocalDate.sunday: LocalDate
-    get() = with(SUNDAY)
+inline val LocalDate.friday: LocalDate
+    get() = with(FRIDAY)
 
 /**
  * [Dz.U. 2016 poz. 1335](http://prawo.sejm.gov.pl/isap.nsf/DocDetails.xsp?id=WDU20160001335)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
deleted file mode 100644
index f3591306e..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.db.entities.Timetable
-import java.time.Duration
-import java.time.Duration.between
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
-
-fun Timetable.isShowTimeUntil(previousLessonEnd: LocalDateTime?) = when {
-    !isStudentPlan -> false
-    canceled -> false
-    now().isAfter(start) -> false
-    previousLessonEnd != null && now().isBefore(previousLessonEnd) -> false
-    else -> between(now(), start) <= Duration.ofMinutes(60)
-}
-
-inline val Timetable.left: Duration?
-    get() = when {
-        canceled -> null
-        !isStudentPlan -> null
-        end.isAfter(now()) && start.isBefore(now()) -> between(now(), end)
-        else -> null
-    }
-
-inline val Timetable.until: Duration
-    get() = between(now(), start)
-
-inline val Timetable.isJustFinished: Boolean
-    get() = end.isBefore(now()) && end.plusSeconds(15).isAfter(now()) && !canceled
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 d0e2c8233..6e72dd828 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,6 @@
-Wersja 0.20.2
-- naprawiliśmy powiadomienie o szczęśliwym numerku
-- naprawiliśmy przełączanie na nowy rok szkolny
-- naprawiliśmy funkcję resetowania hasła
-- dodaliśmy dziennik e-Skarżysko
+- naprawiliśmy wyświetlanie przycisku oznaczania zadania domowego jako wykonanego
+- naprawiliśmy rzadki błąd ze stabilnością przy wysyłaniu wiadomości
+- naprawiliśmy błąd po logowaniu w domyślnym trybie, jeśli wcześniej użytkownik zalogowany był w trybie Mobilnego API
+- ulepszyliśmy wygląd okienka ze szczegółami błędu
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
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 201419d5d..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_timetable.png b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png
deleted file mode 100644
index dcfe95f26..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-xhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png
deleted file mode 100644
index 7264bd92a..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_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png
deleted file mode 100644
index 1fb37b092..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_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_timetable_time_left.xml b/app/src/main/res/drawable/background_timetable_time_left.xml
deleted file mode 100644
index 0f3326112..000000000
--- a/app/src/main/res/drawable/background_timetable_time_left.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="3dp"/>
-    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
-</shape>
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
deleted file mode 100644
index 86b7649b6..000000000
--- a/app/src/main/res/drawable/ic_fullscreen.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
deleted file mode 100644
index bb7140f29..000000000
--- a/app/src/main/res/drawable/ic_fullscreen_exit.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_print.xml b/app/src/main/res/drawable/ic_menu_message_print.xml
deleted file mode 100644
index 204b0f6e3..000000000
--- a/app/src/main/res/drawable/ic_menu_message_print.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,8h-1L18,3L6,3v5L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM8,5h8v3L8,8L8,5zM16,17v2L8,19v-4h8v2zM18,15v-2L6,13v2L4,15v-4c0,-0.55 0.45,-1 1,-1h14c0.55,0 1,0.45 1,1v4h-2z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,11.5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_share.xml b/app/src/main/res/drawable/ic_menu_message_share.xml
deleted file mode 100644
index 67a8ee494..000000000
--- a/app/src/main/res/drawable/ic_menu_message_share.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index cd9985cb1..000000000
--- a/app/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2ea0a4d39..d07dbbd8a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,8 +8,7 @@
         android:id="@+id/mainToolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp" />
+        android:layout_height="wrap_content" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/mainFragmentContainer"
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index e0ec52bb6..f59dcabdf 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -148,7 +148,7 @@
                     android:hint="@string/message_content"
                     android:imeOptions="flagNoExtractUi"
                     android:importantForAutofill="no"
-                    android:inputType="textMultiLine|textCapSentences"
+                    android:inputType="textMultiLine"
                     android:minHeight="58dp"
                     android:paddingStart="16dp"
                     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
index 9a463284e..548b86041 100644
--- a/app/src/main/res/layout/activity_widget_configure.xml
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -10,7 +10,9 @@
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:paddingStart="24dp"
+        android:paddingLeft="24dp"
         android:paddingEnd="24dp"
+        android:paddingRight="24dp"
         android:text="@string/account_title"
         android:textSize="20sp"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index d56de3a2e..f2ee0bca7 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -2,63 +2,49 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="300dp"
+    android:layout_width="280dp"
     android:layout_height="wrap_content">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/accountDialogTitle"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:paddingStart="24dp"
+        android:paddingLeft="24dp"
+        android:paddingEnd="24dp"
+        android:paddingRight="24dp"
+        android:text="@string/account_title"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:firstBaselineToTopHeight="40dp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/accountDialogRecycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_below="@id/accountDialogTitle"
+        android:overScrollMode="never"
+        tools:itemCount="3"
+        tools:listitem="@layout/item_account" />
 
-        <TextView
-            android:id="@+id/accountDialogTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="24dp"
-            android:paddingLeft="24dp"
-            android:paddingEnd="24dp"
-            android:paddingRight="24dp"
-            android:text="@string/account_title"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:firstBaselineToTopHeight="40dp" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/accountDialogAdd"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/accountDialogRecycler"
+        android:layout_margin="8dp"
+        android:text="@string/account_add_new"
+        android:textColor="?android:textColorPrimary" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/accountDialogRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:layout_weight="1"
-            android:overScrollMode="never"
-            tools:itemCount="3"
-            tools:listitem="@layout/item_account" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/accountDialogAdd"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:text="@string/account_add_new"
-                android:textColor="?android:textColorPrimary" />
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/accountDialogRemove"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:text="@string/account_logout" />
-        </LinearLayout>
-    </LinearLayout>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/accountDialogRemove"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/accountDialogRecycler"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="8dp"
+        android:text="@string/account_logout" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 6747b7d0c..556bdfd09 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,12 +1,10 @@
 <?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/aboutRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_about" />
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 39b00d306..cd8b60364 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -153,8 +153,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/attendanceNextButton"
diff --git a/app/src/main/res/layout/fragment_contributor.xml b/app/src/main/res/layout/fragment_creator.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_contributor.xml
rename to app/src/main/res/layout/fragment_creator.xml
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index ed4094a50..1e1b0c99e 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/examNextButton"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index b3fcac448..ecc2e3e00 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:background="?android:windowBackground"
         android:padding="5dp"
-        android:visibility="gone"
+        android:visibility="invisible"
         tools:ignore="UnusedAttribute"
         tools:listitem="@layout/item_attendance_summary"
         tools:visibility="visible">
@@ -59,7 +59,9 @@
                         android:orientation="horizontal"
                         android:paddingStart="16dp"
                         android:paddingTop="5dp"
-                        android:paddingEnd="16dp">
+                        android:paddingEnd="16dp"
+                        android:visibility="invisible"
+                        tools:visibility="visible">
 
                         <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/gradeStatisticsTypePartial"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index 26381da6a..0fcde9c07 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/homeworkNextButton"
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
index f4105355c..80ecd6b10 100644
--- a/app/src/main/res/layout/fragment_license.xml
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -1,6 +1,5 @@
 <?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">
 
@@ -15,6 +14,5 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/licenseRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_license" />
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index 65af0b543..55bc62ae3 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -118,7 +118,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username|emailAddress"
-                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -152,7 +151,6 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index d91d7b037..ba261e095 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -67,6 +67,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
                         android:layout_weight="1"
                         android:text="@string/login_contact_email"
                         app:icon="@drawable/ic_more_messages" />
@@ -77,6 +78,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
+                        android:layout_marginLeft="8dp"
                         android:layout_weight="1"
                         android:text="@string/about_faq"
                         app:icon="@drawable/ic_about_faq" />
@@ -132,7 +134,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username|emailAddress"
-                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -166,7 +167,6 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
@@ -180,6 +180,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
                 android:text="@string/login_recover_button"
                 android:textAppearance="?android:textAppearance"
                 app:backgroundTint="?android:windowBackground"
@@ -220,9 +221,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
                 android:text="@string/login_advanced"
                 android:textAppearance="?android:textAppearance"
-                android:visibility="gone"
                 app:backgroundTint="?android:windowBackground"
                 app:fontFamily="sans-serif-medium"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
@@ -238,6 +239,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="48dp"
                 android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index f9c6c1572..64e06cbd5 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -24,10 +24,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone"
             tools:visibility="visible">
 
             <View
@@ -42,9 +42,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
-                android:layout_marginTop="16dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:gravity="center_horizontal"
                 android:text="@string/login_contact_header"
@@ -55,29 +55,28 @@
                 android:id="@+id/loginStudentSelectContactButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="horizontal"
                 android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:orientation="horizontal">
-
+                android:layout_marginRight="16dp">
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactEmail"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:id="@+id/loginStudentSelectContactEmail"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:layout_weight="1"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
                     android:text="@string/login_contact_email"
                     app:icon="@drawable/ic_more_messages" />
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactDiscord"
                     style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:id="@+id/loginStudentSelectContactDiscord"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
                     android:layout_weight="1"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
                     android:text="@string/login_contact_discord"
                     app:icon="@drawable/ic_about_discord" />
             </LinearLayout>
@@ -96,9 +95,9 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginLeft="32dp"
-            android:layout_marginTop="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginRight="32dp"
+            android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
             android:gravity="center_horizontal"
             android:text="@string/login_select_student"
@@ -130,8 +129,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
             android:layout_marginBottom="32dp"
-            android:enabled="false"
             android:text="@string/login_sign_in"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 533af2fa1..98ccabbff 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -139,8 +139,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/timetableNextButton"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 4934327c5..110670449 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -115,8 +115,8 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:gravity="center"
         android:orientation="horizontal"
+        android:gravity="center"
         tools:ignore="UnusedAttribute">
 
         <ImageButton
@@ -125,24 +125,24 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_prev"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitStart"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left" />
+            app:srcCompat="@drawable/ic_chevron_left"
+            android:contentDescription="@string/all_prev"/>
 
         <TextView
             android:id="@+id/completedLessonsNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
+            android:background="?selectableItemBackgroundBorderless"
             android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
+            android:text="@string/app_name"
+            android:textSize="16sp" />
 
         <ImageButton
             android:id="@+id/completedLessonsNextButton"
@@ -150,13 +150,13 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/all_next"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitEnd"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right" />
+            app:srcCompat="@drawable/ic_chevron_right"
+            android:contentDescription="@string/all_next" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/header_account.xml b/app/src/main/res/layout/header_account.xml
deleted file mode 100644
index 6219c26db..000000000
--- a/app/src/main/res/layout/header_account.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="24dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    tools:context=".ui.modules.account.AccountAdapter">
-
-    <TextView
-        android:id="@+id/accountHeaderEmail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="14sp"
-        tools:text="jan@fakelog.cf" />
-
-    <TextView
-        android:id="@+id/accountHeaderType"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="Konto ucznia" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index 43f089f73..3a2e38c59 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.exam.ExamAdapter">
+    tools:context=".ui.modules.exam.ExamHeader">
 
     <TextView
         android:id="@+id/examHeaderDay"
@@ -25,6 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="25.01.2020" />
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index f2ba9a8c9..75e01745f 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -1,93 +1,81 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:windowBackground">
+    android:background="?selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingLeft="16dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="14dp"
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsHeader">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/gradeHeaderContainer"
+    <TextView
+        android:id="@+id/gradeHeaderSubject"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_toStartOf="@id/gradeHeaderNote"
+        android:layout_toLeftOf="@id/gradeHeaderNote"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="15sp"
+        tools:text="Fizyka" />
 
-        <View
-            android:id="@+id/gradeHeaderDivider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:background="?android:attr/listDivider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/gradeHeaderAverage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/gradeHeaderSubject"
+        android:layout_marginTop="5dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Average: 6,00" />
 
-        <TextView
-            android:id="@+id/gradeHeaderSubject"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toStartOf="@id/gradeHeaderNote"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem/random" />
+    <TextView
+        android:id="@+id/gradeHeaderPointsSum"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/gradeHeaderSubject"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toEndOf="@+id/gradeHeaderAverage"
+        android:layout_toRightOf="@+id/gradeHeaderAverage"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Points: 123/200 (61,5%)" />
 
-        <TextView
-            android:id="@+id/gradeHeaderAverage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="10dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/gradeHeaderSubject"
-            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
-            tools:text="Average: 6,00" />
+    <TextView
+        android:id="@+id/gradeHeaderNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/gradeHeaderSubject"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toEndOf="@+id/gradeHeaderPointsSum"
+        android:layout_toRightOf="@+id/gradeHeaderPointsSum"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="12 grades" />
 
-        <TextView
-            android:id="@+id/gradeHeaderPointsSum"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
-            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverage"
-            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
-            tools:text="Points: 123/200 (61,5%)" />
-
-        <TextView
-            android:id="@+id/gradeHeaderNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
-            app:layout_constraintStart_toEndOf="@+id/gradeHeaderPointsSum"
-            app:layout_constraintTop_toBottomOf="@id/gradeHeaderSubject"
-            tools:text="12 grades" />
-
-        <TextView
-            android:id="@+id/gradeHeaderNote"
-            android:layout_width="wrap_content"
-            android:layout_height="20dp"
-            android:layout_marginEnd="12dp"
-            android:background="@drawable/background_header_note"
-            android:gravity="center"
-            android:minWidth="20dp"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textColor="?colorOnPrimary"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="255" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/gradeHeaderNote"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/background_header_note"
+        android:gravity="center"
+        android:minWidth="20dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:textColor="?colorOnPrimary"
+        android:textSize="14sp"
+        tools:text="255" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/header_homework.xml b/app/src/main/res/layout/header_homework.xml
index e1c6608f4..207fcdb40 100644
--- a/app/src/main/res/layout/header_homework.xml
+++ b/app/src/main/res/layout/header_homework.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.homework.HomeworkAdapter">
+    tools:context=".ui.modules.homework.HomeworkHeader">
 
     <TextView
         android:id="@+id/homeworkHeaderDay"
@@ -25,6 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="22.02.2022" />
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
index f988c47ba..b5dc3758c 100644
--- a/app/src/main/res/layout/item_about.xml
+++ b/app/src/main/res/layout/item_about.xml
@@ -4,16 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?selectableItemBackground"
-    tools:context=".ui.modules.about.AboutAdapter">
+    android:background="?selectableItemBackground">
 
     <ImageView
         android:id="@+id/aboutItemImage"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
         app:tint="?colorOnBackground"
         tools:ignore="ContentDescription"
         tools:src="@drawable/ic_all_about" />
@@ -23,7 +24,9 @@
         android:layout_width="wrap_content"
         android:layout_height="32dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
+        android:layout_toRightOf="@id/aboutItemImage"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -36,11 +39,13 @@
         android:layout_height="20dp"
         android:layout_below="@id/aboutItemTitle"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
+        android:layout_toRightOf="@id/aboutItemImage"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
         tools:text="@tools:sample/lorem" />
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 9568b345a..309be8121 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,67 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="56dp"
     android:background="?selectableItemBackground"
     android:orientation="horizontal"
-    android:paddingVertical="8dp"
-    android:paddingHorizontal="16dp"
-    tools:context=".ui.modules.account.AccountAdapter">
+    android:paddingStart="24dp"
+    android:paddingLeft="24dp"
+    android:paddingEnd="24dp"
+    android:paddingRight="24dp"
+    tools:context=".ui.modules.account.AccountItem">
 
     <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_centerVertical="true"
         app:srcCompat="@drawable/ic_all_account"
         tools:ignore="ContentDescription"
         tools:tint="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/accountItemName"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_alignTop="@+id/accountItemImage"
+        android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_toEndOf="@id/accountItemImage"
+        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/accountItemImage"
-        app:layout_constraintTop_toTopOf="@+id/accountItemImage"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/accountItemSchool"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_below="@id/accountItemName"
+        android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
         android:layout_marginTop="3dp"
+        android:layout_toEndOf="@id/accountItemImage"
+        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/accountItemImage"
-        app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
-
-    <TextView
-        android:id="@+id/accountItemLoginMode"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="3dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/accountItemImage"
-        app:layout_constraintTop_toBottomOf="@id/accountItemSchool"
-        tools:text="Tryb API mobilne"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index 6917c6ce0..56bcab440 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -11,7 +11,7 @@
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.attendance.AttendanceAdapter">
+    tools:context=".ui.modules.attendance.AttendanceItem">
 
     <LinearLayout
         android:id="@+id/attendanceItemNumberContainer"
@@ -29,8 +29,8 @@
             android:maxLength="2"
             android:textSize="32sp"
             android:visibility="gone"
-            tools:text="5"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            tools:text="5" />
 
         <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/attendanceItemExcuseCheckbox"
@@ -54,9 +54,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:layout_toStartOf="@id/attendanceItemAlert"
+        android:layout_toLeftOf="@id/attendanceItemAlert"
         android:layout_toEndOf="@+id/attendanceItemNumberContainer"
+        android:layout_toRightOf="@+id/attendanceItemNumberContainer"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -67,6 +71,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@id/attendanceItemSubject"
+        android:layout_alignLeft="@id/attendanceItemSubject"
         android:layout_alignBottom="@+id/attendanceItemNumberContainer"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -78,6 +83,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_mark"
         app:tint="?colorPrimary"
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index 155526299..b49461955 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,6 +20,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="January" />
@@ -46,6 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_present"
             android:textSize="14sp" />
@@ -56,7 +57,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="50" />
@@ -74,6 +77,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_unexcused"
             android:textSize="14sp" />
@@ -84,7 +88,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -102,6 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_excused"
             android:textSize="14sp" />
@@ -112,7 +119,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="25" />
@@ -130,6 +139,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_school"
             android:textSize="14sp" />
@@ -140,7 +150,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -158,6 +170,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_exemption"
             android:textSize="14sp" />
@@ -168,7 +181,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="6" />
@@ -186,6 +201,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_unexcused_lateness"
             android:textSize="14sp" />
@@ -196,7 +212,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -214,6 +232,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_excused_lateness"
             android:textSize="14sp" />
@@ -224,7 +243,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index b9beec804..8b49ba765 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -3,12 +3,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
+    android:background="@drawable/ic_all_divider"
+    android:foreground="?selectableItemBackground"
     android:paddingStart="8dp"
+    android:paddingLeft="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="12dp"
+    android:paddingRight="12dp"
     android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.completed.CompletedLessonsAdapter">
+    tools:context=".ui.modules.timetable.completed.CompletedLessonItem"
+    tools:ignore="UnusedAttribute">
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
@@ -28,9 +32,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:layout_toStartOf="@id/completedLessonItemAlert"
+        android:layout_toLeftOf="@id/completedLessonItemAlert"
         android:layout_toEndOf="@+id/completedLessonItemNumber"
+        android:layout_toRightOf="@+id/completedLessonItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -41,9 +49,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@id/completedLessonItemSubject"
+        android:layout_alignLeft="@id/completedLessonItemSubject"
         android:layout_alignEnd="@+id/completedLessonItemAlert"
+        android:layout_alignRight="@+id/completedLessonItemAlert"
         android:layout_alignBottom="@+id/completedLessonItemNumber"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -55,6 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:tint="?colorTimetableChange"
         app:srcCompat="@drawable/ic_timetable_swap"
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
index 36eb64ecc..e84faf59b 100644
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -3,31 +3,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
     android:minHeight="56dp"
-    android:orientation="vertical"
-    tools:context=".ui.modules.about.contributor.ContributorAdapter">
+    android:background="?selectableItemBackground"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/creatorItemAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:contentDescription="@string/contributor_avatar_description"
+        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:contentDescription="@string/contributor_avatar_description" />
+        android:layout_marginBottom="8dp"/>
 
     <TextView
         android:id="@+id/creatorItemName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@id/creatorItemAvatar"
         android:gravity="bottom"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem"
+        android:layout_centerVertical="true"
+        android:layout_toEndOf="@id/creatorItemAvatar"
+        android:layout_toRightOf="@id/creatorItemAvatar"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index bd1d47312..459a7ecb3 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -4,13 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.exam.ExamAdapter">
+    tools:context=".ui.modules.exam.ExamItem">
 
     <TextView
         android:id="@+id/examItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:textSize="15sp"
         tools:text="@tools:sample/lorem" />
@@ -21,6 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignStart="@id/examItemSubject"
+        android:layout_alignLeft="@id/examItemSubject"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
         android:textSize="13sp"
@@ -32,11 +34,15 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
         android:layout_marginBottom="10dp"
         android:layout_toEndOf="@id/examItemType"
+        android:layout_toRightOf="@id/examItemType"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index ccc968c08..d6d99d9b8 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -1,82 +1,82 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:windowBackground">
+    android:background="?selectableItemBackground"
+    android:paddingStart="12dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="12dp"
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsItem">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/gradeSubItemContainer"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/gradeItemValue"
+        android:layout_width="45dp"
+        android:layout_height="40dp"
+        android:layout_centerVertical="true"
+        android:background="@color/grade_material_default"
+        android:gravity="center"
+        android:maxLength="5"
+        android:textColor="@android:color/white"
+        android:textSize="16sp"
+        tools:text="6" />
+
+    <TextView
+        android:id="@+id/gradeItemDescription"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:paddingStart="12dp"
-        android:paddingTop="7dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="7dp"
-        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_toStartOf="@id/gradeItemNote"
+        android:layout_toLeftOf="@id/gradeItemNote"
+        android:layout_toEndOf="@+id/gradeItemValue"
+        android:layout_toRightOf="@+id/gradeItemValue"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="14sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemValue"
-            android:layout_width="45dp"
-            android:layout_height="40dp"
-            android:background="@color/grade_material_default"
-            android:gravity="center"
-            android:maxLength="5"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="6" />
+    <TextView
+        android:id="@+id/gradeItemDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/gradeItemDescription"
+        android:layout_alignLeft="@+id/gradeItemDescription"
+        android:layout_alignBottom="@+id/gradeItemValue"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemDescription"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
-            app:layout_constraintStart_toEndOf="@+id/gradeItemValue"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem" />
+    <TextView
+        android:id="@+id/gradeItemWeight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/gradeItemValue"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_toStartOf="@id/gradeItemNote"
+        android:layout_toLeftOf="@id/gradeItemNote"
+        android:layout_toEndOf="@+id/gradeItemDate"
+        android:layout_toRightOf="@+id/gradeItemDate"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
 
-        <TextView
-            android:id="@+id/gradeItemDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
-            app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
-            tools:text="@tools:sample/date/ddmmyy" />
-
-        <TextView
-            android:id="@+id/gradeItemWeight"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:maxLines="1"
-            android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeItemValue"
-            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
-            app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
-            tools:text="@tools:sample/lorem" />
-
-        <ImageView
-            android:id="@+id/gradeItemNote"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_all_round_mark"
-            app:tint="?colorPrimary"
-            tools:ignore="contentDescription" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</LinearLayout>
+    <ImageView
+        android:id="@+id/gradeItemNote"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        app:srcCompat="@drawable/ic_all_round_mark"
+        app:tint="?colorPrimary"
+        tools:ignore="contentDescription" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index 85a78571e..a3a49ab62 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
+    tools:context=".ui.modules.grade.summary.GradeSummaryItem">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,6 +21,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="@tools:sample/lorem" />
@@ -47,6 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_points"
             android:textSize="14sp" />
@@ -57,7 +59,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="123/150" />
@@ -75,6 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_predicted_grade"
             android:textSize="14sp" />
@@ -85,7 +90,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="5" />
@@ -103,6 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_final_grade"
             android:textSize="14sp" />
@@ -113,7 +121,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="5" />
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 89c3c6885..62566e9c2 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.homework.HomeworkAdapter">
+    tools:context=".ui.modules.homework.HomeworkItem">
 
     <TextView
         android:id="@+id/homeworkItemSubject"
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..bfd246c83 100644
--- a/app/src/main/res/layout/item_homework_dialog_details.xml
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,29 +7,6 @@
     android:paddingTop="20dp"
     android:paddingEnd="20dp">
 
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen"
-        android:layout_width="wrap_content"
-        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" />
-
-    <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"
diff --git a/app/src/main/res/layout/item_license.xml b/app/src/main/res/layout/item_license.xml
index aaa7cd349..f44c211ca 100644
--- a/app/src/main/res/layout/item_license.xml
+++ b/app/src/main/res/layout/item_license.xml
@@ -8,8 +8,7 @@
     android:paddingStart="16dp"
     android:paddingLeft="16dp"
     android:paddingEnd="16dp"
-    android:paddingRight="16dp"
-    tools:context=".ui.modules.about.license.LicenseAdapter">
+    android:paddingRight="16dp">
 
     <TextView
         android:id="@+id/licenseItemName"
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
index 04858196c..941159eb1 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -3,20 +3,21 @@
     android:id="@+id/loginItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
     android:minHeight="72dp"
-    android:paddingTop="8dp"
+    android:background="?selectableItemBackground"
     android:paddingBottom="8dp"
-    tools:context=".ui.modules.login.studentselect.LoginStudentSelectAdapter">
+    android:paddingTop="8dp">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/loginItemCheck"
         android:layout_width="32dp"
         android:layout_height="24dp"
-        android:layout_centerVertical="true"
         android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
         android:layout_marginEnd="28dp"
+        android:layout_marginRight="28dp"
         android:background="@android:color/transparent"
+        android:layout_centerVertical="true"
         tools:text=" " />
 
     <TextView
@@ -24,7 +25,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
+        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -37,7 +40,9 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/loginItemName"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
+        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="2"
@@ -51,14 +56,16 @@
         android:layout_height="20dp"
         android:layout_below="@id/loginItemSchool"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
+        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
-        android:enabled="false"
         android:gravity="bottom"
         android:maxLines="1"
-        android:text="@string/login_signed_in"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
+        android:text="@string/login_signed_in"
+        android:enabled="false"
         android:visibility="gone"
         tools:visibility="visible" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 111de88c9..4379c2fc2 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -9,13 +9,14 @@
     android:paddingTop="10dp"
     android:paddingRight="16dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.message.tab.MessageTabAdapter">
+    tools:context=".ui.modules.message.MessageItem">
 
     <TextView
         android:id="@+id/messageItemAuthor"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
         android:ellipsize="end"
         android:singleLine="true"
         android:textSize="15sp"
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
index 83a4406bb..6c130909d 100644
--- a/app/src/main/res/layout/item_message_preview.xml
+++ b/app/src/main/res/layout/item_message_preview.xml
@@ -1,6 +1,5 @@
 <?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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messagePreviewContentContainer"
     android:layout_width="match_parent"
@@ -10,84 +9,37 @@
 
     <TextView
         android:id="@+id/messagePreviewSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
         android:lineSpacingMultiplier="1.2"
         android:textSize="22sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem" />
 
     <TextView
-        android:id="@+id/messagePreviewFromLabel"
+        android:id="@+id/messagePreviewAuthor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:text="@string/message_from"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewSubject" />
-
-    <TextView
-        android:id="@+id/messagePreviewFromSender"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:maxLines="1"
+        android:layout_marginBottom="4dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/messagePreviewFromLabel"
-        app:layout_constraintTop_toTopOf="@id/messagePreviewFromLabel"
-        tools:text="@tools:sample/full_names[0]" />
-
-    <TextView
-        android:id="@+id/messagePreviewToLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:text="@string/message_to"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewFromLabel" />
-
-    <TextView
-        android:id="@+id/messagePreviewToRecipient"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/messagePreviewToLabel"
-        app:layout_constraintTop_toTopOf="@id/messagePreviewToLabel"
-        tools:text="@tools:sample/full_names[1]" />
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/messagePreviewDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginBottom="15dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewToLabel"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/messagePreviewContent"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
         android:autoLink="web"
         android:lineSpacingMultiplier="1.2"
         android:textIsSelectable="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewDate"
         tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index 3f3d0a751..95159d9bd 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -4,14 +4,16 @@
     android:id="@+id/mobileDevice_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    tools:context=".ui.modules.mobiledevice.MobileDeviceAdapter">
+    tools:context=".ui.modules.mobiledevice.MobileDeviceItem">
 
     <TextView
         android:id="@+id/mobileDeviceItemName"
         android:layout_width="match_parent"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
+        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -24,7 +26,9 @@
         android:layout_height="20dp"
         android:layout_below="@id/mobileDeviceItemName"
         android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
+        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:gravity="bottom"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
@@ -35,6 +39,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index c9063ccfe..6a941b96d 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -10,7 +10,7 @@
     android:paddingTop="8dp"
     android:paddingRight="16dp"
     android:paddingBottom="8dp"
-    tools:context=".ui.modules.more.MoreAdapter">
+    tools:context=".ui.modules.more.MoreItem">
 
     <ImageView
         android:id="@+id/moreItemImage"
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
+        android:layout_marginLeft="32dp"
         android:textSize="16sp"
         tools:text="@tools:sample/lorem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 660f32e00..3a56f9de7 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.note.NoteAdapter">
+    tools:context=".ui.modules.note.NoteItem">
 
     <TextView
         android:id="@+id/noteItemDate"
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
index a30eb560b..3bac0573c 100644
--- a/app/src/main/res/layout/item_teacher.xml
+++ b/app/src/main/res/layout/item_teacher.xml
@@ -9,7 +9,7 @@
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.schoolandteachers.teacher.TeacherAdapter">
+    tools:context=".ui.modules.schoolandteachers.teacher.TeacherItem">
 
     <TextView
         android:id="@+id/teacherItemName"
@@ -17,6 +17,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -27,8 +28,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
+        android:layout_marginLeft="4dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
         android:layout_toEndOf="@+id/teacherItemName"
+        android:layout_toRightOf="@+id/teacherItemName"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="17sp"
@@ -40,6 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/teacherItemName"
         android:layout_alignStart="@id/teacherItemName"
+        android:layout_alignLeft="@id/teacherItemName"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index 4e278261a..fcdae2e0a 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,15 +1,15 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/relativeLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:paddingStart="8dp"
+    android:paddingLeft="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="12dp"
+    android:paddingRight="12dp"
     android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.TimetableAdapter">
+    tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableItemNumber"
@@ -18,61 +18,67 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
-        android:textColor="?android:textColorPrimary"
         android:textSize="32sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="?android:textColorPrimary"
         tools:text="5" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_toEndOf="@+id/timetableItemTimeStart"
+        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="?android:textColorPrimary"
         android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@id/timetableItemTimeBarrier"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColor="?android:textColorPrimary"
         tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/timetableItemTimeStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/timetableItemNumber"
+        android:layout_toRightOf="@id/timetableItemNumber"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
+        android:layout_alignTop="@id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
-        app:layout_constraintTop_toTopOf="@id/timetableItemNumber"
         tools:text="11:11" />
 
     <TextView
         android:id="@+id/timetableItemTimeFinish"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/timetableItemNumber"
+        android:layout_toRightOf="@id/timetableItemNumber"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
+        android:layout_alignBottom="@+id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
         tools:text="12:00" />
 
     <TextView
         android:id="@+id/timetableItemRoom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_toEndOf="@+id/timetableItemTimeStart"
+        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
         tools:text="22"
         tools:visibility="gone" />
 
@@ -80,78 +86,35 @@
         android:id="@+id/timetableItemTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginEnd="16dp"
-        android:ellipsize="end"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/timetableItemRoom"
+        android:layout_toRightOf="@id/timetableItemRoom"
         android:maxLines="1"
+        android:ellipsize="end"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@id/timetableItemRoom"
         tools:text="Agata Kowalska - Błaszczyk"
         tools:visibility="gone" />
 
     <TextView
         android:id="@+id/timetableItemDescription"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/timetableItemTimeFinish"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="0dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@+id/timetableItemTimeStart"
+        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:textColor="?colorTimetableChange"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
-        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
         tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
         tools:visibility="visible" />
 
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/timetableItemTimeBarrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="start"
-        app:constraint_referenced_ids="timetableItemTimeUntil,timetableItemTimeLeft" />
-
-    <TextView
-        android:id="@+id/timetableItemTimeUntil"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:textColor="?colorPrimary"
-        android:textSize="13sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="za 15 min"
-        tools:visibility="gone" />
-
-    <TextView
-        android:id="@+id/timetableItemTimeLeft"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="4dp"
-        android:background="@drawable/background_timetable_time_left"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:paddingLeft="7dp"
-        android:paddingTop="2dp"
-        android:paddingRight="7dp"
-        android:paddingBottom="2dp"
-        android:textColor="?colorOnPrimary"
-        android:textSize="13sp"
-        android:visibility="gone"
-        app:backgroundTint="?colorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="jeszcze 15 min"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_timetable_small.xml b/app/src/main/res/layout/item_timetable_small.xml
index 98a213ec3..7a5ab033f 100644
--- a/app/src/main/res/layout/item_timetable_small.xml
+++ b/app/src/main/res/layout/item_timetable_small.xml
@@ -3,13 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.timetable.TimetableAdapter">
+    tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableSmallItemNumber"
         android:layout_width="40dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:gravity="center"
         android:maxLength="2"
         android:textColor="?android:textColorPrimary"
@@ -22,8 +23,10 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/timetableSmallItemNumber"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginTop="1dp"
         android:layout_toEndOf="@id/timetableSmallItemNumber"
+        android:layout_toRightOf="@id/timetableSmallItemNumber"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
         tools:text="11:11" />
@@ -34,7 +37,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_toEndOf="@+id/timetableSmallItemTimeStart"
+        android:layout_toRightOf="@+id/timetableSmallItemTimeStart"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorPrimary"
@@ -46,8 +51,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="1dp"
         android:layout_toEndOf="@+id/timetableSmallItemSubject"
+        android:layout_toRightOf="@+id/timetableSmallItemSubject"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
@@ -58,8 +65,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="1dp"
         android:layout_toEndOf="@id/timetableSmallItemRoom"
+        android:layout_toRightOf="@id/timetableSmallItemRoom"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -71,9 +80,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginTop="1dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/timetableSmallItemTeacher"
+        android:layout_toRightOf="@id/timetableSmallItemTeacher"
         android:ellipsize="end"
         android:singleLine="true"
         android:textColor="?android:textColorSecondary"
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 33f686dac..c69bade8a 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -12,12 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/white"
-        android:paddingStart="6dp"
-        android:paddingLeft="6dp"
         android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:paddingEnd="12dp"
-        android:paddingRight="12dp"
-        android:paddingBottom="6dp">
+        android:paddingRight="12dp">
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
@@ -26,8 +26,8 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
-            android:textColor="?android:textColorPrimary"
             android:textSize="28sp"
+            android:textColor="@android:color/black"
             tools:text="5" />
 
         <TextView
@@ -43,19 +43,19 @@
             android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@android:color/black"
             android:textSize="15sp"
+            android:textColor="@android:color/black"
             tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
             android:layout_toRightOf="@id/timetableWidgetItemNumber"
+            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
+            android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/black"
             android:textSize="13sp"
@@ -116,15 +116,15 @@
             android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
-            android:layout_marginTop="0dp"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
+            android:layout_marginTop="0dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
             android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:textColor="@color/timetable_change_dark"
             android:textSize="13sp"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone" />
+            tools:visibility="gone"/>
     </RelativeLayout>
 
     <FrameLayout
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 3dfc3f548..3a143f747 100644
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -12,10 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorWidgetBackground"
-        android:paddingStart="6dp"
         android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:paddingEnd="12dp"
-        android:paddingBottom="6dp">
+        android:paddingRight="12dp">
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
@@ -24,8 +26,8 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
-            android:textColor="@android:color/white"
             android:textSize="28sp"
+            android:textColor="@android:color/white"
             tools:text="5" />
 
         <TextView
@@ -34,21 +36,26 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@android:color/white"
             android:textSize="15sp"
+            android:textColor="@android:color/white"
             tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
+            android:layout_toRightOf="@id/timetableWidgetItemNumber"
+            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
+            android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -60,7 +67,9 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="6dp"
+            android:layout_marginLeft="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
+            android:layout_toRightOf="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -72,7 +81,9 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -85,8 +96,11 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:layout_toEndOf="@id/timetableWidgetItemRoom"
+            android:layout_toRightOf="@id/timetableWidgetItemRoom"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/timetable_change_light"
@@ -101,13 +115,16 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="0dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="0dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
+            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:textColor="@color/timetable_change_light"
             android:textSize="13sp"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone" />
+            tools:visibility="gone"/>
     </RelativeLayout>
 
     <FrameLayout
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 3a3a2d658..61d03725a 100644
--- a/app/src/main/res/layout/item_widget_timetable_small.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small.xml
@@ -29,6 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginLeft="6dp"
             android:maxLines="1"
             android:textColor="@android:color/black"
             android:textSize="13sp"
@@ -45,6 +46,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@android:color/black"
@@ -57,6 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:maxLines="1"
             android:textColor="@android:color/black"
             android:textSize="15sp"
@@ -67,12 +70,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@android:color/black"
             android:textSize="15sp"
             tools:text="Agata" />
-
         <TextView
             android:id="@+id/timetableWidgetItemDescription"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
index 72186bf79..9b7bb7324 100644
--- a/app/src/main/res/layout/scrollable_header_about.xml
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="104dp"
-    android:orientation="vertical"
-    tools:context=".ui.modules.about.AboutAdapter">
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/aboutScrollableHeaderIcon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/scrollable_header_attendance_summary.xml b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
index 4593a5b6a..94de11076 100644
--- a/app/src/main/res/layout/scrollable_header_attendance_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
@@ -6,8 +6,7 @@
     android:layout_marginTop="20dp"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="vertical"
-    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="match_parent"
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..ec069f8cf 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -5,14 +5,14 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="horizontal"
-    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
+    android:orientation="horizontal">
 
     <LinearLayout
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="5dp"
+        android:layout_marginRight="5dp"
         android:orientation="vertical">
 
         <TextView
@@ -54,4 +54,4 @@
             android:textSize="21sp"
             tools:text="6,00" />
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 8a08b5d24..aa2269ad0 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -16,7 +16,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/timetableWidgetAccount"
+            android:layout_toLeftOf="@id/timetableWidgetAccount"
             android:layout_toEndOf="@id/timetableWidgetNext"
+            android:layout_toRightOf="@id/timetableWidgetNext"
             android:orientation="vertical">
 
             <TextView
@@ -24,6 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="15sp"
@@ -34,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="13sp"
@@ -45,6 +49,7 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -55,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
             android:src="@drawable/ic_widget_chevron"
@@ -66,6 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
index 5533eaeee..3a301eb94 100644
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ b/app/src/main/res/layout/widget_timetable_dark.xml
@@ -16,7 +16,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/timetableWidgetAccount"
+            android:layout_toLeftOf="@id/timetableWidgetAccount"
             android:layout_toEndOf="@id/timetableWidgetNext"
+            android:layout_toRightOf="@id/timetableWidgetNext"
             android:orientation="vertical">
 
             <TextView
@@ -24,6 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="15sp"
@@ -34,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="13sp"
@@ -45,6 +49,7 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -55,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorWidgetNavButton"
             android:contentDescription="@string/all_prev"
             android:src="@drawable/ic_widget_chevron"
@@ -66,6 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorWidgetNavButton"
             android:contentDescription="@string/all_next"
             android:rotation="180"
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index 4c1332e10..dfc12e234 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -22,18 +22,4 @@
         android:title="@string/message_delete"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/messagePreviewMenuShare"
-        android:icon="@drawable/ic_menu_message_share"
-        android:orderInCategory="1"
-        android:title="@string/message_share"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/messagePreviewMenuPrint"
-        android:icon="@drawable/ic_menu_message_print"
-        android:orderInCategory="1"
-        android:title="@string/message_print"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_message_tab.xml b/app/src/main/res/menu/action_menu_message_tab.xml
deleted file mode 100644
index 18d348757..000000000
--- a/app/src/main/res/menu/action_menu_message_tab.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/action_search"
-        android:icon="@drawable/ic_search"
-        android:title="@string/all_search"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="collapseActionView|ifRoom" />
-</menu>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index 11935b49b..8eae84194 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -1,18 +1,5 @@
 <?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>Licht</item>
-        <item>Dunkel</item>
-        <item>Schwarz (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>System Sprache</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-    </string-array>
     <string-array name="services_interval_entries">
         <item>15 Minuten</item>
         <item>30 Minuten</item>
@@ -22,6 +9,22 @@
         <item>12 Stunden</item>
         <item>24 Stunden</item>
     </string-array>
+
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Licht</item>
+        <item>Dunkel</item>
+        <item>Schwarz (AMOLED)</item>
+    </string-array>
+
+    <string-array name="app_language_entries">
+        <item>System Sprache</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
+
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
         <item>0,25</item>
@@ -29,16 +32,18 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
         <item>Farben der Bewertungen im Logbuch</item>
     </string-array>
+
     <string-array name="grade_average_mode_entries">
         <item>Durchschnittsnote für das 2. Semester</item>
-        <item>Durchschnitt der Noten aus beiden Semestern</item>
-        <item>Durchschnitt der Noten aus dem ganzen Jahr</item>
+        <item>Durchschnitt der Bewertungen für das ganze Jahr</item>
     </string-array>
+
     <string-array name="timetable_show_whole_class_entries">
         <item>Nicht zeigen</item>
         <item>Alle zeigen</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 42169ca53..239c40437 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Anmelden</string>
     <string name="main_title">Wulkanowy</string>
@@ -18,8 +21,11 @@
     <string name="note_title">Eintragen und Erfolgen</string>
     <string name="homework_title">Hausaufgaben</string>
     <string name="account_title">Wählen Sie ein Konto</string>
+
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %d, %d/%d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Melden Sie sich mit dem Studenten- oder Elternkonto an</string>
     <string name="login_header_symbol">Geben Sie das Symbol</string>
@@ -47,28 +53,27 @@
     <string name="login_incorrect_symbol">Student nicht gefunden. Überprüfen Sie das Symbol</string>
     <string name="login_field_required">Dieses Datenfeld ist erforderlich</string>
     <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
-    <string name="login_symbol_helper">Das Symbol finden Sie auf der Registerseite unter&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_symbol_helper">Das Symbol finden Sie auf der Registerseite unter <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen.</string>
     <string name="login_advanced">Andere Optionen</string>
-    <string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
-    <string name="login_advanced_warning_scraper">In diesem Modus werden dieselben Daten angezeigt, die auf der Klassenbuch-Website angezeigt werden</string>
-    <string name="login_advanced_warning_hybrid">Die Kombination der besten Eigenschaften der beiden anderen Modus. Es arbeitet schneller als Scraper und bietet Funktionen, die im mobilen API-Modus nicht verfügbar sind. Es ist in der experimentellen Phase</string>
     <string name="login_privacy_policy">Datenschutzerklärung</string>
     <string name="login_contact_header">Probleme bei der Anmeldung? Kontaktieren Sie uns!</string>
     <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 das richtige UONET + Klassenbuch ausgewählt ist!</string>
     <string name="login_recover_button">Ich habe mein Passwort vergessen.</string>
     <string name="login_recover_title">Ihr Konto wiederherstellen</string>
     <string name="login_recover">Wiederherstellen</string>
     <string name="login_signed_in">Student ist bereits angemeldet</string>
+
+
     <!--Main-->
     <string name="main_account_picker">Kundenbetreuer</string>
     <string name="main_log_in">Anmelden</string>
     <string name="main_session_expired">Die Sitzung ist abgelaufen</string>
     <string name="main_session_relogin">Die Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein</string>
+
+
     <!--Grade-->
     <string name="grade_header">Note</string>
     <string name="grade_semester">Semester %d</string>
@@ -103,26 +108,12 @@
         <item quantity="one">Neue Note</item>
         <item quantity="other">Neue Noten</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">Neue vorhergesagte Note</item>
-        <item quantity="other">Neue vorhergesagte Noten</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">Neue Abschlussnote</item>
-        <item quantity="other">Neue Abschlussnoten</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Du hast %1$d Note bekommen</item>
         <item quantity="other">Du hast %1$d Noten bekommen</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Sie haben %1$d vorhergesagte Note bekommen</item>
-        <item quantity="other">Sie haben %1$d vorhergesagte Noten bekommen</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">Sie haben %1$d Abschlussnote bekommen</item>
-        <item quantity="other">Sie haben %1$d Abschlussnoten bekommen</item>
-    </plurals>
+
+
     <!--Timetable-->
     <string name="timetable_lesson">Lektion</string>
     <string name="timetable_room">Klassenzimmer</string>
@@ -130,21 +121,17 @@
     <string name="timetable_time">Stunden</string>
     <string name="timetable_changes">Änderungen</string>
     <string name="timetable_no_items">Kein Unterricht an diesem Tag</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sek</string>
-    <string name="timetable_time_left">noch %1$s</string>
-    <string name="timetable_time_until">in %1$s</string>
-    <string name="timetable_finished">Fertig</string>
-    <string name="timetable_now">Jetzt: %s</string>
-    <string name="timetable_next">In einem Moment: %s</string>
-    <string name="timetable_later">Später: %s</string>
-    <!--Completed lessons-->
+
+
+    <!--CompletedLesson-->
     <string name="completed_lessons_title">Beendete Lektionen</string>
     <string name="completed_lessons_button">Beendete Lektionen anzeigen</string>
     <string name="completed_lessons_no_items">Keine Informationen über beendete Lektionen</string>
     <string name="completed_lessons_topic">Thema</string>
     <string name="completed_lessons_absence">Abwesenheit</string>
     <string name="completed_lessons_resources">Ressourcen</string>
+
+
     <!--Attendance-->
     <string name="attendance_summary_button">Übersicht über die Schulbesuch</string>
     <string name="attendance_absence_school">Aus schulischen Gründen abwesend</string>
@@ -165,13 +152,19 @@
     <string name="attendance_excuse_success">Abwesenheit erfolgreich entschuldigt!</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>
+
+
     <!--Message-->
     <string name="message_inbox">Posteingang</string>
     <string name="message_sent">Gesendet</string>
@@ -188,8 +181,6 @@
     <string name="message_move_to_bin">In den Korb wandern</string>
     <string name="message_delete_forever">Dauerhaft löschen</string>
     <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
-    <string name="message_share">Teilen</string>
-    <string name="message_print">Drucken</string>
     <string name="message_subject">Thema</string>
     <string name="message_content">Inhalt</string>
     <string name="message_send_successful">Nachricht erfolgreich gesendet</string>
@@ -207,6 +198,8 @@
         <item quantity="one">Du hast %1$d nachricht bekommen</item>
         <item quantity="other">Du hast %1$d nachrichten bekommen</item>
     </plurals>
+
+
     <!--Note-->
     <string name="note_no_items">Keine Informationen über Eintragen</string>
     <string name="note_points">Punkte</string>
@@ -222,17 +215,23 @@
         <item quantity="one">Du hast %1$d Eintrag bekommen</item>
         <item quantity="other">Du hast %1$d Eintragen bekommen</item>
     </plurals>
+
+
     <!--Homework-->
     <string name="homework_no_items">Keine Informationen über Hausaufgaben</string>
     <string name="homework_mark_as_done">Gemacht</string>
     <string name="homework_mark_as_undone">Unvollständig</string>
     <string name="homework_attachments">Anhänge</string>
+
+
     <!--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_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">"Die heutige Glücksnummer ist: "</string>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile Geräte</string>
     <string name="mobile_devices_no_items">Keine Geräte</string>
@@ -242,8 +241,12 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
+
+
     <!--School and teachers-->
     <string name="schoolandteachers_title">Schule und Lehrer</string>
+
+
     <!--School-->
     <string name="school_title">Schule</string>
     <string name="school_no_info">Keine Informationen über die Schule</string>
@@ -254,19 +257,21 @@
     <string name="school_pedagogue">Name des Pädagogen</string>
     <string name="school_address_button">Auf Karte anzeigen</string>
     <string name="school_telephone_button">Rufen Sie an</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Lehrerinnen und Lehrer</string>
     <string name="teacher_no_items">Keine Informationen über Lehrer</string>
     <string name="teacher_no_subject">Kein Thema</string>
+
+
     <!--Account-->
     <string name="account_add_new">Konto hinzufügen</string>
     <string name="account_logout">Abmelden</string>
     <string name="account_confirm">Wollen Sie sich von einem aktiven Studenten abmelden?</string>
     <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>
+
+
     <!--About-->
     <string name="about_version">Version der App</string>
     <string name="about_contributor">Mitarbeiter</string>
@@ -283,17 +288,21 @@
     <string name="about_homepage_summary">Besuchen Sie die Website und helfen Sie bei der Entwicklung der Anwendung</string>
     <string name="about_licenses">Lizenzen</string>
     <string name="about_licenses_summary">Lizenzen der in der Anwendung verwendeten Bibliotheken</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">Lizenz</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Benutzerbild</string>
+
+
+    <!--Creators-->
+    <string name="contributor_avatar_description">Avatar</string>
     <string name="contributor_see_more">Sehen Sie mehr auf GitHub</string>
+
     <!--Log viewer-->
     <string name="logviewer_share">Logs teilen</string>
     <string name="logviewer_refresh">Aktualisieren</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>
+
+
     <!--Generic-->
     <string name="all_content">Inhalt</string>
     <string name="all_retry">Wiederhol</string>
@@ -310,14 +319,15 @@
     <string name="all_subject">Thema</string>
     <string name="all_prev">Zurück</string>
     <string name="all_next">Nächste</string>
-    <string name="all_search">Suchen</string>
-    <string name="all_search_hint">Suchen…</string>
+
+
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Keine Lektionen</string>
     <string name="widget_timetable_theme_title">Thema wählen</string>
     <string name="widget_timetable_theme_light">Licht</string>
     <string name="widget_timetable_theme_dark">Dunkel</string>
-    <string name="widget_timetable_theme_system">Systemthema</string>
+
+
     <!--Preferences-->
     <string name="pref_view_header">Erscheinungsbild</string>
     <string name="pref_view_list">Standard Ansicht</string>
@@ -326,35 +336,23 @@
     <string name="pref_view_present">Anwesenheit in Schulbesuch zeigen</string>
     <string name="pref_view_app_theme">Thema der Anwendung</string>
     <string name="pref_view_expand_grade">Noten erweitern</string>
-    <string name="pref_view_timetable_show_timers">Aktuelle Lektion im Stundenplan markieren</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_grade_color_scheme">Farbschema der Noten</string>
     <string name="pref_view_app_language">App Sprache</string>
     <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_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>
     <string name="pref_notify_debug_switch">Debug-Benachrichtigungen anzeigen</string>
     <string name="pref_services_header">Synchronisierung</string>
     <string name="pref_services_switch">Automatische Aktualisierung</string>
     <string name="pref_services_suspended">An Feiertagen suspendiert</string>
     <string name="pref_services_interval">Aktualisierungsintervall</string>
     <string name="pref_services_wifi">Nur Wi-Fi</string>
-    <string name="pref_services_force_sync">Jetzt synchronisieren</string>
-    <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_dialog_force_sync_title">Synchronisation</string>
-    <string name="pref_services_dialog_force_sync_summary">        Die manuelle Synchronisierung aktualisiert die App-Ansichten nicht.
-        \nUm die synchronisierten Daten anzuzeigen, starten Sie die App nach der Synchronisierung neu.
-    </string>
     <string name="pref_other_header">Andere</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>
+
+
     <!--Notification Channels-->
     <string name="channel_new_entries">Neue Einträge im Klassenbuch</string>
     <string name="channel_new_grades">Neue Noten</string>
@@ -362,8 +360,9 @@
     <string name="channel_new_message">Neue Nachrichten</string>
     <string name="channel_new_notes">Neue Eintragen</string>
     <string name="channel_push">Push-Benachrichtigungen</string>
-    <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
     <string name="channel_debug">Debuggen</string>
+
+
     <!--Colors-->
     <string name="all_black">Schwarz</string>
     <string name="all_red">Rot</string>
@@ -371,9 +370,13 @@
     <string name="all_green">Grün</string>
     <string name="all_purple">Violett</string>
     <string name="all_empty_color">Keine Farbe</string>
+
+
     <!--Others-->
     <string name="all_copied">Kopiert</string>
     <string name="all_undo">lösen</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">Keine Internetverbindung</string>
     <string name="error_timeout">Das Zeitlimit für die Verbindung zum Klassenbuch ist abgelaufen</string>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index a06a46f00..492645381 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -8,8 +8,6 @@
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/black
-        </item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="mdtp_theme_dark">true</item>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 1d81fb586..5553760a1 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -1,18 +1,5 @@
 <?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>Jasny</item>
-        <item>Ciemny</item>
-        <item>Czarny (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>Język systemu</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-    </string-array>
     <string-array name="services_interval_entries">
         <item>15 minut</item>
         <item>30 minut</item>
@@ -22,6 +9,22 @@
         <item>12 godzin</item>
         <item>24 godziny</item>
     </string-array>
+
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Jasny</item>
+        <item>Ciemny</item>
+        <item>Czarny (AMOLED)</item>
+    </string-array>
+
+    <string-array name="app_language_entries">
+        <item>Język systemu</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+    </string-array>
+
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
         <item>0,25</item>
@@ -29,16 +32,18 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
         <item>Kolory ocen w dzienniku</item>
     </string-array>
+
     <string-array name="grade_average_mode_entries">
-        <item>Średnia ocen z drugiego semestru</item>
-        <item>Średnia średnich z obu semestrów</item>
-        <item>Średnia wszystkich ocen z całego roku</item>
+        <item>Średnia ocen z 2 semestru</item>
+        <item>Średnia ocen z całego roku</item>
     </string-array>
+
     <string-array name="timetable_show_whole_class_entries">
         <item>Nie pokazuj</item>
         <item>Pokazuj wszystkie</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e4d3e9029..742d61ed2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
@@ -18,8 +22,11 @@
     <string name="note_title">Uwagi i osiągnięcia</string>
     <string name="homework_title">Zadania domowe</string>
     <string name="account_title">Wybierz konto</string>
+
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %d, %d/%d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
     <string name="login_header_symbol">Podaj symbol</string>
@@ -28,13 +35,13 @@
     <string name="login_login_pesel_email_hint">Login, PESEL lub e-mail</string>
     <string name="login_password_hint">Hasło</string>
     <string name="login_host_hint">Dziennik UONET+</string>
+    <string name="login_symbol_hint">Symbol</string>
     <string name="login_type_api">Mobilne API</string>
     <string name="login_type_scrapper">Scraper</string>
     <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>
     <string name="login_incorrect_password">Dane logowania są niepoprawne. Upewnij się, że został wybrany odpowiedni dziennik UONET+ w polu poniżej</string>
@@ -47,7 +54,7 @@
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
     <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
-    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nUpewnij się, że w polu <b>Dziennik UONET+</b> na poprzednim ekranie został ustawiony odpowiedni dziennik</string>
+    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
     <string name="login_advanced">Inne opcje</string>
     <string name="login_advanced_warning_mobile_api">W tym trybie nie działa szczęśliwy numerek, uczeń na tle klasy, podsumowanie frekwencji, usprawiedliwianie nieobecności, lekcje zrealizowane, informacje o szkole i podgląd listy zarejestrowanych urządzeń</string>
@@ -58,17 +65,20 @@
     <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ł wybrany odpowiedni dziennik UONET+!</string>
     <string name="login_recover_button">Nie pamiętam hasła</string>
     <string name="login_recover_title">Przywróć swoje konto</string>
     <string name="login_recover">Przywróć</string>
     <string name="login_signed_in">Uczeń jest już zalogowany</string>
+
+
     <!--Main-->
     <string name="main_account_picker">Menadżer kont</string>
     <string name="main_log_in">Zaloguj się</string>
     <string name="main_session_expired">Sesja wygasła</string>
     <string name="main_session_relogin">Sesja wygasła, zaloguj się ponownie</string>
+
+
     <!--Grade-->
     <string name="grade_header">Ocena</string>
     <string name="grade_semester">Semestr %d</string>
@@ -107,36 +117,14 @@
         <item quantity="many">Nowe oceny</item>
         <item quantity="other">Nowe oceny</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">Nowa ocena przewidywana</item>
-        <item quantity="few">Nowe oceny przewidywane</item>
-        <item quantity="many">Nowe oceny przewidywane</item>
-        <item quantity="other">Nowe oceny przewidywane</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">Nowa ocena końcowa</item>
-        <item quantity="few">Nowe oceny końcowe</item>
-        <item quantity="many">Nowe oceny końcowe</item>
-        <item quantity="other">Nowe oceny końcowe</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Masz %1$d nową ocenę</item>
         <item quantity="few">Masz %1$d nowe oceny</item>
         <item quantity="many">Masz %1$d nowych ocen</item>
         <item quantity="other">Masz %1$d nowych ocen</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Masz %1$d nową przewidywaną ocenę</item>
-        <item quantity="few">Masz %1$d nowe przewidywane oceny</item>
-        <item quantity="many">Masz %1$d nowych przewidywanych ocen</item>
-        <item quantity="other">Masz %1$d nowych przewidywanych ocen</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">Masz %1$d nową końcową ocenę</item>
-        <item quantity="few">Masz %1$d nowe końcowe oceny</item>
-        <item quantity="many">Masz %1$d nowych końcowych ocen</item>
-        <item quantity="other">Masz %1$d nowych końcowych ocen</item>
-    </plurals>
+
+
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -144,21 +132,17 @@
     <string name="timetable_time">Godziny</string>
     <string name="timetable_changes">Zmiany</string>
     <string name="timetable_no_items">Brak lekcji w tym dniu</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sek</string>
-    <string name="timetable_time_left">jeszcze %1$s</string>
-    <string name="timetable_time_until">za %1$s</string>
-    <string name="timetable_finished">Zakończona</string>
-    <string name="timetable_now">Teraz: %s</string>
-    <string name="timetable_next">Za chwilę: %s</string>
-    <string name="timetable_later">Później: %s</string>
-    <!--Completed lessons-->
+
+
+    <!--CompletedLesson-->
     <string name="completed_lessons_title">Lekcje zrealizowane</string>
     <string name="completed_lessons_button">Zobacz lekcje zrealizowane</string>
     <string name="completed_lessons_no_items">Brak informacji o lekcjach zrealizowanych</string>
     <string name="completed_lessons_topic">Temat</string>
     <string name="completed_lessons_absence">Nieobecność</string>
     <string name="completed_lessons_resources">Zasoby</string>
+
+
     <!--Attendance-->
     <string name="attendance_summary_button">Podsumowanie frekwencji</string>
     <string name="attendance_absence_school">Nieobecność z przyczyn szkolnych</string>
@@ -181,13 +165,19 @@
     <string name="attendance_excuse_success">Usprawiedliwiono pomyślnie!</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>
+
+
     <!--Message-->
     <string name="message_inbox">Odebrane</string>
     <string name="message_sent">Wysłane</string>
@@ -204,8 +194,6 @@
     <string name="message_move_to_bin">Przenieś do kosza</string>
     <string name="message_delete_forever">Usuń trwale</string>
     <string name="message_delete_success">Wiadomość usunięta pomyślnie</string>
-    <string name="message_share">Udostępnij</string>
-    <string name="message_print">Drukuj</string>
     <string name="message_subject">Temat</string>
     <string name="message_content">Treść</string>
     <string name="message_send_successful">Wiadomość wysłana pomyślnie</string>
@@ -229,6 +217,8 @@
         <item quantity="many">Masz %1$d nowych wiadomości</item>
         <item quantity="other">Masz %1$d nowych wiadomości</item>
     </plurals>
+
+
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
     <string name="note_points">Punkty</string>
@@ -250,17 +240,23 @@
         <item quantity="many">Masz %1$d nowych uwag</item>
         <item quantity="other">Masz %1$d nowych uwag</item>
     </plurals>
+
+
     <!--Homework-->
     <string name="homework_no_items">Brak zadań domowych</string>
     <string name="homework_mark_as_done">Wykonane</string>
     <string name="homework_mark_as_undone">Niewykonane</string>
     <string name="homework_attachments">Załączniki</string>
+
+
     <!--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>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Dostęp mobilny</string>
     <string name="mobile_devices_no_items">Brak urządzeń</string>
@@ -270,8 +266,12 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
+
+
     <!--School and teachers-->
     <string name="schoolandteachers_title">Szkoła i nauczyciele</string>
+
+
     <!--School-->
     <string name="school_title">Szkoła</string>
     <string name="school_no_info">Brak informacji o szkole</string>
@@ -282,19 +282,21 @@
     <string name="school_pedagogue">Imię i nazwisko pedagoga</string>
     <string name="school_address_button">Pokaż na mapie</string>
     <string name="school_telephone_button">Zadzwoń</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Nauczyciele</string>
     <string name="teacher_no_items">Brak informacji o nauczycielach</string>
     <string name="teacher_no_subject">Brak przedmiotu</string>
+
+
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
     <string name="account_confirm">Czy chcesz wylogować aktualnego ucznia?</string>
     <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>
+
+
     <!--About-->
     <string name="about_version">Wersja aplikacji</string>
     <string name="about_contributor">Twórcy</string>
@@ -311,17 +313,21 @@
     <string name="about_homepage_summary">Odwiedź stronę i pomóż rozwijać aplikację</string>
     <string name="about_licenses">Licencje</string>
     <string name="about_licenses_summary">Licencje użytych bibliotek w aplikacji</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">Licencja</string>
-    <!--Contributor-->
+
+
+    <!--Creators-->
     <string name="contributor_avatar_description">Awatar</string>
     <string name="contributor_see_more">Zobacz więcej na GitHub</string>
+
     <!--Log viewer-->
     <string name="logviewer_share">Udostępnij logi</string>
     <string name="logviewer_refresh">Odśwież</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>
+
+
     <!--Generic-->
     <string name="all_content">Treść</string>
     <string name="all_retry">Ponów</string>
@@ -338,14 +344,15 @@
     <string name="all_subject">Przedmiot</string>
     <string name="all_prev">Poprzedni</string>
     <string name="all_next">Następny</string>
-    <string name="all_search">Szukaj</string>
-    <string name="all_search_hint">Szukaj…</string>
+
+
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
     <string name="widget_timetable_theme_title">Wybierz motyw</string>
     <string name="widget_timetable_theme_light">Jasny</string>
     <string name="widget_timetable_theme_dark">Ciemny</string>
-    <string name="widget_timetable_theme_system">Motyw systemu</string>
+
+
     <!--Preferences-->
     <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
@@ -354,18 +361,14 @@
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
     <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
-    <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję na planie</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_grade_color_scheme">Schemat kolorów ocen</string>
     <string name="pref_view_app_language">Język aplikacji</string>
+
     <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_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>
     <string name="pref_notify_debug_switch">Pokazuj powiadomienia debugowania</string>
+
     <string name="pref_services_header">Synchronizacja</string>
     <string name="pref_services_switch">Automatyczna aktualizacja</string>
     <string name="pref_services_suspended">Zawieszona na wakacjach</string>
@@ -376,22 +379,27 @@
     <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_dialog_force_sync_title">Synchronizacja</string>
-    <string name="pref_services_dialog_force_sync_summary">        Ręczna synchronizacja nie odświeża widoków w aplikacji.
-        \nAby zobaczyć zsynchronizowane informacje, uruchom ponownie aplikację po zsynchronizowaniu.
+    <string name="pref_services_dialog_force_sync_summary">
+        Ręczna synchronizacja nie odświeża widoków w aplikacji.
+        \nAby zobaczyć zsynchronizowane informacje uruchom ponownie aplikację po zsynchronizowaniu.
     </string>
+
     <string name="pref_other_header">Inne</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>
+
+
     <!--Notification Channels-->
     <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
-    <string name="channel_new_grades">Nowe oceny</string>
     <string name="channel_lucky_number">Szczęśliwy numerek</string>
+    <string name="channel_new_grades">Nowe oceny</string>
     <string name="channel_new_message">Nowe wiadomości</string>
     <string name="channel_new_notes">Nowe uwagi</string>
     <string name="channel_push">Powiadomienia push</string>
-    <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
+
+
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>
@@ -399,9 +407,13 @@
     <string name="all_green">Zielony</string>
     <string name="all_purple">Fioletowy</string>
     <string name="all_empty_color">Brak koloru</string>
+
+
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
     <string name="all_undo">Cofnij</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_timeout">Upłynął limit czasu na połączenie z dziennikiem</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index a41abf350..23cb5ac4d 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="services_interval_entries">
+        <item>15 минут</item>
+        <item>30 минут</item>
+        <item>1 час</item>
+        <item>2 часа</item>
+        <item>6 часов</item>
+        <item>12 часов</item>
+        <item>24 часа</item>
+    </string-array>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Светлая</item>
         <item>Тёмная</item>
@@ -13,15 +22,6 @@
         <item>Українська</item>
         <item>Deutsch</item>
     </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 минут</item>
-        <item>30 минут</item>
-        <item>1 час</item>
-        <item>2 часа</item>
-        <item>6 часов</item>
-        <item>12 часов</item>
-        <item>24 часа</item>
-    </string-array>
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
         <item>0,25</item>
@@ -36,9 +36,9 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Средняя оценка со 2 семестра</item>
-        <item>Average of grades from both semesters</item>
-        <item>Average of grades from the whole year</item>
+        <item>Средняя оценка с целого года</item>
     </string-array>
+
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показывать</item>
         <item>Показать все</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 15c583173..e2f13f30c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Авторизация</string>
     <string name="main_title">Wulkanowy</string>
@@ -8,18 +12,21 @@
     <string name="exam_title">Тесты</string>
     <string name="timetable_title">Расписание</string>
     <string name="settings_title">Настройки</string>
-    <string name="more_title">Другое</string>
+    <string name="more_title">Ещё</string>
     <string name="about_title">О приложении</string>
     <string name="logviewer_title">Просмотр журнала</string>
-    <string name="contributors_title">Разработчики</string>
+    <string name="contributors_title">Творцы</string>
     <string name="license_title">Лицензии</string>
     <string name="message_title">Сообщения</string>
     <string name="send_message_title">Новое сообщение</string>
     <string name="note_title">Предупреждения и свершения</string>
     <string name="homework_title">Домашние задания</string>
     <string name="account_title">Выберите аккаунт</string>
+
     <!--Subtitles-->
-    <string name="grade_subtitle">%d семестр, %d/%d</string>
+    <string name="grade_subtitle">Семестр %d, %d/%d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
     <string name="login_header_symbol">Впишите \"symbol\"</string>
@@ -28,73 +35,72 @@
     <string name="login_login_pesel_email_hint">Логин, PESEL или электронная почта</string>
     <string name="login_password_hint">Пароль</string>
     <string name="login_host_hint">Дневник UONET+</string>
-    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_api">Мобильный API</string>
     <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
+    <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_api_key_hint">клавиша API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Войти</string>
     <string name="login_invalid_password">Слишком короткий пароль</string>
-    <string name="login_incorrect_password">Указаны неверные данные. Убедитесь, что вы выбрали нужный дневник</string>
-    <string name="login_invalid_pin">Неправильный PIN</string>
-    <string name="login_invalid_token">Неправильный token</string>
+    <string name="login_incorrect_password">Указаны неверные данные</string>
+    <string name="login_invalid_pin">Недействительный PIN</string>
+    <string name="login_invalid_token">Недействительный token</string>
     <string name="login_expired_token">Токен просрочен</string>
     <string name="login_invalid_email">Неверный адрес электронной почты</string>
     <string name="login_invalid_login">Неправильный логин</string>
-    <string name="login_invalid_symbol">Неправильный symbol</string>
-    <string name="login_incorrect_symbol">Не удалось найти ученика. Проверьте \"symbol\"</string>
-    <string name="login_field_required">Обязательное поле</string>
+    <string name="login_invalid_symbol">Недействительный symbol</string>
+    <string name="login_incorrect_symbol">Не удалось найти ученика. Пожалуйста, проверьте \"symbol\"</string>
+    <string name="login_field_required">Это поле обязательно</string>
     <string name="login_duplicate_student">Данный ученик уже авторизован</string>
-    <string name="login_symbol_helper">Вы можете найти \"symbol\" на странице VULCAN по пути <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_symbol_helper">Вы можете найти \"symbol\" в <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
     <string name="login_advanced">Другие варианты</string>
-    <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
-    <string name="login_advanced_warning_scraper">Scraper - режим, который показывает данные так же, как и сайт дневника</string>
-    <string name="login_advanced_warning_hybrid">Hybrid - это комбинация лучших функций остальных двух режимов. Он работает быстрее, чем Scraper, и вводит функции, которых нет в режиме Mobile API. Находится в экспериментальной стадии</string>
     <string name="login_privacy_policy">Политика приватности</string>
     <string name="login_contact_header">Проблемы с авторизацией? Свяжитесь с нами!</string>
     <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">Убедитесь, что выбран нужный дневник!</string>
-    <string name="login_recover_button">Забыли пароль?</string>
+    <string name="login_recover">восстановление</string>
+    <string name="login_recover_button">Я не помню пароль</string>
     <string name="login_recover_title">Восстановите свой аккаунт</string>
-    <string name="login_recover">Восстановить</string>
     <string name="login_signed_in">Студент уже вошел в систему</string>
+
+
     <!--Main-->
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, пожалуйста, авторизируйтесь ещё раз</string>
+
+
     <!--Grade-->
     <string name="grade_header">Оценка</string>
     <string name="grade_semester">Семестр %d</string>
     <string name="grade_switch_semester">Сменить семестр</string>
     <string name="grade_no_items">Оценки отсутствуют</string>
-    <string name="grade_weight">Стоимость</string>
-    <string name="grade_weight_value">Стоимость: %s</string>
+    <string name="grade_weight">Вес</string>
+    <string name="grade_weight_value">Bес: %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_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_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_menu_summary">Итоги</string>
     <string name="grade_menu_statistics">Класс</string>
-    <string name="grade_menu_read">Пометить как \"прочитанное\"</string>
+    <string name="grade_menu_read">Пометить как \"прочитанное*</string>
     <string name="grade_statistics_partial">Частичные</string>
-    <string name="grade_statistics_semester">За семестр</string>
-    <string name="grade_statistics_points">Баллы</string>
+    <string name="grade_statistics_semester">Семестровые</string>
+    <string name="grade_statistics_points">Очки</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d оценка</item>
         <item quantity="few">%d оценки</item>
@@ -102,71 +108,45 @@
         <item quantity="other">%d оценок</item>
     </plurals>
     <plurals name="grade_new_items">
-        <item quantity="one">Новая оценка</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Новая оценка</item>
         <item quantity="few">Новые оценки</item>
         <item quantity="many">Новые оценки</item>
         <item quantity="other">Новые оценки</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">Вы получили %1$d оценку</item>
         <item quantity="few">Вы получили %1$d оценки</item>
         <item quantity="many">Вы получили %1$d оценок</item>
         <item quantity="other">Вы получили %1$d оценок</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">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">Урок</string>
     <string name="timetable_room">Аудитория</string>
     <string name="timetable_group">Группа</string>
     <string name="timetable_time">Часы</string>
     <string name="timetable_changes">Изменения</string>
-    <string name="timetable_no_items">Нет уроков в данный день</string>
-    <string name="timetable_minutes">%s мин</string>
-    <string name="timetable_seconds">%s сек</string>
-    <string name="timetable_time_left">%1$s осталось</string>
-    <string name="timetable_time_until">через %1$s</string>
-    <string name="timetable_finished">Окончен</string>
-    <string name="timetable_now">Сейчас: %s</string>
-    <string name="timetable_next">Следующий: %s</string>
-    <string name="timetable_later">Позже: %s</string>
-    <!--Completed lessons-->
+    <string name="timetable_no_items">Нету уроков в данный день</string>
+
+
+    <!--CompletedLesson-->
     <string name="completed_lessons_title">Проведённые уроки</string>
     <string name="completed_lessons_button">Просмотреть проведённые уроки</string>
     <string name="completed_lessons_no_items">Нет информации о проведённых уроках</string>
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Отсутствие</string>
     <string name="completed_lessons_resources">Ресурсы</string>
+
+
     <!--Attendance-->
     <string name="attendance_summary_button">Итоговая посещаемость</string>
     <string name="attendance_absence_school">Отсутствие по школьным причинам</string>
-    <string name="attendance_absence_excused">Отсутствие по уважительной причине</string>
-    <string name="attendance_absence_unexcused">Отсутствие по неуважительной причине</string>
+    <string name="attendance_absence_excused">Оправданное отсутствие</string>
+    <string name="attendance_absence_unexcused">Неоправданное отсутствие</string>
     <string name="attendance_exemption">Освобождение</string>
-    <string name="attendance_excused_lateness">Опоздание по уважительным причинам</string>
-    <string name="attendance_unexcused_lateness">Опоздание по неуважительным причинам</string>
+    <string name="attendance_excused_lateness">Оправданное опоздание</string>
+    <string name="attendance_unexcused_lateness">Неоправданное опоздание</string>
     <string name="attendance_present">Присутствие</string>
     <string name="attendance_number">Урок №</string>
     <string name="attendance_no_items">Данные не найдены</string>
@@ -178,23 +158,29 @@
     </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>
+    <string name="attendance_excuse_success">Отсутствие оправдано успешно!</string>
+    <string name="attendance_excuse_no_selection">Вы должны выбрать хотя бы одно отсутствие!</string>
+    <string name="attendance_excuse_title">Oбосновывать</string>
+
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Посещаемость</string>
-    <string name="attendance_summary_total">Общая</string>
+    <string name="attendance_summary_total">вместе</string>
+
+
     <!--Exam-->
-    <string name="exam_no_items">Нет тестов на этой неделе</string>
+    <string name="exam_no_items">Тесты на этой неделе не запланированы</string>
     <string name="exam_type">Тип</string>
     <string name="exam_entry_date">Дата записи</string>
+
+
     <!--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_subject">(нету темы)</string>
     <string name="message_no_items">Нет сообщений</string>
-    <string name="message_preview_error">Произошла ошибка во время получения содержания сообщения</string>
+    <string name="message_preview_error">Произошла ошибка во время получения текста сообщения</string>
     <string name="message_from">От:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %s</string>
@@ -204,8 +190,6 @@
     <string name="message_move_to_bin">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
     <string name="message_delete_success">Сообщение успешно удалено</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Текст</string>
     <string name="message_send_successful">Сообщение успешно отправлено</string>
@@ -218,7 +202,7 @@
         <item quantity="other">%d сообщений</item>
     </plurals>
     <plurals name="message_new_items">
-        <item quantity="one">Новое сообщение</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Новое сообщение</item>
         <item quantity="few">Новые сообщения</item>
         <item quantity="many">Новые сообщения</item>
         <item quantity="other">Новые сообщения</item>
@@ -229,9 +213,11 @@
         <item quantity="many">Вы получили %1$d новых сообщений</item>
         <item quantity="other">Вы получили %1$d новых сообщений</item>
     </plurals>
+
+
     <!--Note-->
     <string name="note_no_items">Нет данных о предупреждениях</string>
-    <string name="note_points">Баллы</string>
+    <string name="note_points">точек</string>
     <plurals name="note_number_item">
         <item quantity="one">%d предупреждение</item>
         <item quantity="few">%d предупреждения</item>
@@ -239,7 +225,7 @@
         <item quantity="other">%d предупреждений</item>
     </plurals>
     <plurals name="note_new_items">
-        <item quantity="one">Новое предупреждение</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Новое предупреждение</item>
         <item quantity="few">Новые предупреждения</item>
         <item quantity="many">Новых предупреждений</item>
         <item quantity="other">Новых предупреждений</item>
@@ -250,17 +236,23 @@
         <item quantity="many">Вы получили %1$d предупреждений</item>
         <item quantity="other">Вы получили %1$d предупреждений</item>
     </plurals>
+
+
     <!--Homework-->
     <string name="homework_no_items">Нет домашних заданий</string>
     <string name="homework_mark_as_done">сделанный</string>
     <string name="homework_mark_as_undone">Не сделано</string>
     <string name="homework_attachments">Вложения</string>
+
+
     <!--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>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобильные устройства</string>
     <string name="mobile_devices_no_items">Нет устройств</string>
@@ -270,8 +262,12 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
+
+
     <!--School and teachers-->
     <string name="schoolandteachers_title">Школа и учителя</string>
+
+
     <!--School-->
     <string name="school_title">Школа</string>
     <string name="school_no_info">Нет информации о школе</string>
@@ -282,49 +278,56 @@
     <string name="school_pedagogue">Педагог</string>
     <string name="school_address_button">Показать на карте</string>
     <string name="school_telephone_button">Позвонить</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Учителя</string>
     <string name="teacher_no_items">Нет информации о учителях</string>
     <string name="teacher_no_subject">Нет предмета</string>
+
+
     <!--Account-->
     <string name="account_add_new">Добавить аккаунт</string>
     <string name="account_logout">Выйти</string>
     <string name="account_confirm">Вы точно хотите выйти из данного аккаунта?</string>
     <string name="account_logout_student">Выйти</string>
-    <string name="account_type_student">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>
+
+
     <!--About-->
     <string name="about_version">Версия приложения</string>
-    <string name="about_contributor">Разработчики</string>
-    <string name="about_contributor_summary">Список разработчиков \"Wulkanowy\"</string>
-    <string name="about_feedback">Возникла ошибка?</string>
-    <string name="about_feedback_summary">Сообщить о ошибке</string>
+    <string name="about_contributor">Творцы</string>
+    <string name="about_contributor_summary">Список Wulkanowy программистов</string>
+    <string name="about_feedback">Сообщить о ошибке</string>
+    <string name="about_feedback_summary">Отправить сообщение о ошибке через электронную почту</string>
     <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Часто задаваемые вопросы</string>
+    <string name="about_faq_summary">Читайте часто задаваемые вопросы</string>
     <string name="about_discord">Сервер Discord</string>
     <string name="about_discord_summary">Присоединиться к сообществу приложения</string>
     <string name="about_privacy">Политика приватности</string>
-    <string name="about_privacy_summary">Правила хранения личных данных</string>
+    <string name="about_privacy_summary">Правила сбора личных данных</string>
     <string name="about_homepage">Домашняя страница</string>
-    <string name="about_homepage_summary">Помочь в развитии приложения</string>
+    <string name="about_homepage_summary">Посетить страницу и помочь в развитии приложения</string>
     <string name="about_licenses">Лицензии</string>
-    <string name="about_licenses_summary">Лицензии использованных библиотек</string>
+    <string name="about_licenses_summary">Лицензии использованных в приложении библиотек</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">Лицензия</string>
-    <!--Contributor-->
+
+
+    <!--Creators-->
     <string name="contributor_avatar_description">Aватар</string>
-    <string name="contributor_see_more">Страница проекта на GitHub</string>
+    <string name="contributor_see_more">Смотрите больше на GitHub</string>
+
+
     <!--Log viewer-->
-    <string name="logviewer_share">Поделиться логами</string>
-    <string name="logviewer_refresh">Обновить</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Проверить наличие обновлений</string>
-    <string name="dialog_error_check_update_message">Прежде чем сообщать об ошибке, проверьте наличие обновлений</string>
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Обновление</string>
+
+
     <!--Generic-->
     <string name="all_content">Содержание</string>
-    <string name="all_retry">Повторить</string>
+    <string name="all_retry">Снова</string>
     <string name="all_description">Описание</string>
     <string name="all_no_description">Нет описания</string>
     <string name="all_teacher">Учитель</string>
@@ -338,60 +341,53 @@
     <string name="all_subject">Предмет</string>
     <string name="all_prev">Предыдущий</string>
     <string name="all_next">Следующий</string>
-    <string name="all_search">Поиск</string>
-    <string name="all_search_hint">Поиск…</string>
+
+
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
     <string name="widget_timetable_theme_light">Светлая</string>
     <string name="widget_timetable_theme_dark">Тёмная</string>
-    <string name="widget_timetable_theme_system">Тема системы</string>
+
+
     <!--Preferences-->
-    <string name="pref_view_header">Вид</string>
-    <string name="pref_view_list">Окно по умолчанию</string>
-    <string name="pref_view_grade_average_mode">Способ определения средней годовой оценки</string>
+    <string name="pref_view_header">Внешний вид</string>
+    <string name="pref_view_list">При входе открывать</string>
+    <string name="pref_view_grade_average_mode">Рассчитывание средней годовой оценки</string>
     <string name="pref_view_grade_average_force_calc">Принудительно высчитать среднюю оценку через приложение</string>
     <string name="pref_view_present">Показывать присутствия в посещаемости</string>
     <string name="pref_view_app_theme">Тема приложения</string>
     <string name="pref_view_expand_grade">Больше оценок</string>
-    <string name="pref_view_timetable_show_timers">Отмечать текущий урок в расписании</string>
-    <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
     <string name="pref_view_timetable_show_whole_class">Показать уроки всего класса</string>
     <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
     <string name="pref_view_app_language">Язык приложения</string>
+
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
-    <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о будущих уроках</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>
     <string name="pref_notify_debug_switch">Показывать дебаг-уведомления</string>
+
     <string name="pref_services_header">Синхронизация</string>
     <string name="pref_services_switch">Автоматическая синхронизация</string>
     <string name="pref_services_suspended">Приостановить синхронизации во время каникул</string>
     <string name="pref_services_interval">Интервал синхронизации</string>
     <string name="pref_services_wifi">Только через Wi-Fi</string>
-    <string name="pref_services_force_sync">Синхронизировать</string>
-    <string name="pref_services_message_sync_success">Синхронизировано!</string>
-    <string name="pref_services_message_sync_failed">Синхронизация не удалась</string>
-    <string name="pref_services_sync_in_progress">Идёт синхронизация</string>
-    <string name="pref_services_dialog_force_sync_title">Синхронизация</string>
-    <string name="pref_services_dialog_force_sync_summary">Ручная синхронизация не обновляет данные в приложении.
-        \nЧтобы увидеть обновлённые данные, перезапустите приложение.
-    </string>
+
     <string name="pref_other_header">Другие</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_grade_modifier_plus">Вес плюса</string>
+    <string name="pref_other_grade_modifier_minus">Вес минуса</string>
+    <string name="pref_other_fill_message_content">Ответить с историей сообщений</string>
+
+
     <!--Notification Channels-->
     <string name="channel_new_entries">Новые данные в дневнике</string>
     <string name="channel_new_grades">Новые оценки</string>
     <string name="channel_lucky_number">Счастливый номер</string>
     <string name="channel_new_message">Новые сообщения</string>
     <string name="channel_new_notes">Новые заметки</string>
-    <string name="channel_push">Показывать push-уведомления</string>
-    <string name="channel_upcoming_lessons">Будущие уроки</string>
+    <string name="channel_push">Push-уведомления</string>
     <string name="channel_debug">Дебаг</string>
+
+
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>
@@ -399,13 +395,17 @@
     <string name="all_green">Зелёный</string>
     <string name="all_purple">Фиолетовый</string>
     <string name="all_empty_color">Нет цвета</string>
+
+
     <!--Others-->
     <string name="all_copied">Скопировано</string>
     <string name="all_undo">Отменить</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">Нет интернет-подключения</string>
     <string name="error_timeout">Слишком долгое ожидание соединения с дневником</string>
-    <string name="error_login_failed">Авторизация не удалась. Попробуйте ещё раз или перезапустите дневник</string>
+    <string name="error_login_failed">Авторизация не удалась. Пожалуйста, попробуйте ещё раз или перезапустите дневник</string>
     <string name="error_password_change_required">Требуется смена пароля</string>
     <string name="error_service_unavailable">Технический перерыв в журнале UONET + продолжается. Попробуйте позже</string>
     <string name="error_unknown">Произошла неожиданная ошибка</string>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index 9942621a5..e09ae8cdd 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="services_interval_entries">
+        <item>15 хвилин</item>
+        <item>30 хвилин</item>
+        <item>1 година</item>
+        <item>2 години</item>
+        <item>6 годин</item>
+        <item>12 годин</item>
+        <item>24 години</item>
+    </string-array>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Світла</item>
         <item>Темна</item>
@@ -13,15 +22,6 @@
         <item>Українська</item>
         <item>Deutsch</item>
     </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 хвилин</item>
-        <item>30 хвилин</item>
-        <item>1 година</item>
-        <item>2 години</item>
-        <item>6 годин</item>
-        <item>12 годин</item>
-        <item>24 години</item>
-    </string-array>
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
         <item>0,25</item>
@@ -36,9 +36,9 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Середня оцінка з 2 семестру</item>
-        <item>Average of grades from both semesters</item>
-        <item>Average of grades from the whole year</item>
+        <item>Середня оцінка за весь рік</item>
     </string-array>
+
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показувати</item>
         <item>Показати все</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 423c4e12f..d9db3f068 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Авторизація</string>
     <string name="main_title">Wulkanowy</string>
@@ -8,80 +12,83 @@
     <string name="exam_title">Тести</string>
     <string name="timetable_title">Розклад</string>
     <string name="settings_title">Налаштування</string>
-    <string name="more_title">Інше</string>
+    <string name="more_title">Ще</string>
     <string name="about_title">Про додаток</string>
     <string name="logviewer_title">Переглядач журналів</string>
-    <string name="contributors_title">Розробники</string>
+    <string name="contributors_title">Творці</string>
     <string name="license_title">Ліцензії</string>
     <string name="message_title">Повідомлення</string>
     <string name="send_message_title">Нове повідомлення</string>
     <string name="note_title">Нотатки та досягнення</string>
     <string name="homework_title">Домашні завдання</string>
-    <string name="account_title">Оберіть аккаунт</string>
+    <string name="account_title">Виберіть акаунт</string>
+
+
     <!--Subtitles-->
-    <string name="grade_subtitle">%d семестр, %d/%d</string>
+    <string name="grade_subtitle">Семестр %d, %d/%d</string>
+
+
     <!--Login-->
-    <string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батька</string>
+    <string name="login_header_default">Авторизуйтеся за допомогою акаунта учня або батьків</string>
     <string name="login_header_symbol">Впишіть \"symbol\"</string>
     <string name="login_nickname_hint">Ім\'я користувача</string>
     <string name="login_email_hint">Електронна пошта</string>
     <string name="login_login_pesel_email_hint">Логін, PESEL або електронна пошта</string>
     <string name="login_password_hint">Пароль</string>
     <string name="login_host_hint">Щоденник</string>
-    <string name="login_type_api">Мobile API</string>
+    <string name="login_type_api">Мобільний API</string>
     <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hybrid</string>
+    <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>
-    <string name="login_incorrect_password">Вказані невірні дані. Впевніться, що ви увібрали потрібний щоденник</string>
-    <string name="login_invalid_pin">Неправильний PIN</string>
-    <string name="login_invalid_token">Неправильний token</string>
-    <string name="login_expired_token">Минув термін дії токену</string>
+    <string name="login_sign_in">Ввійти</string>
+    <string name="login_invalid_password">Дуже короткий пароль</string>
+    <string name="login_incorrect_password">Вказані неправильні дані</string>
+    <string name="login_invalid_pin">Недійсний PIN</string>
+    <string name="login_invalid_token">Недійсний token</string>
     <string name="login_invalid_email">Недійсна адреса електронної пошти</string>
-    <string name="login_invalid_login">Неправильний логін</string>
-    <string name="login_invalid_symbol">Неправильний symbol</string>
+    <string name="login_invalid_login">Невірний логін</string>
+    <string name="login_expired_token">Токен протермінований</string>
+    <string name="login_invalid_symbol">Недійсний symbol</string>
     <string name="login_incorrect_symbol">Не вдалося знайти учня. Будь ласка, перевірте \"symbol\"</string>
-    <string name="login_field_required">Обов\'язкове поле</string>
-    <string name="login_duplicate_student">Даного учня вже авторизовано</string>
-    <string name="login_symbol_helper">Ви можете знайти \"symbol\" на сторінцi VULCAN стежкою <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_field_required">Це поле обов\'язкове</string>
+    <string name="login_duplicate_student">Даний учень вже авторизований</string>
+    <string name="login_symbol_helper">Ви можете знайти \"symbol\" в <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
     <string name="login_advanced">Інші варіанти</string>
-    <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності і уроків, інформація про школу і список зареєстрованних пристроїв</string>
-    <string name="login_advanced_warning_scraper">Scraper - режим, котрий показує дані так само, як і сторінка щоденника</string>
-    <string name="login_advanced_warning_hybrid">Hybrid - це комбінація найкращих функцій інших двох режимів. Він працює швидше, ніж Scraper, и впроваджує функції, котрих нема в режимі Mobile API. Знаходиться в експериментальній стадії</string>
     <string name="login_privacy_policy">Політика приватності</string>
     <string name="login_contact_header">Проблеми з авторизацією? Зв\'яжіться з нами!</string>
     <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">Переконайтесь, що обрано потрібний щоденник!</string>
-    <string name="login_recover_button">Забули пароль?</string>
-    <string name="login_recover_title">Відновіть свій аккаунт</string>
+    <string name="login_email_intent_title">Відправити листа</string>
+    <string name="login_recover_button">Я забув свій пароль</string>
+    <string name="login_recover_title">Відновіть свій акаунт</string>
     <string name="login_recover">Відновити</string>
-    <string name="login_signed_in">Учень вже увійшов до системи</string>
+    <string name="login_signed_in">Учень вже ввійшов в систему</string>
+
+
     <!--Main-->
-    <string name="main_account_picker">Менеджер аккаунтів</string>
-    <string name="main_log_in">Увійти</string>
-    <string name="main_session_expired">Минув термін дії сесії</string>
-    <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
+    <string name="main_account_picker">Менеджер акаунтів</string>
+    <string name="main_log_in">Ввійти</string>
+    <string name="main_session_expired">Сесія закінчилася</string>
+    <string name="main_session_relogin">Сесія закінчилася, будь ласка, авторизуйтеся знову</string>
+
+
     <!--Grade-->
     <string name="grade_header">Оцінка</string>
-    <string name="grade_semester">%d семестр</string>
+    <string name="grade_semester">Семестр %d</string>
     <string name="grade_switch_semester">Змінити семестр</string>
-    <string name="grade_no_items">Брак оцінок</string>
-    <string name="grade_weight">Вартість</string>
-    <string name="grade_weight_value">Вартість: %s</string>
+    <string name="grade_no_items">Оцінки відсутні</string>
+    <string name="grade_weight">Вага</string>
+    <string name="grade_weight_value">Вага: %s</string>
     <string name="grade_comment">Коментар</string>
-    <string name="grade_no_new_items">Брак нових оцінок</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_no_average">Середня оцінка відсутня</string>
     <string name="grade_predicted">Очікувана оцінка: %1$s</string>
     <string name="grade_final">Підсумкова оцінка: %1$s</string>
     <string name="grade_summary_points">Сума балів</string>
@@ -89,9 +96,9 @@
     <string name="grade_summary_predicted_grade">Очікувана оцінка</string>
     <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
     <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
-    <string name="grade_menu_summary">Підсумок</string>
+    <string name="grade_menu_summary">Підсумки</string>
     <string name="grade_menu_statistics">Клас</string>
-    <string name="grade_menu_read">Позначити як прочитане</string>
+    <string name="grade_menu_read">Відмітити як \"прочитане*</string>
     <string name="grade_statistics_partial">Поточні</string>
     <string name="grade_statistics_semester">Семестрові</string>
     <string name="grade_statistics_points">Бали</string>
@@ -102,74 +109,48 @@
         <item quantity="other">%d оцінок</item>
     </plurals>
     <plurals name="grade_new_items">
-        <item quantity="one">Нова оцінка</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Нова оцінка</item>
         <item quantity="few">Нові оцінки</item>
         <item quantity="many">Нові оцінки</item>
         <item quantity="other">Нові оцінки</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">Ви отримали %1$d оцінку</item>
         <item quantity="few">Ви отримали %1$d оцінки</item>
         <item quantity="many">Ви отримали %1$d оцінок</item>
-        <item quantity="other">Ви отримали %1$d оцінок</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">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>
+        <item quantity="other">ви отримали %1$d оцінок</item>
     </plurals>
+
+
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
     <string name="timetable_room">Аудиторія</string>
     <string name="timetable_group">Група</string>
     <string name="timetable_time">Години</string>
     <string name="timetable_changes">Зміни</string>
-    <string name="timetable_no_items">Брак уроків у цей день</string>
-    <string name="timetable_minutes">%s хвилин</string>
-    <string name="timetable_seconds">%s сек</string>
-    <string name="timetable_time_left">%1$s лишилося</string>
-    <string name="timetable_time_until">через %1$s</string>
-    <string name="timetable_finished">Завершено</string>
-    <string name="timetable_now">Зараз: %s</string>
-    <string name="timetable_next">Наступний: %s</string>
-    <string name="timetable_later">Пізніше: %s</string>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Уроки, що відбулися</string>
-    <string name="completed_lessons_button">Показати уроки, що відбулися</string>
-    <string name="completed_lessons_no_items">Брак інформації о уроках, що відбулися</string>
+    <string name="timetable_no_items">Цього дня уроків немає</string>
+
+
+    <!--CompletedLesson-->
+    <string name="completed_lessons_title">Проведені уроки</string>
+    <string name="completed_lessons_button">Подивитися проведені уроки</string>
+    <string name="completed_lessons_no_items">Інформації про проведені уроки немає</string>
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Відсутність</string>
     <string name="completed_lessons_resources">Ресурси</string>
+
+
     <!--Attendance-->
-    <string name="attendance_summary_button">Підсумок відвідуваності</string>
+    <string name="attendance_summary_button">Підсумкова відвідуваність</string>
     <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
-    <string name="attendance_absence_excused">Відсутність з поважних причин</string>
-    <string name="attendance_absence_unexcused">Відсутність з не поважних причин</string>
+    <string name="attendance_absence_excused">Виправдана відсутність</string>
+    <string name="attendance_absence_unexcused">Невиправдана відсутність</string>
     <string name="attendance_exemption">Звільнення</string>
-    <string name="attendance_excused_lateness">Спізнення з поважних причин</string>
-    <string name="attendance_unexcused_lateness">Спізнення з не поважних причин</string>
+    <string name="attendance_excused_lateness">Виправдане запізнення</string>
+    <string name="attendance_unexcused_lateness">Невиправдане запізнення</string>
     <string name="attendance_present">Присутність</string>
-    <string name="attendance_number">Номер уроку</string>
-    <string name="attendance_no_items">Брак записів</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>
@@ -178,39 +159,43 @@
     </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>
+    <string name="attendance_excuse_success">Відсутність виправдана успішно!</string>
+    <string name="attendance_excuse_no_selection">Ви повинні вибрати хоча б одну відсутність!</string>
+    <string name="attendance_excuse_title">Oбґрунтовувати</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_no_items">Тести на цьому тижні не заплановані</string>
     <string name="exam_type">Тип</string>
     <string name="exam_entry_date">Дата запису</string>
+
+
     <!--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_subject">(нема теми)</string>
     <string name="message_no_items">Нема повідомлень</string>
-    <string name="message_preview_error">З\'явилася помилка підчас завантаження змісту повідомлення</string>
+    <string name="message_preview_error">Сталася помилка під час отримання тексту повідомлення</string>
     <string name="message_from">Від:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %s</string>
-    <string name="message_reply">Відповісти</string>
+    <string name="message_reply">Відповідь</string>
     <string name="message_forward">Переслати</string>
     <string name="message_delete">Видалити</string>
-    <string name="message_move_to_bin">Перемістити у кошик</string>
+    <string name="message_move_to_bin">Перемістити в кошик</string>
     <string name="message_delete_forever">Видалити назавжди</string>
-    <string name="message_delete_success">Повідомлення було успішно видалено</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
+    <string name="message_delete_success">Повідомлення успішно видалено</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Зміст</string>
-    <string name="message_send_successful">Повідомлення було успішно відправлено</string>
-    <string name="message_required_recipients">Необхідно обрати принаймні 1 адресата</string>
-    <string name="message_content_min_length">Зміст повідомлення мусить складатися принаймні з 3 знаків</string>
+    <string name="message_send_successful">Повідомлення успішно відправлено</string>
+    <string name="message_required_recipients">Ви повинні вибрати щонайменше одного отримувача</string>
+    <string name="message_content_min_length">Текст повідомлення повинен містити щонайменше 3 знаки</string>
     <plurals name="message_number_item">
         <item quantity="one">%d повідомлення</item>
         <item quantity="few">%d повідомлення</item>
@@ -218,7 +203,7 @@
         <item quantity="other">%d повідомлень</item>
     </plurals>
     <plurals name="message_new_items">
-        <item quantity="one">Нове повідомлення</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Нове повідомлення</item>
         <item quantity="few">Нові повідомлення</item>
         <item quantity="many">Нові повідомлення</item>
         <item quantity="other">Нові повідомлення</item>
@@ -229,104 +214,123 @@
         <item quantity="many">Ви отримали %1$d нових повідомлень</item>
         <item quantity="other">Ви отримали %1$d нових повідомлень</item>
     </plurals>
+
+
     <!--Note-->
-    <string name="note_no_items">Брак інформації о зауваженнях</string>
-    <string name="note_points">Бали</string>
+    <string name="note_no_items">Немає даних про нотатки</string>
+    <string name="note_points">точок</string>
     <plurals name="note_number_item">
-        <item quantity="one">%d зауваження</item>
-        <item quantity="few">%d зауваження</item>
-        <item quantity="many">%d зауважень</item>
-        <item quantity="other">%d зауважень</item>
+        <item quantity="one">%d нотатка</item>
+        <item quantity="few">%d нотатки</item>
+        <item quantity="many">%d нотаток</item>
+        <item quantity="other">%d нотатки</item>
     </plurals>
     <plurals name="note_new_items">
-        <item quantity="one">Нова нотатка</item>
+        <item quantity="one" tools:ignore="ImpliedQuantity">Нова нотатка</item>
         <item quantity="few">Нові нотатки</item>
         <item quantity="many">Нових нотаток</item>
         <item quantity="other">Нових нотаток</item>
     </plurals>
     <plurals name="note_notify_new_items">
-        <item quantity="one">%1$d нове зауваження</item>
-        <item quantity="few">%1$d нових зауваження</item>
-        <item quantity="many">%1$d нових зауважень</item>
-        <item quantity="other">%1$d нових зауважень</item>
+        <item quantity="one">Ви отримали %1$d нотатку</item>
+        <item quantity="few">Ви отримали %1$d нотатки</item>
+        <item quantity="many">Ви отримали %1$d нотаток</item>
+        <item quantity="other">Ви отримали %1$d нотаток</item>
     </plurals>
+
+
     <!--Homework-->
-    <string name="homework_no_items">Брак домашніх завдань</string>
-    <string name="homework_mark_as_done">Позначити як зроблене</string>
-    <string name="homework_mark_as_undone">Позначити як не зроблене</string>
-    <string name="homework_attachments">Додатки</string>
+    <string name="homework_no_items">Немає домашніх завдань</string>
+    <string name="homework_mark_as_done">зроблений</string>
+    <string name="homework_mark_as_undone">Не зроблено</string>
+    <string name="homework_attachments">Вкладення</string>
+
+
     <!--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_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>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобільні пристрої</string>
-    <string name="mobile_devices_no_items">Брак пристроїв</string>
+    <string name="mobile_devices_no_items">Пристрої відсутні</string>
     <string name="mobile_devices_unregister">Видалити</string>
-    <string name="mobile_device_removed">Пристрій видалено</string>
+    <string name="mobile_device_removed">Пристрій видалений</string>
     <string name="mobile_device_qr">QR-код</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">Школа та вчителі</string>
+
+
     <!--School-->
     <string name="school_title">Школа</string>
-    <string name="school_no_info">Брак інформації про школу</string>
+    <string name="school_no_info">Немає інформації про школу</string>
     <string name="school_name">Назва школи</string>
     <string name="school_address">Адреса школи</string>
     <string name="school_telephone">Телефон</string>
     <string name="school_headmaster">Директор</string>
     <string name="school_pedagogue">Викладач</string>
-    <string name="school_address_button">Показати на мапі</string>
+    <string name="school_address_button">Показати на карті</string>
     <string name="school_telephone_button">Зателефонувати</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Вчителі</string>
-    <string name="teacher_no_items">Брак інформації про вчителів</string>
-    <string name="teacher_no_subject">Брак предмету</string>
+    <string name="teacher_no_items">Немає інформації про вчителів</string>
+    <string name="teacher_no_subject">Нема предмету</string>
+
+
     <!--Account-->
-    <string name="account_add_new">Додати аккаунт</string>
+    <string name="account_add_new">Додати акаунт</string>
     <string name="account_logout">Вийти</string>
-    <string name="account_confirm">Ви впевнені, що хочете вийти з цього аккаунту?</string>
-    <string name="account_logout_student">Вийти з аккаунту учня</string>
-    <string name="account_type_student">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_confirm">Ви дійсно бажаєте вийти з даного акаунту?</string>
+    <string name="account_logout_student">Вийти</string>
+
+
     <!--About-->
-    <string name="about_version">Версія додатка</string>
-    <string name="about_contributor">Розробники</string>
-    <string name="about_contributor_summary">Список розробників \"Wulkanowy\"</string>
-    <string name="about_feedback">Виникла помилка?</string>
-    <string name="about_feedback_summary">Повідомити о помилці за допомогою e-mail</string>
+    <string name="about_version">Версія додатку</string>
+    <string name="about_contributor">Tворці</string>
+    <string name="about_contributor_summary">Список Wulkanowy програмістів</string>
+    <string name="about_feedback">Повідомити про помилку</string>
+    <string name="about_feedback_summary">Відправити повідомлення про помилку електронною поштою</string>
     <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Запитання, які часто задають</string>
+    <string name="about_faq_summary">Читайте запитання, які часто задають</string>
     <string name="about_discord">Сервер Discord</string>
     <string name="about_discord_summary">Приєднатися до спільноти додатка</string>
-    <string name="about_privacy">Політика конфіденційності</string>
-    <string name="about_privacy_summary">Правила зберігання особистих даних</string>
+    <string name="about_privacy">Політика приватності</string>
+    <string name="about_privacy_summary">Правила збору особистих даних</string>
     <string name="about_homepage">Домашня сторінка</string>
-    <string name="about_homepage_summary">Допомогти розвитку додатка</string>
+    <string name="about_homepage_summary">Відвідати сторінку та допомогти в розвитку додатку</string>
     <string name="about_licenses">Ліцензії</string>
-    <string name="about_licenses_summary">Ліцензії вжитих бібліотек</string>
+    <string name="about_licenses_summary">Ліцензії використаних в додатку бібліотек</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">Ліцензія</string>
-    <!--Contributor-->
+
+
+    <!--Creators-->
     <string name="contributor_avatar_description">Аватар</string>
-    <string name="contributor_see_more">Сторінка проекту на GitHub</string>
+    <string name="contributor_see_more">Дивіться більше на GitHub</string>
+
+
     <!--Log viewer-->
-    <string name="logviewer_share">Поділитися логами</string>
+    <string name="logviewer_share">Поділитися журналами</string>
     <string name="logviewer_refresh">Оновити</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Провірити наявність оновлень</string>
-    <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помілці, перевірте наявність оновлень</string>
+
+
     <!--Generic-->
     <string name="all_content">Зміст</string>
-    <string name="all_retry">Повторити</string>
+    <string name="all_retry">Знову</string>
     <string name="all_description">Опис</string>
-    <string name="all_no_description">Брак опису</string>
+    <string name="all_no_description">Нема опису</string>
     <string name="all_teacher">Вчитель</string>
     <string name="all_date">Дата</string>
     <string name="all_entry_date">Дата запису</string>
@@ -338,74 +342,71 @@
     <string name="all_subject">Предмет</string>
     <string name="all_prev">Попередній</string>
     <string name="all_next">Наступний</string>
-    <string name="all_search">Пошук</string>
-    <string name="all_search_hint">Пошук…</string>
+
+
     <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Брак уроків</string>
-    <string name="widget_timetable_theme_title">Увібрати тему</string>
-    <string name="widget_timetable_theme_light">Яскрава</string>
+    <string name="widget_timetable_no_items">Немає уроків</string>
+    <string name="widget_timetable_theme_title">Вибрати тему</string>
+    <string name="widget_timetable_theme_light">Світла</string>
     <string name="widget_timetable_theme_dark">Темна</string>
-    <string name="widget_timetable_theme_system">Тема системи</string>
+
+
     <!--Preferences-->
-    <string name="pref_view_header">Вигляд</string>
-    <string name="pref_view_list">Вікно за замовчуванням</string>
-    <string name="pref_view_grade_average_mode">Спосіб облічування оцінки на кінець року</string>
+    <string name="pref_view_header">Зовнішній вигляд</string>
+    <string name="pref_view_list">При вході відкривати</string>
+    <string name="pref_view_grade_average_mode">Розрахунок середньої річної оцінки</string>
     <string name="pref_view_grade_average_force_calc">Примусово розрахувати середню оцінку через додаток</string>
     <string name="pref_view_present">Показувати присутність у відвідуваності</string>
     <string name="pref_view_app_theme">Тема додатку</string>
     <string name="pref_view_expand_grade">Більше оцінок</string>
-    <string name="pref_view_timetable_show_timers">Позначити поточний урок у розкладі</string>
-    <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
     <string name="pref_view_timetable_show_whole_class">Показати уроки всього класу</string>
-    <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
+    <string name="pref_view_grade_color_scheme">Колірна гама оцінок</string>
     <string name="pref_view_app_language">Мова додатку</string>
+
     <string name="pref_notify_header">Повідомлення</string>
     <string name="pref_notify_switch">Показувати повідомлення</string>
-    <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</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>
     <string name="pref_notify_debug_switch">Показувати дебаг-повідомлення</string>
+
     <string name="pref_services_header">Синхронізація</string>
     <string name="pref_services_switch">Автоматична синхронізація</string>
-    <string name="pref_services_suspended">Призупинено на час канікул</string>
-    <string name="pref_services_interval">Інтервал оновлення</string>
+    <string name="pref_services_suspended">Призупинити синхронізації на час канікул</string>
+    <string name="pref_services_interval">Інтервал синхронізації</string>
     <string name="pref_services_wifi">Тільки через Wi-Fi</string>
-    <string name="pref_services_force_sync">Синхронізувати</string>
-    <string name="pref_services_message_sync_success">Синхронізовано!</string>
-    <string name="pref_services_message_sync_failed">Синхронізація не вдалася</string>
-    <string name="pref_services_sync_in_progress">Триває синхронізація</string>
-    <string name="pref_services_dialog_force_sync_title">Синхронізація</string>
-    <string name="pref_services_dialog_force_sync_summary">Ручна синхронізація не оновлює дані в додатку.
-        \nЩоб побачити оновлені дані, перезавантажте додаток.
-    </string>
+
     <string name="pref_other_header">Інші</string>
-    <string name="pref_other_grade_modifier_plus">Вартість плюсу</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>
+
+
     <!--Notification Channels-->
     <string name="channel_new_entries">Нові дані в щоденнику</string>
-    <string name="channel_new_grades">Нові оцінки</string>
     <string name="channel_lucky_number">Щасливий номер</string>
+    <string name="channel_new_grades">Нові оцінки</string>
     <string name="channel_new_message">Нові повідомлення</string>
     <string name="channel_new_notes">Нові нотатки</string>
-    <string name="channel_push">Показувати push-повідомлення</string>
-    <string name="channel_upcoming_lessons">Наступні уроки</string>
+    <string name="channel_push">Повідомлення pushs</string>
     <string name="channel_debug">Дебаг</string>
+
+
     <!--Colors-->
     <string name="all_black">Чорний</string>
     <string name="all_red">Червоний</string>
     <string name="all_blue">Голубий</string>
     <string name="all_green">Зелений</string>
     <string name="all_purple">Фіолетовий</string>
-    <string name="all_empty_color">Брак кольору</string>
+    <string name="all_empty_color">Нема кольору</string>
+
+
     <!--Others-->
     <string name="all_copied">Скопійовано</string>
     <string name="all_undo">Відмінити</string>
+
+
     <!--Errors-->
-    <string name="error_no_internet">Брак з\'єднання з інтернетом</string>
+    <string name="error_no_internet">Відсутнє інтернет-підключення</string>
     <string name="error_timeout">Занадто довге очікування з\'єднання з щоденником</string>
-    <string name="error_login_failed">Аутентифікація не вдалася. Спробуйте ще раз або запустіть додаток знову</string>
+    <string name="error_login_failed">Авторизація не відбулася. Будь ласка, авторизуйтеся знову або перезавантажте щоденник</string>
     <string name="error_password_change_required">Потрібно змінити пароль</string>
     <string name="error_service_unavailable">Технічна перерва в журналі UONET + продовжується. Спробуйте пізніше</string>
     <string name="error_unknown">Відбулася несподівана помилка</string>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 64618568a..5ce26b1d6 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -10,7 +10,6 @@
         <item>Rawa Mazowiecka - Platforma vEdukacja</item>
         <item>Zduńska Wola - e-Urząd</item>
         <item>Sieradz - Portal oświatowy</item>
-        <item>Skarżysko-Kamienna - e-Skarżysko</item>
         <item>Łask - Platforma vEdukacja</item>
         <item>Powiat łaski - Platforma edukacyjna</item>
         <item>Powiat Krasnostawski - Platforma oświatowa</item>
@@ -37,8 +36,7 @@
         <item>https://vulcan.net.pl/</item>
         <item>https://vulcan.net.pl/</item>
         <item>https://vulcan.net.pl/</item>
-        <item>https://vulcan.net.pl/</item>
-        <item>http://fakelog.tk/?standard</item>
+        <item>http://fakelog.cf/?standard</item>
     </string-array>
     <string-array name="hosts_symbols">
         <item>Default</item>
@@ -50,7 +48,6 @@
         <item>rawamazowiecka</item>
         <item>zdunskawola</item>
         <item>sieradz</item>
-        <item>skarzyskokamienna</item>
         <item>lask</item>
         <item>powiatlaski</item>
         <item>powiatkrasnostawski</item>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index a82b14eb7..be31b440f 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -5,7 +5,6 @@
     <string name="pref_default_grade_average_mode">only_one_semester</string>
     <bool name="pref_default_grade_average_force_calc">false</bool>
     <bool name="pref_default_expand_grade">false</bool>
-    <bool name="pref_default_grade_statistics_list">false</bool>
     <string name="pref_default_app_theme">light</string>
     <string name="pref_default_grade_color_scheme">vulcan</string>
     <string name="pref_default_app_language">system</string>
@@ -13,11 +12,9 @@
     <string name="pref_default_services_interval">60</string>
     <bool name="pref_default_services_wifi_only">false</bool>
     <bool name="pref_default_notifications_enable">true</bool>
-    <bool name="pref_default_notification_upcoming_lessons_enable">false</bool>
     <bool name="pref_default_notification_debug">false</bool>
     <string name="pref_default_grade_modifier_plus">0.33</string>
     <string name="pref_default_grade_modifier_minus">0.33</string>
     <bool name="pref_default_fill_message_content">true</bool>
     <string name="pref_default_timetable_show_whole_class">no</string>
-    <bool name="pref_default_timetable_show_timers">false</bool>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 6cb877ec2..559e2159c 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -7,19 +7,15 @@
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_grade_average_mode">grade_average_mode</string>
     <string name="pref_key_grade_average_force_calc">grade_average_always_calc</string>
-    <string name="pref_key_grade_statistics_list">grade_statistics_list</string>
     <string name="pref_key_app_language">app_language</string>
     <string name="pref_key_services_enable">services_enable</string>
     <string name="pref_key_services_interval">services_interval</string>
     <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_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>
     <string name="pref_key_grade_modifier_plus">grade_modifier_plus</string>
     <string name="pref_key_grade_modifier_minus">grade_modifier_minus</string>
     <string name="pref_key_fill_message_content">fill_message_content</string>
     <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
-    <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
 </resources>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 5824658c4..76427a487 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -88,12 +88,10 @@
 
     <string-array name="grade_average_mode_entries">
         <item>Average of grades only from the 2nd semester</item>
-        <item>Average of grades from both semesters</item>
         <item>Average of grades from the whole year</item>
     </string-array>
     <string-array name="grade_average_mode_values" translatable="false">
         <item>only_one_semester</item>
-        <item>both_semesters</item>
         <item>all_year</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1eaebf284..c7b41f698 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <string name="app_name">Wulkanowy</string>
+
+
     <!--Activity/Fragment title-->
     <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>
@@ -51,7 +55,7 @@
     <string name="login_incorrect_symbol">Student not found. Check the symbol</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></string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_advanced">Other options</string>
     <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
@@ -113,26 +117,10 @@
         <item quantity="one">New grade</item>
         <item quantity="other">New grades</item>
     </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="other">New final grades</item>
-    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">You received %1$d grade</item>
         <item quantity="other">You received %1$d grades</item>
     </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="other">You received %1$d predicted grades</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
-        <item quantity="other">You received %1$d final grades</item>
-    </plurals>
 
 
     <!--Timetable-->
@@ -142,14 +130,6 @@
     <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-->
@@ -210,8 +190,6 @@
     <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>
@@ -300,10 +278,6 @@
     <string name="account_logout">Logout</string>
     <string name="account_confirm">Do you want to log out of an active 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>
 
 
     <!--About-->
@@ -339,11 +313,6 @@
     <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>
@@ -360,8 +329,6 @@
     <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>
 
 
     <!--Timetable Widget-->
@@ -369,7 +336,6 @@
     <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-->
@@ -380,18 +346,12 @@
     <string name="pref_view_present">Show presence in attendance</string>
     <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson in timetable</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_grade_color_scheme">Grades color scheme</string>
     <string name="pref_view_app_language">App 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_services_header">Synchronization</string>
@@ -422,7 +382,6 @@
     <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>
 
 
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 4cdb989c7..bb9eb5fcd 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--suppress AndroidElementNotAllowed -->
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:iconSpaceReserved="false"
@@ -29,17 +29,6 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_expand_grade"
             app:title="@string/pref_view_expand_grade" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_timetable_show_timers"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_timetable_show_timers"
-            app:title="@string/pref_view_timetable_show_timers" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_grade_statistics_list"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_grade_statistics_list"
-            app:singleLineTitle="false"
-            app:title="@string/pref_view_grade_statistics_list" />
         <ListPreference
             app:defaultValue="@string/pref_default_timetable_show_whole_class"
             app:entries="@array/timetable_show_whole_class_entries"
@@ -90,33 +79,22 @@
             app:title="@string/pref_services_wifi" />
         <Preference
             app:iconSpaceReserved="false"
-            app:key="@string/pref_key_services_force_sync"
-            app:title="@string/pref_services_force_sync" />
+            app:title="@string/pref_services_force_sync"
+            app:key="@string/pref_key_services_force_sync" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_notify_header">
-        <Preference
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_notifications_fix_issues"
-            app:title="@string/pref_notify_fix_sync_issues" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notifications_enable"
             app:dependency="services_enable"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notifications_enable"
             app:title="@string/pref_notify_switch" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_notification_upcoming_lessons_enable"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_notifications_upcoming_lessons_enable"
-            app:singleLineTitle="false"
-            app:title="@string/pref_notify_upcoming_lessons_switch" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notification_debug"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notification_debug"
-            app:singleLineTitle="false"
             app:title="@string/pref_notify_debug_switch" />
     </PreferenceCategory>
     <PreferenceCategory
@@ -150,13 +128,11 @@
             app:defaultValue="@bool/pref_default_grade_average_force_calc"
             app:iconSpaceReserved="false"
             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_fill_message_content"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_fill_message_content"
-            app:singleLineTitle="false"
             app:title="@string/pref_other_fill_message_content" />
     </PreferenceCategory>
 </PreferenceScreen>
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 d7850b072..ef269ec73 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -1,48 +1,36 @@
 package io.github.wulkanowy.utils
 
+import android.content.Context
 import android.util.Log
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import fr.bipi.tressence.base.FormatterPriorityTree
-import fr.bipi.tressence.common.StackTraceRecorder
+import com.crashlytics.android.Crashlytics
+import com.crashlytics.android.core.CrashlyticsCore
+import fr.bipi.tressence.crash.CrashlyticsLogExceptionTree
+import fr.bipi.tressence.crash.CrashlyticsLogTree
+import io.fabric.sdk.android.Fabric
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 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 CrashlyticsTree : FormatterPriorityTree(Log.VERBOSE) {
+fun initCrashlytics(context: Context, appInfo: AppInfo) {
+    Fabric.with(Fabric.Builder(context)
+        .kits(
+            Crashlytics.Builder()
+                .core(CrashlyticsCore.Builder()
+                    .disabled(!appInfo.isCrashlyticsEnabled)
+                    .build())
+                .build()
+        )
+        .debuggable(appInfo.isDebug)
+        .build())
+}
 
-    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
+class CrashlyticsTree : CrashlyticsLogTree(Log.VERBOSE) {
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        if (skipLog(priority, tag, message, t)) return
+        if (t is FeatureDisabledException || t is FeatureNotAvailableException || t is UnknownHostException) return
 
-        crashlytics.log(format(priority, tag, message))
+        super.log(priority, tag, message, t)
     }
 }
 
-class CrashlyticsExceptionTree : FormatterPriorityTree(Log.ERROR) {
-
-    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
-
-        crashlytics.setCustomKey("priority", priority)
-        crashlytics.setCustomKey("tag", tag.orEmpty())
-        crashlytics.setCustomKey("message", message)
-        if (t != null) {
-            crashlytics.recordException(t)
-        } else {
-            crashlytics.recordException(StackTraceRecorder(format(priority, tag, message)))
-        }
-    }
-}
+class CrashlyticsExceptionTree : CrashlyticsLogExceptionTree()
diff --git a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index f7e4a0fc0..6810e66ac 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -1,17 +1,13 @@
 package io.github.wulkanowy.utils
 
-import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
-import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class FirebaseAnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class FirebaseAnalyticsHelper @Inject constructor(private val context: Context) {
 
     private val analytics by lazy { FirebaseAnalytics.getInstance(context) }
 
@@ -28,8 +24,4 @@ class FirebaseAnalyticsHelper @Inject constructor(
             analytics.logEvent(name, this)
         }
     }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        analytics.setCurrentScreen(activity, name, null)
-    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
deleted file mode 100644
index 10724868a..000000000
--- a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineDispatcher
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class MainCoroutineRule(
-    private val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
-) : TestWatcher() {
-
-    override fun starting(description: Description?) {
-        super.starting(description)
-        Dispatchers.setMain(testDispatcher)
-    }
-
-    override fun finished(description: Description?) {
-        super.finished(description)
-        Dispatchers.resetMain()
-        testDispatcher.cleanupTestCoroutines()
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
deleted file mode 100644
index e60b1d7a2..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy
-
-import io.github.wulkanowy.utils.DispatchersProvider
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-class TestDispatchersProvider : DispatchersProvider() {
-
-    override val backgroundThread: CoroutineDispatcher
-        get() = Dispatchers.Unconfined
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
deleted file mode 100644
index 35a20030b..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.github.wulkanowy
-
-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.db.entities.Timetable
-import io.github.wulkanowy.sdk.Sdk
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
-
-fun createSemesterEntity(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1): Semester {
-    return Semester(
-        studentId = 1,
-        diaryId = diaryId,
-        semesterId = semesterId,
-        diaryName = "$semesterId",
-        schoolYear = 1970,
-        classId = 0,
-        semesterName = semesterName,
-        unitId = 1,
-        start = start,
-        end = end
-    )
-}
-
-fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API): Student {
-    return Student(
-        scrapperBaseUrl = "http://fakelog.cf",
-        email = "jan@fakelog.cf",
-        certificateKey = "",
-        classId = 0,
-        className = "",
-        isCurrent = false,
-        isParent = false,
-        loginMode = mode.name,
-        loginType = "STANDARD",
-        mobileBaseUrl = "",
-        password = "",
-        privateKey = "",
-        registrationDate = now(),
-        schoolName = "",
-        schoolShortName = "test",
-        schoolSymbol = "",
-        studentId = 0,
-        studentName = "",
-        symbol = "",
-        userLoginId = 0,
-        userName = "",
-    )
-}
-
-fun getTimetableEntity(
-    isStudentPlan: Boolean = false,
-    canceled: Boolean = false,
-    start: LocalDateTime = now(),
-    end: LocalDateTime = now()
-) = Timetable(
-    studentId = 0,
-    subject = "",
-    number = 0,
-    diaryId = 0,
-    canceled = canceled,
-    changes = false,
-    date = LocalDate.now(),
-    end = end,
-    group = "",
-    info = "",
-    isStudentPlan = isStudentPlan,
-    room = "",
-    roomOld = "",
-    start = start,
-    subjectOld = "",
-    teacher = "",
-    teacherOld = ""
-)
-
-fun getMessageEntity(
-    messageId: Int,
-    content: String,
-    unread: Boolean
-) = Message(
-    studentId = 1,
-    realId = 1,
-    messageId = messageId,
-    sender = "",
-    senderId = 1,
-    recipient = "",
-    subject = "",
-    date = now(),
-    folderId = 1,
-    unread = unread,
-    unreadBy = 1,
-    readBy = 1,
-    removed = false,
-    hasAttachments = false
-).apply {
-    this.content = content
-}
diff --git a/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
new file mode 100644
index 000000000..8c52d7b37
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Scheduler
+import io.reactivex.schedulers.Schedulers
+
+class TestSchedulersProvider : SchedulersProvider() {
+
+    override val backgroundThread: Scheduler
+        get() = Schedulers.trampoline()
+
+    override val mainThread: Scheduler
+        get() = Schedulers.trampoline()
+}
+
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/TestEnityCreator.kt
new file mode 100644
index 000000000..175242bb8
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/TestEnityCreator.kt
@@ -0,0 +1,47 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.now
+
+fun createSemesterEntity(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1): Semester {
+    return Semester(
+        studentId = 1,
+        diaryId = diaryId,
+        semesterId = semesterId,
+        diaryName = "$semesterId",
+        schoolYear = 1970,
+        classId = 0,
+        semesterName = semesterName,
+        unitId = 1,
+        start = start,
+        end = end
+    )
+}
+
+fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API): Student {
+    return Student(
+        scrapperBaseUrl = "http://fakelog.cf",
+        email = "jan@fakelog.cf",
+        certificateKey = "",
+        classId = 0,
+        className = "",
+        isCurrent = false,
+        isParent = false,
+        loginMode = mode.name,
+        loginType = "STANDARD",
+        mobileBaseUrl = "",
+        password = "",
+        privateKey = "",
+        registrationDate = now(),
+        schoolName = "",
+        schoolShortName = "test",
+        schoolSymbol = "",
+        studentId = 0,
+        studentName = "",
+        symbol = "",
+        userLoginId = 0
+    )
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
new file mode 100644
index 000000000..954c191ce
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class UnitTestInternetObservingStrategy(var isInternetConnection: Boolean = true) : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(isInternetConnection)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(isInternetConnection)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
index 2400c6c46..b684ffc5f 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -1,21 +1,21 @@
 package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Attendance
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 
 class AttendanceRemoteTest {
 
@@ -35,16 +35,16 @@ class AttendanceRemoteTest {
     @Test
     fun getAttendanceTest() {
         every { mockSdk.init(student) } returns mockSdk
-        coEvery {
+        every {
             mockSdk.getAttendance(
                 of(2018, 9, 10),
                 of(2018, 9, 15),
                 1
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getAttendance(of(2018, 9, 10)),
             getAttendance(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -52,12 +52,10 @@ class AttendanceRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val attendance = runBlocking {
-            AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val attendance = AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, attendance.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
index 7be3f84fd..6a93067f2 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -1,21 +1,20 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.repositories.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.CompletedLesson
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 
 class CompletedLessonsRemoteTest {
 
@@ -35,15 +34,15 @@ class CompletedLessonsRemoteTest {
     @Test
     fun getCompletedLessonsTest() {
         every { mockSdk.init(student) } returns mockSdk
-        coEvery {
+        every {
             mockSdk.getCompletedLessons(
                 of(2018, 9, 10),
                 of(2018, 9, 15)
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getCompletedLesson(of(2018, 9, 10)),
             getCompletedLesson(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -51,12 +50,10 @@ class CompletedLessonsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val completed = runBlocking {
-            CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         Assert.assertEquals(2, completed.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
index 23bf0297e..d2b06af78 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -1,21 +1,20 @@
 package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.repositories.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Exam
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 
 class ExamRemoteTest {
 
@@ -37,28 +36,26 @@ class ExamRemoteTest {
         every { mockSdk.init(student) } returns mockSdk
         every { mockSdk.switchDiary(1, 2019) } returns mockSdk
 
-        coEvery {
+        every {
             mockSdk.getExams(
                 of(2018, 9, 10),
                 of(2018, 9, 15),
                 1
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getExam(of(2018, 9, 10)),
             getExam(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
 
-        val exams = runBlocking {
-            ExamRemote(mockSdk).getExams(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val exams = ExamRemote(mockSdk).getExams(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, exams.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
index cd2a3070b..7e481ee47 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -1,17 +1,16 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.repositories.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.GradePointsStatistics
 import io.github.wulkanowy.sdk.pojo.GradeStatistics
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -34,10 +33,10 @@ class GradeStatisticsRemoteTest {
 
     @Test
     fun getGradeStatisticsTest() {
-        coEvery { mockSdk.getGradesPartialStatistics(1) } returns listOf(
+        every { mockSdk.getGradesPartialStatistics(1) } returns Single.just(listOf(
             getGradeStatistics("Fizyka"),
             getGradeStatistics("Matematyka")
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -45,16 +44,16 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = runBlocking { GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false) }
+        val stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false).blockingGet()
         assertEquals(2, stats.size)
     }
 
     @Test
     fun getGradePointsStatisticsTest() {
-        coEvery { mockSdk.getGradesPointsStatistics(1) } returns listOf(
+        every { mockSdk.getGradesPointsStatistics(1) } returns Single.just(listOf(
             getGradePointsStatistics("Fizyka"),
             getGradePointsStatistics("Matematyka")
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -62,7 +61,7 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = runBlocking { GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock) }
+        val stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock).blockingGet()
         assertEquals(2, stats.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
index 1a8157f66..904e8c18c 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -1,17 +1,16 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.repositories.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Maybe
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 class LuckyNumberRemoteTest {
 
@@ -28,17 +27,16 @@ class LuckyNumberRemoteTest {
     @Test
     fun getLuckyNumberTest() {
         every { mockSdk.init(student) } returns mockSdk
-        coEvery { mockSdk.getLuckyNumber("test") } returns 14
+        every { mockSdk.getLuckyNumber("test") } returns Maybe.just(14)
 
         every { mockSdk.diaryId } returns 1
 
-        val luckyNumber = runBlocking {
-            LuckyNumberRemote(mockSdk)
-                .getLuckyNumber(student)
-        }
+        val luckyNumber = LuckyNumberRemote(mockSdk)
+            .getLuckyNumber(student)
+            .blockingGet()
 
-        assertEquals(14, luckyNumber?.luckyNumber)
-        assertEquals(LocalDate.now(), luckyNumber?.date)
-        assertEquals(student.studentId, luckyNumber?.studentId)
+        assertEquals(14, luckyNumber.luckyNumber)
+        assertEquals(LocalDate.now(), luckyNumber.date)
+        assertEquals(student.studentId, luckyNumber.studentId)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
index d07a0f393..b7963d430 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
@@ -1,106 +1,114 @@
 package io.github.wulkanowy.data.repositories.message
 
-import io.github.wulkanowy.data.Status
+import androidx.room.EmptyResultSetException
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.getMessageEntity
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.reactivex.Single
+import io.reactivex.observers.TestObserver
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 import java.net.UnknownHostException
 
 class MessageRepositoryTest {
 
-    @MockK
+    @Mock
     lateinit var local: MessageLocal
 
-    @MockK
+    @Mock
     lateinit var remote: MessageRemote
 
-    @MockK
+    @Mock
     lateinit var student: Student
 
+    private val testObservingStrategy = UnitTestInternetObservingStrategy()
+
     private lateinit var repo: MessageRepository
 
     @Before
     fun setUp() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
 
-        every { student.userName } returns "Jan"
-        repo = MessageRepository(local, remote)
+        repo = MessageRepository(InternetObservingSettings.builder()
+            .strategy(testObservingStrategy)
+            .build(), local, remote)
     }
 
     @Test
     fun `throw error when message is not in the db`() {
-        val testMessage = getMessageEntity(1, "", false)
-        coEvery { local.getMessageWithAttachment(student, testMessage) } throws NullPointerException("No message in database")
+        val testMessage = Message(1, 1, 1, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
 
-        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
-        assertEquals(NullPointerException::class.java, message.exceptionOrNull()?.javaClass)
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(EmptyResultSetException::class.java)
     }
 
     @Test
     fun `get message when content already in db`() {
-        val testMessage = getMessageEntity(123, "Test", false)
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false, false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } returns flowOf(messageWithAttachment)
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
 
-        val message = runBlocking { repo.getMessage(student, testMessage).toList() }
+        val message = repo.getMessage(student, testMessage).blockingGet()
 
-        assertEquals(Status.SUCCESS, message[1].status)
-        assertEquals("Test", message[1].data!!.message.content)
+        assertEquals("Test", message.message.content)
     }
 
     @Test
     fun `get message when content in db is empty`() {
-        val testMessage = getMessageEntity(123, "", true)
-        val testMessageWithContent = testMessage.copy().apply { content = "Test" }
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+        val testMessageWithContent = testMessage.copy(content = "Test")
 
         val mWa = MessageWithAttachment(testMessage, emptyList())
         val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
-        coEvery { remote.getMessagesContentDetails(student, any(), any()) } returns ("Test" to emptyList())
-        coEvery { local.updateMessages(any()) } just Runs
-        coEvery { local.saveMessageAttachments(any()) } just Runs
+        `when`(local.getMessageWithAttachment(student, testMessage))
+            .thenReturn(Single.just(mWa))
+            .thenReturn(Single.just(mWaWithContent))
+        `when`(remote.getMessagesContentDetails(student, testMessageWithContent)).thenReturn(Single.just("Test" to emptyList()))
 
-        val message = runBlocking { repo.getMessage(student, testMessage).toList() }
+        val message = repo.getMessage(student, testMessage).blockingGet()
 
-        assertEquals(Status.SUCCESS, message[2].status)
-        assertEquals("Test", message[2].data!!.message.content)
-        coVerify { local.updateMessages(listOf(testMessageWithContent)) }
+        assertEquals("Test", message.message.content)
+        verify(local).updateMessages(listOf(testMessageWithContent))
     }
 
     @Test
     fun `get message when content in db is empty and there is no internet connection`() {
-        val testMessage = getMessageEntity(123, "", false)
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } throws UnknownHostException()
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
 
-        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
-        assertEquals(UnknownHostException::class.java, message.exceptionOrNull()?.javaClass)
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
     }
 
     @Test
     fun `get message when content in db is empty, unread and there is no internet connection`() {
-        val testMessage = getMessageEntity(123, "", true)
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { local.getMessageWithAttachment(student, testMessage) } throws UnknownHostException()
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
 
-        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
-        assertEquals(UnknownHostException::class.java, message.exceptionOrNull()?.javaClass)
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
index 286cf5e91..adfa55eaa 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
@@ -1,40 +1,43 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.data.repositories.getStudentEntity
+import io.reactivex.Maybe
+import io.reactivex.Single
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDateTime.of
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.of
 
 class MobileDeviceRepositoryTest {
 
-    @MockK
+    @Mock
     private lateinit var semester: Semester
 
-    @MockK
+    @Mock
     private lateinit var mobileDeviceRemote: MobileDeviceRemote
 
-    @MockK
+    @Mock
     private lateinit var mobileDeviceLocal: MobileDeviceLocal
 
     private val student = getStudentEntity()
 
     private lateinit var mobileDeviceRepository: MobileDeviceRepository
 
+    private val settings = InternetObservingSettings.builder()
+        .strategy(UnitTestInternetObservingStrategy())
+        .build()
+
     @Before
     fun initTest() {
-        MockKAnnotations.init(this)
-        mobileDeviceRepository = MobileDeviceRepository(mobileDeviceLocal, mobileDeviceRemote)
+        MockitoAnnotations.initMocks(this)
+        mobileDeviceRepository = MobileDeviceRepository(settings, mobileDeviceLocal, mobileDeviceRemote)
     }
 
     @Test
@@ -44,15 +47,13 @@ class MobileDeviceRepositoryTest {
             getDeviceEntity(2)
         )
 
-        coEvery { mobileDeviceLocal.getDevices(semester) } returns flowOf(emptyList())
-        coEvery { mobileDeviceLocal.deleteDevices(emptyList()) } just Runs
-        coEvery { mobileDeviceLocal.saveDevices(devices) } just Runs
-        coEvery { mobileDeviceRemote.getDevices(student, semester) } returns devices
+        doReturn(Maybe.empty<MobileDevice>()).`when`(mobileDeviceLocal).getDevices(semester)
+        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(student, semester)
 
-        runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toList() }
+        mobileDeviceRepository.getDevices(student, semester).blockingGet()
 
-        coVerify { mobileDeviceLocal.deleteDevices(emptyList()) }
-        coVerify { mobileDeviceLocal.saveDevices(devices) }
+        verify(mobileDeviceLocal).deleteDevices(emptyList())
+        verify(mobileDeviceLocal).saveDevices(devices)
     }
 
     private fun getDeviceEntity(day: Int): MobileDevice {
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
index 5a2388ff7..58c94ab6c 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -1,40 +1,44 @@
 package io.github.wulkanowy.data.repositories.semester
 
-import io.github.wulkanowy.TestDispatchersProvider
-import io.github.wulkanowy.createSemesterEntity
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.data.repositories.createSemesterEntity
+import io.reactivex.Maybe
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate.now
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
 
 class SemesterRepositoryTest {
 
-    @MockK
+    @Mock
     private lateinit var semesterRemote: SemesterRemote
 
-    @MockK
+    @Mock
     private lateinit var semesterLocal: SemesterLocal
 
-    @MockK
+    @Mock
     private lateinit var student: Student
 
     private lateinit var semesterRepository: SemesterRepository
 
+    private val settings = InternetObservingSettings.builder()
+        .strategy(UnitTestInternetObservingStrategy())
+        .build()
+
     @Before
     fun initTest() {
-        MockKAnnotations.init(this)
-        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, TestDispatchersProvider())
-        every { student.loginMode } returns "SCRAPPER"
+        MockitoAnnotations.initMocks(this)
+        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings)
+        doReturn("SCRAPPER").`when`(student).loginMode
     }
 
     @Test
@@ -44,43 +48,33 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
-        coEvery { semesterRemote.getSemesters(student) } returns semesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-        runBlocking { semesterRepository.getSemesters(student) }
+        semesterRepository.getSemesters(student).blockingGet()
 
-        coVerify { semesterLocal.saveSemesters(semesters) }
-        coVerify { semesterLocal.deleteSemesters(emptyList()) }
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
     }
 
     @Test
     fun getSemesters_invalidDiary_api() {
-        every { student.loginMode } returns "API"
+        doReturn("API").`when`(student).loginMode
         val badSemesters = listOf(
             createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
             createSemesterEntity(0, 2, now().minusMonths(3), now())
         )
 
-        val goodSemesters = listOf(
-            createSemesterEntity(122, 1, now().minusMonths(6), now().minusMonths(3)),
-            createSemesterEntity(123, 2, now().minusMonths(3), now())
-        )
+        doReturn(Maybe.just(badSemesters)).`when`(semesterLocal).getSemesters(student)
 
-        coEvery { semesterLocal.getSemesters(student) } returns badSemesters
-        coEvery { semesterRemote.getSemesters(student) } returns goodSemesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
-
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
         assertEquals(0, items[0].diaryId)
     }
 
     @Test
     fun getSemesters_invalidDiary_scrapper() {
-        every { student.loginMode } returns "SCRAPPER"
+        doReturn("SCRAPPER").`when`(student).loginMode
         val badSemesters = listOf(
             createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
             createSemesterEntity(0, 2, now().minusMonths(3), now())
@@ -91,12 +85,10 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returnsMany listOf(badSemesters, badSemesters, goodSemesters)
-        coEvery { semesterRemote.getSemesters(student) } returns goodSemesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+        doReturn(Maybe.just(badSemesters), Maybe.just(badSemesters), Maybe.just(goodSemesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(goodSemesters)).`when`(semesterRemote).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
         assertNotEquals(0, items[0].diaryId)
     }
@@ -108,9 +100,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -121,9 +113,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -134,9 +126,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now(), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student) }
+        val items = semesterRepository.getSemesters(student).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -147,38 +139,26 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
-        coEvery { semesterRemote.getSemesters(student) } returns semesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-        runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
 
-        coVerify { semesterLocal.deleteSemesters(emptyList()) }
-        coVerify { semesterLocal.saveSemesters(semesters) }
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
     }
 
     @Test
     fun getSemesters_noCurrent_refreshOnNoCurrent() {
-        val semestersWithNoCurrent = listOf(
+        val semesters = listOf(
             createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
             createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
         )
 
-        val newSemesters = listOf(
-            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1)),
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
 
-            createSemesterEntity(2, 1, now().minusMonths(1), now().plusMonths(5)),
-            createSemesterEntity(2, 2, now().plusMonths(5), now().plusMonths(11)),
-        )
-
-        coEvery { semesterLocal.getSemesters(student) } returns semestersWithNoCurrent
-        coEvery { semesterRemote.getSemesters(student) } returns newSemesters
-        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
-        coEvery { semesterLocal.saveSemesters(any()) } just Runs
-
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -189,9 +169,9 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 2, now(), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
         assertEquals(2, items.size)
     }
 
@@ -202,15 +182,15 @@ class SemesterRepositoryTest {
             createSemesterEntity(1, 1, now(), now())
         )
 
-        coEvery { semesterLocal.getSemesters(student) } returns semesters
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
 
-        runBlocking { semesterRepository.getCurrentSemester(student) }
+        semesterRepository.getCurrentSemester(student).blockingGet()
     }
 
     @Test(expected = RuntimeException::class)
     fun getCurrentSemester_emptyList() {
-        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
+        doReturn(Maybe.just(emptyList<Semester>())).`when`(semesterLocal).getSemesters(student)
 
-        runBlocking { semesterRepository.getCurrentSemester(student) }
+        semesterRepository.getCurrentSemester(student).blockingGet()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
index 47a10772e..b6b195c91 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -2,31 +2,32 @@ package io.github.wulkanowy.data.repositories.student
 
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Student
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.anyString
+import org.mockito.Mockito.doReturn
+import org.mockito.MockitoAnnotations
 
 class StudentRemoteTest {
 
-    @MockK
+    @Mock
     private lateinit var mockSdk: Sdk
 
     @Before
     fun initApi() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
     }
 
     @Test
     fun testRemoteAll() {
-        coEvery { mockSdk.getStudentsFromScrapper(any(), any(), any(), any()) } returns listOf(getStudent("test"))
+        doReturn(Single.just(listOf(getStudent("test")))).`when`(mockSdk).getStudentsFromScrapper(anyString(), anyString(), anyString(), anyString())
 
-        val students = runBlocking { StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "") }
+        val students = StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "").blockingGet()
         assertEquals(1, students.size)
-        assertEquals("test Kowalski", students.first().student.studentName)
+        assertEquals("test", students.first().studentName)
     }
 
     private fun getStudent(name: String): Student {
@@ -35,10 +36,7 @@ class StudentRemoteTest {
             symbol = "",
             studentId = 0,
             userLoginId = 0,
-            userLogin = "",
-            userName = "",
             studentName = name,
-            studentSurname = "Kowalski",
             schoolSymbol = "",
             schoolShortName = "",
             schoolName = "",
@@ -50,8 +48,7 @@ class StudentRemoteTest {
             mobileBaseUrl = "",
             loginType = Sdk.ScrapperLoginType.STANDARD,
             scrapperBaseUrl = "",
-            isParent = false,
-            semesters = emptyList()
+            isParent = false
         )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
index c948ba31b..c4548db60 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -1,21 +1,20 @@
 package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.data.repositories.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Timetable
 import io.mockk.MockKAnnotations
-import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime.now
 
 class TimetableRemoteTest {
 
@@ -34,15 +33,15 @@ class TimetableRemoteTest {
 
     @Test
     fun getTimetableTest() {
-        coEvery {
+        every {
             mockSdk.getTimetable(
                 of(2018, 9, 10),
                 of(2018, 9, 15)
             )
-        } returns listOf(
+        } returns Single.just(listOf(
             getTimetable(of(2018, 9, 10)),
             getTimetable(of(2018, 9, 17))
-        )
+        ))
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -50,12 +49,10 @@ class TimetableRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val timetable = runBlocking {
-            TimetableRemote(mockSdk).getTimetable(student, semesterMock,
-                of(2018, 9, 10),
-                of(2018, 9, 15)
-            )
-        }
+        val timetable = TimetableRemote(mockSdk).getTimetable(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
         assertEquals(2, timetable.size)
     }
 
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 390098f0d..009ed610e 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -1,45 +1,38 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.createSemesterEntity
-import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.createSemesterEntity
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.flowWithResource
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import java.time.LocalDateTime
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
 
 class GradeAverageProviderTest {
 
-    private suspend fun <T> Flow<Resource<T>>.getResult() = toList()[1].data!!
-
-    @MockK
+    @Mock
     lateinit var preferencesRepository: PreferencesRepository
 
-    @MockK
-    lateinit var semesterRepository: SemesterRepository
-
-    @MockK
+    @Mock
     lateinit var gradeRepository: GradeRepository
 
+    @Mock
+    lateinit var gradeSummaryRepository: GradeSummaryRepository
+
     private lateinit var gradeAverageProvider: GradeAverageProvider
 
-    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
+    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", 1, true, LocalDateTime.now())
 
     private val semesters = mutableListOf(
         createSemesterEntity(10, 21, of(2019, 1, 31), of(2019, 6, 23)),
@@ -48,453 +41,175 @@ class GradeAverageProviderTest {
     )
 
     private val firstGrades = listOf(
-        // avg: 3.5
         getGrade(22, "Matematyka", 4.0),
         getGrade(22, "Matematyka", 3.0),
-
-        // avg: 3.5
         getGrade(22, "Fizyka", 6.0),
         getGrade(22, "Fizyka", 1.0)
     )
 
-    private val firstSummaries = listOf(
-        getSummary(semesterId = 22, subject = "Matematyka", average = 3.9),
-        getSummary(semesterId = 22, subject = "Fizyka", average = 3.1)
-    )
-
-    private val secondGrades = listOf(
-        // avg: 2.5
+    private val secondGrade = listOf(
         getGrade(23, "Matematyka", 2.0),
         getGrade(23, "Matematyka", 3.0),
-
-        // avg: 3.0
         getGrade(23, "Fizyka", 4.0),
         getGrade(23, "Fizyka", 2.0)
     )
 
-    private val secondSummaries = listOf(
-        getSummary(semesterId = 23, subject = "Matematyka", average = 2.9),
-        getSummary(semesterId = 23, subject = "Fizyka", average = 3.4)
-    )
-
     private val secondGradeWithModifier = listOf(
-        // avg: 3.375
         getGrade(24, "Język polski", 3.0, -0.50),
         getGrade(24, "Język polski", 4.0, 0.25)
     )
 
-    private val secondSummariesWithModifier = listOf(
-        getSummary(24, "Język polski", 3.49)
-    )
-
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
+    fun initTest() {
+        MockitoAnnotations.initMocks(this)
+        gradeAverageProvider = GradeAverageProvider(preferencesRepository, gradeRepository, gradeSummaryRepository)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        doReturn(.33).`when`(preferencesRepository).gradeMinusModifier
+        doReturn(.33).`when`(preferencesRepository).gradePlusModifier
+        doReturn(false).`when`(preferencesRepository).gradeAverageForceCalc
 
-        gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], true)
+        doReturn(Single.just(secondGrade)).`when`(gradeRepository).getGrades(student, semesters[2], true)
     }
 
     @Test
-    fun `force calc average on no grades`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+    fun onlyOneSemesterTest() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[2], true)
 
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { emptyList<Grade>() to emptyList<GradeSummary>() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { emptyList<Grade>() to emptyList<GradeSummary>() }
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(0, items.size)
+        assertEquals(2, averages.size)
+        assertEquals(2.5, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.0, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with default modifiers in scraper mode`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        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 }
+    fun onlyOneSemester_gradesWithModifiers_default() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student, semesters[2], true)
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(3.5, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in scraper mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+    fun onlyOneSemester_gradesWithModifiers_api() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student.copy(loginMode = Sdk.Mode.API.name), semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.API.name), semesters[2], true)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.API.name), semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        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 }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(3.375, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in api mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.API.name)
+    fun onlyOneSemester_gradesWithModifiers_scrapper() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.SCRAPPER.name), semesters[2], true)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33  // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.SCRAPPER.name), semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        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 }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(3.5, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average with custom modifiers in hybrid mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
+    fun onlyOneSemester_gradesWithModifiers_hybrid() {
+        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters[2], true)
+        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters[2], true)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        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 }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(3.375, averages.single { it.first == "Język polski" }.second, .0)
     }
 
     @Test
-    fun `calc current semester average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
+    fun allYearFirstSemesterTest() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[1], true)
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[1].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(2.9, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 2,9
-        assertEquals(3.4, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,4
+        assertEquals(2, averages.size)
+        assertEquals(3.5, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.5, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test
-    fun `force calc current semester average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
+    fun allYearSecondSemesterTest() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[2], true)
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0) // from details: 2,5
-        assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,0
+        assertEquals(2, averages.size)
+        assertEquals(3.0, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.25, averages.single { it.first == "Fizyka" }.second, .0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun incorrectAverageModeTest() {
+        doReturn("test_mode").`when`(preferencesRepository).gradeAverageMode
+
+        gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true).blockingGet()
     }
 
     @Test
-    fun `force calc full year average when current is first`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
+    fun onlyOneSemester_averageFromSummary() {
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(listOf(
+            getSummary(22, "Matematyka", 3.1),
+            getSummary(22, "Fizyka", 3.26)
+        ))).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[2], true)
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).getResult() }
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summary): 3,5
-        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0) // (from summary): 3,5
+        assertEquals(2, averages.size)
+        assertEquals(3.1, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.26, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
     @Test
-    fun `calc both semesters average`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            firstGrades to listOf(
-                getSummary(22, "Matematyka", 3.0),
-                getSummary(22, "Fizyka", 3.5)
-            )
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            secondGrades to listOf(
-                getSummary(22, "Matematyka", 3.5),
-                getSummary(22, "Fizyka", 4.0)
-            )
-        }
+    fun onlyOneSemester_averageFromSummary_forceCalc() {
+        doReturn(true).`when`(preferencesRepository).gradeAverageForceCalc
+        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
+        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
+        doReturn(Single.just(listOf(
+            getSummary(22, "Matematyka", 3.1),
+            getSummary(22, "Fizyka", 3.26)
+        ))).`when`(gradeSummaryRepository).getGradesSummary(student, semesters[2], true)
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
+            .blockingGet()
 
-        assertEquals(2, items.size)
-        assertEquals(3.25, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
-        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
+        assertEquals(2, averages.size)
+        assertEquals(3.0, averages.single { it.first == "Matematyka" }.second, .0)
+        assertEquals(3.25, averages.single { it.first == "Fizyka" }.second, .0)
     }
 
-    @Test
-    fun `force calc full year average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        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 {
-            secondGrades to listOf(
-                getSummary(22, "Matematyka", 1.1),
-                getSummary(22, "Fizyka", 7.26)
-            )
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc both semesters average when no summaries`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList<GradeSummary>() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList<GradeSummary>() }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5 + 3,0 → 3,25
-    }
-
-    @Test
-    fun `force calc full year average when no summaries`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList<GradeSummary>() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList<GradeSummary>() }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc both semesters average when missing summaries in both semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            firstGrades to listOf(
-                getSummary(22, "Matematyka", 4.0)
-            )
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            secondGrades to listOf(
-                getSummary(23, "Matematyka", 3.0)
-            )
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 4,0 + 3,0 → 3,5
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `calc both semesters average when missing summary in second semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries.dropLast(1) }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
-        assertEquals(3.05, items.single { it.subject == "Fizyka" }.average, .0) // 3,1 (from summary) + 3,0 (from details) → 3,05
-    }
-
-    @Test
-    fun `calc both semesters average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
-        assertEquals(3.45, items.single { it.subject == "Fizyka" }.average, .0) // 3,5 (from details) + 3,4 (from summary) → 3,45
-    }
-
-    @Test
-    fun `force calc full year average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `force calc both semesters average with different average from all grades and from two semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.3, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.2296, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → 5.229636363636364
-    }
-
-    @Test
-    fun `force calc full year average with different average from all grades and from two semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.3, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.5429, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → .average()
-    }
-
-    @Test
-    fun `force calc both semesters average with different average from all grades and from two semesters with custom modifiers`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
-
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .5
-
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.2636, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,8 → 5.26363636
-    }
-
-    @Test
-    fun `force calc full year average with different average from all grades and from two semesters with custom modifiers`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
-
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .5
-
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.5555, items.single { it.subject == "Fizyka" }.average, .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): Grade {
         return Grade(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
             value = value,
             modifier = modifier,
-            weightValue = weight,
+            weightValue = 1.0,
             teacher = "",
             date = now(),
             weight = "",
@@ -506,12 +221,12 @@ class GradeAverageProviderTest {
         )
     }
 
-    private fun getSummary(semesterId: Int, subject: String, average: Double): GradeSummary {
+    private fun getSummary(semesterId: Int, subject: String, value: Double): GradeSummary {
         return GradeSummary(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
-            average = average,
+            average = value,
             pointsSum = "",
             proposedPoints = "",
             finalPoints = "",
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index 4f32cf7eb..4ef5904fb 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -1,55 +1,56 @@
 package io.github.wulkanowy.ui.modules.login
 
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.mockk.MockKAnnotations
-import io.mockk.clearMocks
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
 
 class LoginPresenterTest {
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginView: LoginView
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
     private lateinit var presenter: LoginPresenter
 
     @Before
     fun initPresenter() {
-        MockKAnnotations.init(this)
-        clearMocks(loginView)
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(loginView)
 
-        presenter = LoginPresenter(errorHandler, studentRepository)
+        presenter = LoginPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
         presenter.onAttachView(loginView)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginView.initView() }
-        verify { loginView.showActionBar(false) }
+        verify(loginView).initView()
+        verify(loginView).showActionBar(false)
     }
 
     @Test
     fun onBackPressedTest() {
-        clearMocks(loginView)
-        every { loginView.currentViewIndex } returns 1
+        clearInvocations(loginView)
+        doReturn(1).`when`(loginView).currentViewIndex
         presenter.onBackPressed { }
-        verify { loginView.switchView(0) }
+        verify(loginView).switchView(0)
     }
 
     @Test
     fun onBackPressedDefaultTest() {
         var i = 0
-        every { loginView.currentViewIndex } returns 0
+        doReturn(0).`when`(loginView).currentViewIndex
         presenter.onBackPressed { i++ }
         assertNotEquals(0, i)
     }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index daacbac20..9d226dac9 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -1,169 +1,157 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.time.LocalDateTime.now
-import java.io.IOException
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.never
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 
 class LoginFormPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginFormView: LoginFormView
 
-    @MockK
+    @Mock
     lateinit var repository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: LoginFormPresenter
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-
-        every { loginFormView.initView() } just Runs
-        every { loginFormView.showContact(any()) } just Runs
-        every { loginFormView.showVersion() } just Runs
-        every { loginFormView.showProgress(any()) } just Runs
-        every { loginFormView.showContent(any()) } just Runs
-        every { loginFormView.formHostSymbol } returns "Default"
-        every { loginFormView.setErrorPassInvalid(any()) } just Runs
-        every { loginFormView.setErrorPassRequired(any()) } just Runs
-        every { loginFormView.setErrorUsernameRequired() } just Runs
-
-        presenter = LoginFormPresenter(repository, errorHandler, analytics)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(repository, loginFormView)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), repository, errorHandler, analytics)
         presenter.onAttachView(loginFormView)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginFormView.initView() }
+        verify(loginFormView).initView()
     }
 
     @Test
     fun emptyNicknameLoginTest() {
-        every { loginFormView.formUsernameValue } returns ""
-        every { loginFormView.formPassValue } returns "test123"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        `when`(loginFormView.formUsernameValue).thenReturn("")
+        `when`(loginFormView.formPassValue).thenReturn("test123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify { loginFormView.setErrorUsernameRequired() }
-        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
-        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
+        verify(loginFormView).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorPassRequired(false)
+        verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns ""
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
-        verify { loginFormView.setErrorPassRequired(true) }
-        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
+        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView).setErrorPassRequired(true)
+        verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
-        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
-        verify { loginFormView.setErrorPassInvalid(true) }
+        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorPassRequired(true)
+        verify(loginFormView).setErrorPassInvalid(true)
     }
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false, userName = "")
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf(StudentWithSemesters(studentTest, emptyList()))
+        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false)
+        doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
 
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.hideSoftKeyboard() }
-        verify { loginFormView.showProgress(true) }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
     }
 
     @Test
     fun loginEmptyTest() {
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
+        doReturn(Single.just(emptyList<Student>()))
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showProgress(true) }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
     }
 
     @Test
     fun loginEmptyTwiceTest() {
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
+        doReturn(Single.just(emptyList<Student>()))
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
         presenter.onSignInClick()
 
-        verify(exactly = 2) { loginFormView.hideSoftKeyboard() }
-        verify(exactly = 2) { loginFormView.showProgress(true) }
-        verify(exactly = 2) { loginFormView.showProgress(false) }
-        verify(exactly = 2) { loginFormView.showContent(false) }
-        verify(exactly = 2) { loginFormView.showContent(true) }
+        verify(loginFormView, times(2)).hideSoftKeyboard()
+        verify(loginFormView, times(2)).showProgress(true)
+        verify(loginFormView, times(2)).showProgress(false)
+        verify(loginFormView, times(2)).showContent(false)
+        verify(loginFormView, times(2)).showContent(true)
     }
 
     @Test
     fun loginErrorTest() {
-        val testException = IOException("test")
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } throws testException
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
-        every { loginFormView.formHostSymbol } returns "Default"
-        every { loginFormView.showProgress(any()) } just Runs
-        every { loginFormView.showProgress(any()) } just Runs
+        val testException = RuntimeException("test")
+        doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.hideSoftKeyboard() }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
-        verify { errorHandler.dispatch(match { it.message == testException.message }) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
+        verify(errorHandler).dispatch(testException)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index b3a24a2ac..258dc54fe 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -1,88 +1,73 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.clearMocks
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
+import io.reactivex.Completable
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.time.LocalDateTime.now
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 
 class LoginStudentSelectPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginStudentSelectView: LoginStudentSelectView
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false, userName = "") }
+    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false) }
 
     private val testException by lazy { RuntimeException("Problem") }
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-
-        clearMocks(studentRepository, loginStudentSelectView)
-        every { loginStudentSelectView.initView() } just Runs
-        every { loginStudentSelectView.showContact(any()) } just Runs
-        every { loginStudentSelectView.enableSignIn(any()) } just Runs
-        every { loginStudentSelectView.showProgress(any()) } just Runs
-        every { loginStudentSelectView.showContent(any()) } just Runs
-
-        presenter = LoginStudentSelectPresenter(studentRepository, errorHandler, analytics)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(studentRepository, loginStudentSelectView)
+        presenter = LoginStudentSelectPresenter(TestSchedulersProvider(), studentRepository, errorHandler, analytics)
         presenter.onAttachView(loginStudentSelectView, null)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginStudentSelectView.initView() }
+        verify(loginStudentSelectView).initView()
     }
 
     @Test
     fun onSelectedStudentTest() {
-        coEvery { studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList()))) } returns listOf(1L)
-        coEvery { studentRepository.switchStudent(StudentWithSemesters(testStudent, emptyList())) } just Runs
-        every { loginStudentSelectView.openMainView() } just Runs
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent, false))
         presenter.onSignIn()
-
-        verify { loginStudentSelectView.showContent(false) }
-        verify { loginStudentSelectView.showProgress(true) }
-        verify { loginStudentSelectView.openMainView() }
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(loginStudentSelectView).openMainView()
     }
 
     @Test
     fun onSelectedStudentErrorTest() {
-        coEvery { studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList()))) } throws testException
-        coEvery { studentRepository.logoutStudent(testStudent) } just Runs
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent, false))
         presenter.onSignIn()
-        verify { loginStudentSelectView.showContent(false) }
-        verify { loginStudentSelectView.showProgress(true) }
-        verify { errorHandler.dispatch(match { testException.message == it.message }) }
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(errorHandler).dispatch(testException)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index fc2832b2e..936098970 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,67 +1,58 @@
 package io.github.wulkanowy.ui.modules.main
 
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.clearMocks
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
 
 class MainPresenterTest {
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: ErrorHandler
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var prefRepository: PreferencesRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var syncManager: SyncManager
 
-    @MockK
+    @Mock
     lateinit var mainView: MainView
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: MainPresenter
 
     @Before
     fun initPresenter() {
-        MockKAnnotations.init(this)
-        clearMocks(mainView)
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(mainView)
 
-        every { mainView.startMenuIndex = any() } just Runs
-        every { mainView.startMenuMoreIndex = any() } just Runs
-        every { mainView.startMenuIndex } returns 1
-        every { mainView.startMenuMoreIndex } returns 1
-        every { mainView.initView() } just Runs
-        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, analytics)
+        presenter = MainPresenter(TestSchedulersProvider(), errorHandler, studentRepository, prefRepository, syncManager, analytics)
         presenter.onAttachView(mainView, null)
     }
 
     @Test
     fun initMenuTest() {
-        verify { mainView.initView() }
+        verify(mainView).initView()
     }
 
     @Test
     fun onTabSelectedTest() {
-        every { mainView.notifyMenuViewChanged() } just Runs
-
-        every { mainView.switchMenuView(1) } just Runs
         presenter.onTabSelected(1, false)
-        verify { mainView.switchMenuView(1) }
+        verify(mainView).switchMenuView(1)
     }
 }
+
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 a81f1abd9..34d0ce5cb 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,49 +1,46 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
 
 class SplashPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var splashView: SplashView
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: ErrorHandler
 
     private lateinit var presenter: SplashPresenter
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        presenter = SplashPresenter(errorHandler, studentRepository)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        presenter = SplashPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
     }
 
     @Test
     fun testOpenLoginView() {
-        coEvery { studentRepository.isCurrentStudentSet() } returns false
+        doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
         presenter.onAttachView(splashView)
-        verify { splashView.openLoginView() }
+        verify(splashView).openLoginView()
     }
 
     @Test
     fun testMainMainView() {
-        coEvery { studentRepository.isCurrentStudentSet() } returns true
+        doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
         presenter.onAttachView(splashView)
-        verify { splashView.openMainView() }
+        verify(splashView).openMainView()
     }
 }
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 e1693d523..ece7acf20 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -3,21 +3,21 @@ 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.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate
 
 class GradeExtensionTest {
 
-    @MockK
+    @Mock
     lateinit var date: LocalDate
 
     @Before
     fun before() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index 9709ded36..024b4727b 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -4,9 +4,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import java.time.LocalDate.of
-import java.time.LocalDateTime
-import java.time.Month.JANUARY
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month.JANUARY
 import java.util.Locale
 
 class TimeExtensionTest {
@@ -38,12 +38,12 @@ class TimeExtensionTest {
     }
 
     @Test
-    fun sundayTestTest() {
-        assertEquals(of(2018, 10, 7), of(2018, 10, 2).sunday)
-        assertEquals(of(2018, 10, 7), of(2018, 10, 5).sunday)
-        assertEquals(of(2018, 10, 7), of(2018, 10, 6).sunday)
-        assertEquals(of(2018, 10, 7), of(2018, 10, 7).sunday)
-        assertEquals(of(2018, 10, 14), of(2018, 10, 8).sunday)
+    fun fridayTest() {
+        assertEquals(of(2018, 10, 5), of(2018, 10, 2).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 5).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 6).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 7).friday)
+        assertEquals(of(2018, 10, 12), of(2018, 10, 8).friday)
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
deleted file mode 100644
index eac84759d..000000000
--- a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.getTimetableEntity
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.time.LocalDateTime.now
-
-class TimetableExtensionTest {
-
-    @Test
-    fun isShowTimeUntil() {
-        assertFalse(getTimetableEntity().isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = false).isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = true).isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(5)).isShowTimeUntil(now().plusMinutes(5)))
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(61)).isShowTimeUntil(now().minusMinutes(5)))
-
-        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(now().minusMinutes(5)))
-        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(null))
-
-        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
-    }
-
-    @Test
-    fun getLeft() {
-        assertEquals(null, getTimetableEntity(canceled = true).left)
-        assertEquals(null, getTimetableEntity(start = now().plusMinutes(5), end = now().plusMinutes(50)).left)
-        assertEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = false).left)
-        assertNotEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = true).left)
-    }
-
-    @Test
-    fun isJustFinished() {
-        assertFalse(getTimetableEntity(end = now().minusSeconds(16)).isJustFinished)
-        assertTrue(getTimetableEntity(end = now().minusSeconds(14)).isJustFinished)
-        assertTrue(getTimetableEntity(end = now().minusSeconds(1)).isJustFinished)
-        assertFalse(getTimetableEntity(end = now().plusSeconds(1)).isJustFinished)
-    }
-}
diff --git a/build.gradle b/build.gradle
index 9f239fddc..658cb977e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,25 +1,23 @@
 buildscript {
-    ext {
-        kotlin_version = '1.4.0'
-        about_libraries = '8.3.0'
-        hilt_version = "2.28.3-alpha"
-    }
+    ext.kotlin_version = '1.3.72'
+    ext.about_libraries = '8.1.2'
     repositories {
         mavenCentral()
         google()
         jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.1'
-        classpath "com.github.triplet.gradle:play-publisher:2.7.5"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
+        //noinspection GradleDependency https://github.com/firebase/firebase-android-sdk/issues/1276#issuecomment-592098283
+        classpath "io.fabric.tools:gradle:1.31.0"
+        classpath "com.github.triplet.gradle:play-publisher:2.7.3"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
     }
 }
 
diff --git a/crowdin.yml b/crowdin.yml
deleted file mode 100644
index 2399a56b5..000000000
--- a/crowdin.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-files:
-  - source: /app/src/main/res/values/*.xml
-    ignore:
-      - /app/src/main/res/values/styles.xml
-      - /app/src/main/res/values/api_hosts.xml
-      - /app/src/main/res/values/api_symbols.xml
-      - /app/src/main/res/values/attrs.xml
-      - /app/src/main/res/values/colors.xml
-      - /app/src/main/res/values/dimens.xml
-      - /app/src/main/res/values/preferences_keys.xml
-      - /app/src/main/res/values/preferences_defaults.xml
-    translation: /app/src/main/res/values-%android_code%/%original_file_name%
-    translate_attributes: 0
-    content_segmentation: 0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6623300be..84a906615 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.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists