273 changed files with 1094 additions and 10881 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -98,7 +98,7 @@ jobs:
          command: yes | sdkmanager --licenses && yes | sdkmanager --update
      - run:
          name: Setup emulator
-          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
      - run:
          name: Launch emulator
          command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
@ -116,7 +116,7 @@ jobs:
            adb shell input keyevent 82
      - run:
          name: Run instrumented tests
-          command: ./gradlew clean createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createPlayDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
      - run:
          name: Collect logs from emulator
          command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
--- a/.gitignore
+++ b/.gitignore
@ -110,5 +110,4 @@ Thumbs.db

 ### AndroidStudio Patch ###

-!/gradle/wrapper/gradle-wrapper.jar
-.idea/jarRepositories.xml
+!/gradle/wrapper/gradle-wrapper.jar
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
    <JetCodeStyleSettings>
      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
        <value>
--- a/.travis.yml
+++ b/.travis.yml
@ -3,8 +3,8 @@ jdk: oraclejdk8

 env:
 global:
-    - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3

 cache:
  directories:
@ -14,7 +14,7 @@ cache:
 branches:
  only:
    - develop
-    - 0.13.0
+    - 0.10.1

 android:
 licenses:
@ -34,12 +34,12 @@ android:
    - extra-android-m2repository
    - addon-google_apis-google-$ANDROID_API_LEVEL
    # Android emulator
-    - android-22
-    - sys-img-armeabi-v7a-android-22
+    - android-19
+    - sys-img-armeabi-v7a-android-19

 before_script:
    # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
    - emulator -avd test -no-audio -no-window &
    - android-wait-for-emulator
    - adb shell input keyevent 82 &
@ -50,7 +50,7 @@ script:
  - fossa --no-ansi || true
  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createPlayDebugCoverageReport --stacktrace --daemon
  - ./gradlew jacocoTestReport --stacktrace --daemon
  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
      git fetch --unshallow;
--- a/README.en.md
+++ b/README.en.md
@ -4,8 +4,8 @@
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)

 Unofficial android VULCAN UONET+ register client for student and parent

--- a/README.md
+++ b/README.md
@ -4,8 +4,8 @@
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)

 Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica

--- a/app/build.gradle
+++ b/app/build.gradle
@ -9,16 +9,16 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'

 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'

    defaultConfig {
        applicationId "io.github.wulkanowy"
        testApplicationId "io.github.tests.wulkanowy"
        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 48
-        versionName "0.13.0"
+        targetSdkVersion 28
+        versionCode 44
+        versionName "0.10.1"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
@ -28,10 +28,8 @@ android {
        ]
        javaCompileOptions {
            annotationProcessorOptions {
-                arguments = [
-                        "room.schemaLocation": "$projectDir/schemas".toString(),
-                        "room.incremental"   : "true"
-                ]
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString(),
+                             "room.incremental"   : "true"]
            }
        }
    }
@ -63,6 +61,7 @@ android {
            versionNameSuffix "-dev"
            testCoverageEnabled = true
            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
+            multiDexKeepProguard file('proguard-multidex-rules.pro')
        }
    }

@ -110,36 +109,38 @@ play {
 }

 ext {
-    work_manager = "2.3.0-beta01"
-    room = "2.2.2"
-    dagger = "2.25.2"
+    work_manager = "2.2.0"
+    room = "2.2.0-beta01"
+    dagger = "2.24"
    chucker = "2.0.4"
    mockk = "1.9.2"
+    mockito_core = "3.0.6"
 }

 configurations.all {
    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
+    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
 }

 dependencies {
-    implementation "io.github.wulkanowy:api:0.13.0"
+    implementation "io.github.wulkanowy:api:0.10.1"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0-rc01"
-    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
+    implementation "androidx.core:core-ktx:1.1.0"
+    implementation "androidx.activity:activity-ktx:1.0.0"
    implementation "androidx.appcompat:appcompat:1.1.0"
    implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.0-rc03"
+    implementation "androidx.fragment:fragment-ktx:1.1.0"
    implementation "androidx.annotation:annotation:1.1.0"
    implementation "androidx.multidex:multidex:2.0.1"

    implementation "androidx.preference:preference-ktx:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0-beta03"
    implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.1.0-beta02"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
+    implementation "com.google.android.material:material:1.1.0-alpha07"
    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"
@ -156,28 +157,26 @@ dependencies {
    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 "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"

    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.1.0"

    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.15"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.12"

-    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.google.code.gson:gson:2.8.5"
    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
    implementation "com.jakewharton.timber:timber:4.7.1"
    implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
-    implementation "com.mikepenz:aboutlibraries:7.0.4"
-    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.3"
+    implementation "com.mikepenz:aboutlibraries:7.0.3"

-    playImplementation "com.google.firebase:firebase-core:17.2.1"
+    playImplementation "com.google.firebase:firebase-core:17.2.0"
    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"

    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
@ -188,7 +187,10 @@ dependencies {
    testImplementation "junit:junit:4.12"
    testImplementation "io.mockk:mockk:$mockk"
    testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-inline:3.2.0"
+    testImplementation "org.mockito:mockito-core:$mockito_core"
+    testImplementation("org.mockito:mockito-inline:3.0.6") {
+        exclude group: "org.mockito", module: "mockito-core"
+    }

    androidTestImplementation "androidx.test:core:1.2.0"
    androidTestImplementation "androidx.test:runner:1.2.0"
@ -196,7 +198,10 @@ dependencies {
    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.2.0"
+    androidTestImplementation "org.mockito:mockito-core:$mockito_core"
+    androidTestImplementation("org.mockito:mockito-android:3.0.6") {
+        exclude group: 'org.mockito', module: 'mockito-core'
+    }
 }

 apply plugin: 'com.google.gms.google-services'
--- a/app/proguard-multidex-rules.pro
+++ b/app/proguard-multidex-rules.pro
@ -0,0 +1,3 @@
+-keep class android.support.test.internal** { *; }
+-keep class org.junit.** { *; }
+-keep public class io.github.wulkanowy** { *; }
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/16.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/17.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/18.json
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@ -22,7 +22,12 @@ abstract class AbstractMigrationTest {
    fun getMigratedRoomDatabase(): AppDatabase {
        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
            AppDatabase::class.java, dbName)
-            .addMigrations(*AppDatabase.getMigrations())
+            .addMigrations(
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15()
+            )
            .build()
        // close the database and release any stream resources when the test finishes
        helper.closeWhenFinished(database)
--- 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
@ -3,14 +3,10 @@ package io.github.wulkanowy.data.db.migrations
 import android.content.ContentValues
 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 org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
 import org.junit.Test
-import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
-import kotlin.test.assertFalse
 import kotlin.test.assertTrue

 class Migration13Test : AbstractMigrationTest() {
@ -101,9 +97,11 @@ class Migration13Test : AbstractMigrationTest() {
            close()
        }

-        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())

-        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
+        val db = getMigratedRoomDatabase()
+
+        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
        semesters1[0].run {
            assertFalse(isCurrent)
@ -121,7 +119,7 @@ class Migration13Test : AbstractMigrationTest() {
            assertEquals(2, diaryId)
        }

-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+        db.semesterDao.loadAll(2, 5).blockingGet().let {
            assertTrue { it.single { it.isCurrent }.isCurrent }
            assertEquals(1970, it[0].schoolYear)
            assertEquals(of(1970, 1, 1), it[0].end)
@ -132,7 +130,7 @@ class Migration13Test : AbstractMigrationTest() {
            assertTrue(it[3].isCurrent)
        }

-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+        db.semesterDao.loadAll(2, 5).blockingGet().let {
            assertTrue { it.single { it.isCurrent }.isCurrent }
            assertFalse(it[0].isCurrent)
            assertFalse(it[1].isCurrent)
@ -141,30 +139,6 @@ class Migration13Test : AbstractMigrationTest() {
        }
    }

-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
-        val semesters = mutableListOf<Semester>()
-
-        val cursor = db.query(query)
-        if (cursor.moveToFirst()) {
-            do {
-                semesters.add(Semester(
-                    studentId = cursor.getInt(1),
-                    diaryId = cursor.getInt(2),
-                    diaryName = cursor.getString(3),
-                    semesterId = cursor.getInt(4),
-                    semesterName = cursor.getInt(5),
-                    isCurrent = cursor.getInt(6) == 1,
-                    classId = cursor.getInt(7),
-                    unitId = cursor.getInt(8),
-                    schoolYear = cursor.getInt(9),
-                    start = Converters().timestampToDate(cursor.getLong(10))!!,
-                    end = Converters().timestampToDate(cursor.getLong(11))!!
-                ))
-            } while (cursor.moveToNext())
-        }
-        return semesters.toList()
-    }
-
    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
            put("endpoint", "https://fakelog.cf")
--- 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
@ -4,7 +4,6 @@ import androidx.room.Room
 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.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.After
@ -25,7 +24,7 @@ class GradeStatisticsLocalTest {
    fun createDb() {
        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
            .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
    }

    @After
@ -64,52 +63,7 @@ class GradeStatisticsLocalTest {
        assertEquals(stats[0].subject, "Wszystkie")
    }

-    @Test
-    fun saveAndRead_points() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
-            getGradePointsStatistics("Matematyka", 2, 1),
-            getGradePointsStatistics("Chemia", 2, 1),
-            getGradePointsStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        with(stats) {
-            assertEquals(subject, "Matematyka")
-            assertEquals(others, 5.0)
-            assertEquals(student, 5.0)
-        }
-    }
-
-    @Test
-    fun saveAndRead_subjectEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        assertEquals(null, stats)
-    }
-
-    @Test
-    fun saveAndRead_allEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
-
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(null, stats)
-    }
-
    private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
        return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
    }
-
-    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
-        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
-    }
 }
--- a/app/src/debug/res/values-pl/strings.xml
+++ b/app/src/debug/res/values-pl/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Wulkanowy DEV</string>
+</resources>
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@ -6,13 +6,10 @@ import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
 import com.jakewharton.threetenabp.AndroidThreeTen
-import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
-import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
@ -35,9 +32,6 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
    @Inject
    lateinit var themeManager: ThemeManager

-    @Inject
-    lateinit var sharedPrefProvider: SharedPrefProvider
-
    @Inject
    lateinit var appInfo: AppInfo

@ -50,9 +44,7 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
        super.onCreate()
        AndroidThreeTen.init(this)
        RxJavaPlugins.setErrorHandler(::onError)
-        Lingver.init(this)
        themeManager.applyDefaultTheme()
-        migrateSharedPreferences()

        initLogging()
        initCrashlytics(this, appInfo)
@ -68,13 +60,6 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
        registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
    }

-    private fun migrateSharedPreferences() {
-        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1) < 48) { // #596
-            sharedPrefProvider.delete(getString(R.string.pref_key_grade_modifier_plus))
-            sharedPrefProvider.delete(getString(R.string.pref_key_grade_modifier_minus))
-        }
-    }
-
    private fun onError(error: Throwable) {
        //RxJava's too deep stack traces may cause SOE on older android devices
        val cause = error.cause
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@ -85,10 +85,6 @@ internal class RepositoryModule {
    @Provides
    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics

-    @Singleton
-    @Provides
-    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
-
    @Singleton
    @Provides
    fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@ -140,12 +136,4 @@ internal class RepositoryModule {
    @Singleton
    @Provides
    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
-
-    @Singleton
-    @Provides
-    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
-
-    @Singleton
-    @Provides
-    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
 }
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@ -6,13 +6,11 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
@ -22,18 +20,15 @@ import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
@ -43,11 +38,9 @@ import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-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.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
@ -55,9 +48,6 @@ import io.github.wulkanowy.data.db.migrations.Migration12
 import io.github.wulkanowy.data.db.migrations.Migration13
 import io.github.wulkanowy.data.db.migrations.Migration14
 import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration16
-import io.github.wulkanowy.data.db.migrations.Migration17
-import io.github.wulkanowy.data.db.migrations.Migration18
 import io.github.wulkanowy.data.db.migrations.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@ -80,7 +70,6 @@ import javax.inject.Singleton
        Grade::class,
        GradeSummary::class,
        GradeStatistics::class,
-        GradePointsStatistics::class,
        Message::class,
        Note::class,
        Homework::class,
@ -89,9 +78,7 @@ import javax.inject.Singleton
        CompletedLesson::class,
        ReportingUnit::class,
        Recipient::class,
-        MobileDevice::class,
-        Teacher::class,
-        School::class
+        MobileDevice::class
    ],
    version = AppDatabase.VERSION_SCHEMA,
    exportSchema = true
@ -100,36 +87,29 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {

    companion object {
-        const val VERSION_SCHEMA = 18
-
-        fun getMigrations(): Array<Migration> {
-            return arrayOf(
-                Migration2(),
-                Migration3(),
-                Migration4(),
-                Migration5(),
-                Migration6(),
-                Migration7(),
-                Migration8(),
-                Migration9(),
-                Migration10(),
-                Migration11(),
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15(),
-                Migration16(),
-                Migration17(),
-                Migration18()
-            )
-        }
+        const val VERSION_SCHEMA = 15

        fun newInstance(context: Context): AppDatabase {
            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                .setJournalMode(TRUNCATE)
                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
                .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(*getMigrations())
+                .addMigrations(
+                    Migration2(),
+                    Migration3(),
+                    Migration4(),
+                    Migration5(),
+                    Migration6(),
+                    Migration7(),
+                    Migration8(),
+                    Migration9(),
+                    Migration10(),
+                    Migration11(),
+                    Migration12(),
+                    Migration13(),
+                    Migration14(),
+                    Migration15()
+                )
                .build()
        }
    }
@ -152,8 +132,6 @@ abstract class AppDatabase : RoomDatabase() {

    abstract val gradeStatistics: GradeStatisticsDao

-    abstract val gradePointsStatistics: GradePointsStatisticsDao
-
    abstract val messagesDao: MessagesDao

    abstract val noteDao: NoteDao
@ -171,8 +149,4 @@ abstract class AppDatabase : RoomDatabase() {
    abstract val recipientDao: RecipientDao

    abstract val mobileDeviceDao: MobileDeviceDao
-
-    abstract val teacherDao: TeacherDao
-
-    abstract val schoolDao: SchoolDao
 }
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@ -8,10 +8,6 @@ import javax.inject.Singleton
@Singleton
 class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {

-    companion object {
-        const val APP_VERSION_CODE_KEY = "app_version_code"
-    }
-
    fun putLong(key: String, value: Long, sync: Boolean = false) {
        sharedPref.edit(sync) { putLong(key, value) }
    }
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.reactivex.Maybe
@ -9,7 +11,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface AttendanceDao : BaseDao<Attendance> {
+interface AttendanceDao {
+
+    @Insert
+    fun insertAll(exams: List<Attendance>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<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): Maybe<List<Attendance>>
--- 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
@ -1,12 +1,20 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.reactivex.Maybe

@Dao
-interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
+interface AttendanceSummaryDao {
+
+    @Insert
+    fun insertAll(exams: List<AttendanceSummary>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<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): Maybe<List<AttendanceSummary>>
--- 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
@ -1,17 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Update
-
-interface BaseDao<T> {
-
-    @Insert
-    fun insertAll(items: List<T>): List<Long>
-
-    @Update
-    fun updateAll(items: List<T>)
-
-    @Delete
-    fun deleteAll(items: List<T>)
-}
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.reactivex.Maybe
@ -9,7 +11,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface CompletedLessonsDao : BaseDao<CompletedLesson> {
+interface CompletedLessonsDao {
+
+    @Insert
+    fun insertAll(exams: List<CompletedLesson>)
+
+    @Delete
+    fun deleteAll(exams: List<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): Maybe<List<CompletedLesson>>
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Exam
 import io.reactivex.Maybe
@ -9,7 +11,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface ExamDao : BaseDao<Exam> {
+interface ExamDao {
+
+    @Insert
+    fun insertAll(exams: List<Exam>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<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): Maybe<List<Exam>>
--- 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
@ -1,14 +1,26 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Grade
 import io.reactivex.Maybe
 import javax.inject.Singleton

@Singleton
@Dao
-interface GradeDao : BaseDao<Grade> {
+interface GradeDao {
+
+    @Insert
+    fun insertAll(grades: List<Grade>)
+
+    @Update
+    fun updateAll(grade: List<Grade>)
+
+    @Delete
+    fun deleteAll(grades: List<Grade>)

    @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
--- 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
@ -1,18 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-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): Maybe<GradePointsStatistics>
-
-    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
-}
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.reactivex.Maybe
@ -8,7 +10,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface GradeStatisticsDao : BaseDao<GradeStatistics> {
+interface GradeStatisticsDao {
+
+    @Insert
+    fun insertAll(gradesStatistics: List<GradeStatistics>)
+
+    @Delete
+    fun deleteAll(gradesStatistics: List<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): Maybe<List<GradeStatistics>>
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.reactivex.Maybe
@ -8,7 +10,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface GradeSummaryDao : BaseDao<GradeSummary> {
+interface GradeSummaryDao {
+
+    @Insert
+    fun insertAll(gradesSummary: List<GradeSummary>)
+
+    @Delete
+    fun deleteAll(gradesSummary: List<GradeSummary>)

    @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Homework
 import io.reactivex.Maybe
@ -9,7 +11,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface HomeworkDao : BaseDao<Homework> {
+interface HomeworkDao {
+
+    @Insert
+    fun insertAll(homework: List<Homework>)
+
+    @Delete
+    fun deleteAll(homework: List<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): Maybe<List<Homework>>
--- 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
@ -1,7 +1,10 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
@ -9,8 +12,18 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface LuckyNumberDao : BaseDao<LuckyNumber> {
+interface LuckyNumberDao {
+
+    @Insert
+    fun insert(luckyNumber: LuckyNumber)
+
+    @Update
+    fun update(luckyNumber: LuckyNumber)
+
+    @Delete
+    fun delete(luckyNumber: LuckyNumber)

    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
+
 }
--- 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
@ -1,12 +1,24 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Message
 import io.reactivex.Maybe

@Dao
-interface MessagesDao : BaseDao<Message> {
+interface MessagesDao {
+
+    @Insert
+    fun insertAll(messages: List<Message>)
+
+    @Delete
+    fun deleteAll(messages: List<Message>)
+
+    @Update
+    fun updateAll(messages: 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>>
--- 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
@ -1,12 +1,20 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.reactivex.Maybe

@Dao
-interface MobileDeviceDao : BaseDao<MobileDevice> {
+interface MobileDeviceDao {
+
+    @Insert
+    fun insertAll(devices: List<MobileDevice>)
+
+    @Delete
+    fun deleteAll(devices: List<MobileDevice>)

    @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
--- 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
@ -1,15 +1,28 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Note
 import io.reactivex.Maybe
 import javax.inject.Singleton

@Singleton
@Dao
-interface NoteDao : BaseDao<Note> {
+interface NoteDao {
+
+    @Insert
+    fun insertAll(notes: List<Note>)
+
+    @Update
+    fun updateAll(notes: List<Note>)
+
+    @Delete
+    fun deleteAll(notes: List<Note>)

    @Query("SELECT * FROM Notes WHERE student_id = :studentId")
    fun loadAll(studentId: Int): Maybe<List<Note>>
+
 }
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.reactivex.Maybe
@ -8,7 +10,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface RecipientDao : BaseDao<Recipient> {
+interface RecipientDao {
+
+    @Insert
+    fun insertAll(messages: List<Recipient>)
+
+    @Delete
+    fun deleteAll(messages: List<Recipient>)

    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.reactivex.Maybe
@ -8,7 +10,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface ReportingUnitDao : BaseDao<ReportingUnit> {
+interface ReportingUnitDao {
+
+    @Insert
+    fun insertAll(reportingUnits: List<ReportingUnit>)
+
+    @Delete
+    fun deleteAll(reportingUnits: List<ReportingUnit>)

    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
    fun load(studentId: Int): Maybe<List<ReportingUnit>>
--- 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
@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.School
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface SchoolDao : BaseDao<School> {
-
-    @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Maybe<School>
-}
--- 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,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@ -8,7 +10,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface SemesterDao : BaseDao<Semester> {
+interface SemesterDao {
+
+    @Insert
+    fun insertAll(semester: List<Semester>)
+
+    @Delete
+    fun deleteAll(semester: List<Semester>)

    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
--- 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
@ -1,12 +1,20 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Subject
 import io.reactivex.Maybe

@Dao
-interface SubjectDao : BaseDao<Subject> {
+interface SubjectDao {
+
+    @Insert
+    fun insertAll(subjects: List<Subject>): List<Long>
+
+    @Delete
+    fun deleteAll(subjects: List<Subject>)

    @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
    fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>
--- 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
@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface TeacherDao : BaseDao<Teacher> {
-
-    @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
-}
--- 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
@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.reactivex.Maybe
@ -9,7 +11,13 @@ import javax.inject.Singleton

@Singleton
@Dao
-interface TimetableDao : BaseDao<Timetable> {
+interface TimetableDao {
+
+    @Insert
+    fun insertAll(exams: List<Timetable>): List<Long>
+
+    @Delete
+    fun deleteAll(exams: List<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): Maybe<List<Timetable>>
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt
@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "GradesPointsStatistics")
-data class GradePointsStatistics(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    val subject: String,
-
-    val others: Double,
-
-    val student: Double
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt
@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "School")
-data class School(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val name: String,
-
-    val address: String,
-
-    val contact: String,
-
-    val headmaster: String,
-
-    val pedagogue: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt
@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "Teachers")
-data class Teacher(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val subject: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "short_name")
-    val shortName: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt
@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration16 : Migration(15, 16) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Teachers (
-                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
-            )
-        """)
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt
@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration17 : Migration(16, 17) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createGradesPointsStatisticsTable(database)
-        truncateSemestersTable(database)
-    }
-
-    private fun createGradesPointsStatisticsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradesPointsStatistics(
-                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
-            )
-        """)
-    }
-
-    private fun truncateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Semesters")
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt
@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration18 : Migration(17, 18) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS School (
-                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
-            )
-        """)
-    }
-}
--- 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
@ -1,8 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics

-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 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 io.reactivex.Maybe
@ -10,57 +8,27 @@ import javax.inject.Inject
 import javax.inject.Singleton

@Singleton
-class GradeStatisticsLocal @Inject constructor(
-    private val gradeStatisticsDb: GradeStatisticsDao,
-    private val gradePointsStatisticsDb: GradePointsStatisticsDao
-) {
+class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {

    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
-        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+            .filter { !it.isEmpty() }
    }

    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)
-                }
+        return (if ("Wszystkie" == subjectName) 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)
            }
-            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
-        }.filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
-        return when (subjectName) {
-            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
-                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
-                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
-                    list.fold(.0) { acc, e -> acc + e.others },
-                    list.fold(.0) { acc, e -> acc + e.student })
-                )
-            }
-            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
        }
+        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
    }

    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
        gradeStatisticsDb.insertAll(gradesStatistics)
    }

-    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
-        gradePointsStatisticsDb.insertAll(gradePointsStatistics)
-    }
-
    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
        gradeStatisticsDb.deleteAll(gradesStatistics)
    }
-
-    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
-        gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
-    }
 }
--- 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
@ -1,7 +1,6 @@
 package io.github.wulkanowy.data.repositories.gradestatistics

 import io.github.wulkanowy.api.Api
-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.reactivex.Single
@ -13,10 +12,7 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {

    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap {
-                if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
-                else it.getGradesPartialStatistics(semester.semesterId)
-            }
+            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
            .map { gradeStatistics ->
                gradeStatistics.map {
                    GradeStatistics(
@ -30,20 +26,4 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {
                }
            }
    }
-
-    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesPointsStatistics(semester.semesterId) }
-            .map { gradePointsStatistics ->
-                gradePointsStatistics.map {
-                    GradePointsStatistics(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        subject = it.subject,
-                        others = it.others,
-                        student = it.student
-                    )
-                }
-            }
-    }
 }
--- 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
@ -2,11 +2,9 @@ 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.utils.uniqueSubtract
-import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@ -33,19 +31,4 @@ class GradeStatisticsRepository @Inject constructor(
                        }
                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
    }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
-        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMapMaybe {
-                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
-                    else Maybe.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
-                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
-    }
 }
--- 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
@ -12,15 +12,15 @@ import javax.inject.Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {

    fun saveLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.insertAll(listOf(luckyNumber))
+        luckyNumberDb.insert(luckyNumber)
    }

    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.updateAll(listOf(luckyNumber))
+        luckyNumberDb.update(luckyNumber)
    }

    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.deleteAll(listOf(luckyNumber))
+        luckyNumberDb.delete(luckyNumber)
    }

    fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
--- 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
@ -11,6 +11,7 @@ import io.reactivex.Single
 import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
+import io.github.wulkanowy.api.messages.Message as ApiMessage
 import io.github.wulkanowy.api.messages.Recipient as ApiRecipient

@Singleton
--- 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,6 +3,7 @@ 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 io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
--- 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
@ -12,64 +12,52 @@ class PreferencesRepository @Inject constructor(
    val context: Context
 ) {
    val startMenuIndex: Int
-        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0

    val isShowPresent: Boolean
-        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)

    val gradeAverageMode: String
-        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"

    val gradeAverageForceCalc: Boolean
-        get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)

    val isGradeExpandable: Boolean
-        get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
+        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)

-    val appThemeKey = context.getString(R.string.pref_key_app_theme)
+    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
    val appTheme: String
-        get() = getString(appThemeKey, R.string.pref_default_app_theme)
+        get() = sharedPref.getString(appThemeKey, "light") ?: "light"

    val gradeColorTheme: String
-        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"

-    val appLanguageKey = context.getString(R.string.pref_key_app_language)
-    val appLanguage
-        get() = getString(appLanguageKey, R.string.pref_default_app_language)
-
-    val serviceEnableKey = context.getString(R.string.pref_key_services_enable)
+    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
    val isServiceEnabled: Boolean
-        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
+        get() = sharedPref.getBoolean(serviceEnableKey, true)

-    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
+    val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
    val servicesInterval: Long
-        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
+        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60

-    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
+    val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
    val isServicesOnlyWifi: Boolean
-        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
+        get() = sharedPref.getBoolean(servicesOnlyWifiKey, false)

    val isNotificationsEnable: Boolean
-        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)

-    val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
    val isDebugNotificationEnable: Boolean
-        get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
+        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)

    val gradePlusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0

    val gradeMinusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0

    val fillMessageContent: Boolean
-        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
-
-    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)
-
-    private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
-
-    private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(default))
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
 }
--- 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
@ -15,7 +15,7 @@ class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao)
        return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
    }

-    fun saveRecipients(recipients: List<Recipient>): List<Long> {
+    fun saveRecipients(recipients: List<Recipient>) {
        return recipientDb.insertAll(recipients)
    }

--- 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
@ -18,7 +18,7 @@ class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: Report
        return reportingUnitDb.loadOne(student.studentId, unitId)
    }

-    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>) {
        return reportingUnitDb.insertAll(reportingUnits)
    }

--- 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
@ -1,22 +0,0 @@
-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 io.reactivex.Maybe
-import javax.inject.Inject
-
-class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
-
-    fun saveSchool(school: School) {
-        schoolDb.insertAll(listOf(school))
-    }
-
-    fun deleteSchool(school: School) {
-        schoolDb.deleteAll(listOf(school))
-    }
-
-    fun getSchool(semester: Semester): Maybe<School> {
-        return schoolDb.load(semester.studentId, semester.classId)
-    }
-}
--- 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
@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Single
-import javax.inject.Inject
-
-class SchoolRemote @Inject constructor(private val api: Api) {
-
-    fun getSchoolInfo(semester: Semester): Single<School> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getSchool() }
-            .map {
-                School(
-                    studentId = semester.studentId,
-                    classId = semester.classId,
-                    name = it.name,
-                    address = it.address,
-                    contact = it.contact,
-                    headmaster = it.headmaster,
-                    pedagogue = it.pedagogue
-                )
-            }
-    }
-}
--- 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,41 +0,0 @@
-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.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(semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
-        return local.getSchool(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getSchoolInfo(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) })
-            )
-    }
-}
--- 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
@ -24,7 +24,7 @@ class StudentLocal @Inject constructor(
    fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
        return studentDb.loadAll()
            .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
-            .filter { it.isNotEmpty() }
+            .filter { !it.isEmpty() }
    }

    fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
--- 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
@ -1,22 +0,0 @@
-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 io.reactivex.Maybe
-import javax.inject.Inject
-
-class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
-
-    fun saveTeachers(teachers: List<Teacher>) {
-        teacherDb.insertAll(teachers)
-    }
-
-    fun deleteTeachers(teachers: List<Teacher>) {
-        teacherDb.deleteAll(teachers)
-    }
-
-    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
-        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
-    }
-}
--- 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
@ -1,28 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TeacherRemote @Inject constructor(private val api: Api) {
-
-    fun getTeachers(semester: Semester): Single<List<Teacher>> {
-        return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getTeachers() }
-            .map { teachers ->
-                teachers.map {
-                    Teacher(
-                        studentId = semester.studentId,
-                        name = it.name,
-                        subject = it.subject,
-                        shortName = it.short,
-                        classId = semester.classId
-                    )
-                }
-            }
-    }
-}
--- 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,34 +0,0 @@
-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.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(semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
-        return local.getTeachers(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getTeachers(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()) })
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@ -2,7 +2,6 @@ package io.github.wulkanowy.di

 import android.appwidget.AppWidgetManager
 import android.content.Context
-import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
@ -33,8 +32,4 @@ internal class AppModule {
    @Singleton
    @Provides
    fun provideAppInfo() = AppInfo()
-
-    @Singleton
-    @Provides
-    fun provideLingver() = Lingver.getInstance()
 }
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@ -21,7 +21,6 @@ import io.github.wulkanowy.services.sync.works.LuckyNumberWork
 import io.github.wulkanowy.services.sync.works.MessageWork
 import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
-import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
@ -29,15 +28,17 @@ import javax.inject.Singleton

@Suppress("unused")
@AssistedModule
-@Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
+@Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {

    @Module
-    object Static {
+    companion object {

+        @JvmStatic
        @Provides
        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)

+        @JvmStatic
        @Singleton
        @Provides
        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
@ -74,10 +75,6 @@ abstract class ServicesModule {
    @IntoSet
    abstract fun provideTimetableWork(work: TimetableWork): Work

-    @Binds
-    @IntoSet
-    abstract fun provideTeacherWork(work: TeacherWork): Work
-
    @Binds
    @IntoSet
    abstract fun provideLuckyNumberWork(work: LuckyNumberWork): Work
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@ -11,7 +11,6 @@ import androidx.work.NetworkType.UNMETERED
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
@ -33,6 +32,10 @@ class SyncManager @Inject constructor(
    appInfo: AppInfo
 ) {

+    companion object {
+        private const val APP_VERSION_CODE_KEY = "app_version_code"
+    }
+
    init {
        if (now().isHolidays) stopSyncWorker()

--- 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
@ -1,14 +0,0 @@
-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.reactivex.Completable
-import javax.inject.Inject
-
-class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
-
-    override fun create(student: Student, semester: Semester): Completable {
-        return teacherRepository.getTeachers(semester, true).ignoreElement()
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@ -22,8 +22,7 @@ import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject

-abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
-    HasAndroidInjector {
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView, HasAndroidInjector {

    @Inject
    lateinit var androidInjector: DispatchingAndroidInjector<Any>
@ -54,15 +53,13 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
    override fun showError(text: String, error: Throwable) {
        if (messageContainer != null) {
            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
-                .setAction(R.string.all_details) { showErrorDetailsDialog(error) }
+                .setAction(R.string.all_details) {
+                    ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
+                }
                .show()
        } else showMessage(text)
    }

-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
-    }
-
    override fun showMessage(text: String) {
        if (messageContainer != null) Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
        else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
--- 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,27 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.widget.Toast
-import dagger.android.support.DaggerAppCompatDialogFragment
-
-abstract class BaseDialogFragment : DaggerAppCompatDialogFragment(), BaseView {
-
-    override fun showError(text: String, error: Throwable) {
-        showMessage(text)
-    }
-
-    override fun showMessage(text: String) {
-        Toast.makeText(context, text, Toast.LENGTH_LONG).show()
-    }
-
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
-    }
-
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-}
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@ -13,17 +13,15 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
    override fun showError(text: String, error: Throwable) {
        if (messageContainer != null) {
            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
-                .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
+                .setAction(R.string.all_details) {
+                    if (isAdded) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+                }
                .show()
        } else {
            (activity as? BaseActivity<*>)?.showError(text, error)
        }
    }

-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-
    override fun showMessage(text: String) {
        if (messageContainer != null) {
            Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
@ -9,6 +9,4 @@ interface BaseView {
    fun showExpiredDialog()

    fun openClearLoginView()
-
-    fun showErrorDetailsDialog(error: Throwable)
 }
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@ -43,17 +43,16 @@ class ErrorDialog : DialogFragment() {

    override fun onActivityCreated(savedInstanceState: Bundle?) {
        super.onActivityCreated(savedInstanceState)
+        StringWriter().let { writer ->
+            error.printStackTrace(PrintWriter(writer))

-        val stringWriter = StringWriter().apply {
-            error.printStackTrace(PrintWriter(this))
-        }
-
-        errorDialogContent.text = stringWriter.toString()
-        errorDialogCopy.setOnClickListener {
-            val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
-            activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
-
-            Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+            errorDialogContent.text = writer.toString()
+            errorDialogCopy.setOnClickListener {
+                ClipData.newPlainText("wulkanowyError", writer.toString()).let { clip ->
+                    activity?.getSystemService<ClipboardManager>()?.primaryClip = clip
+                }
+                Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+            }
        }
        errorDialogCancel.setOnClickListener { dismiss() }
    }
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.base
 import android.content.pm.PackageManager.GET_ACTIVITIES
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import io.github.wulkanowy.R
@ -23,12 +22,8 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer

    fun applyDefaultTheme() {
        AppCompatDelegate.setDefaultNightMode(
-            when (val theme = preferencesRepository.appTheme) {
-                "light" -> MODE_NIGHT_NO
-                "dark", "black" -> MODE_NIGHT_YES
-                "system" -> MODE_NIGHT_FOLLOW_SYSTEM
-                else -> throw IllegalArgumentException("Wrong theme: $theme")
-            }
+            if (preferencesRepository.appTheme == "light") MODE_NIGHT_NO
+            else MODE_NIGHT_YES
        )
    }

--- 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
@ -47,11 +47,6 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
            Triple(getString(R.string.about_feedback), getString(R.string.about_feedback_summary), getCompatDrawable(R.drawable.ic_about_feedback))
        }

-    override val faqRes: Triple<String, String, Drawable?>?
-        get() = context?.run {
-            Triple(getString(R.string.about_faq), getString(R.string.about_faq_summary), getCompatDrawable(R.drawable.ic_about_faq))
-        }
-
    override val discordRes: Triple<String, String, Drawable?>?
        get() = context?.run {
            Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
@ -135,10 +130,6 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
        }
    }

-    override fun openFaqPage() {
-        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania", ::showMessage)
-    }
-
    override fun openLicenses() {
        (activity as? MainActivity)?.pushView(LicenseFragment.newInstance())
    }
--- 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
@ -28,15 +28,10 @@ class AboutPresenter @Inject constructor(
        view?.run {
            when (item.title) {
                feedbackRes?.first -> {
-                    Timber.i("Opening email client")
+                    Timber.i("Opening email client ")
                    openEmailClient()
                    analytics.logEvent("about_open", "name" to "feedback")
                }
-                faqRes?.first -> {
-                    Timber.i("Opening faq page")
-                    openFaqPage()
-                    analytics.logEvent("about_open", "name" to "faq")
-                }
                discordRes?.first -> {
                    Timber.i("Opening discord")
                    openDiscordInvite()
@ -66,7 +61,6 @@ class AboutPresenter @Inject constructor(
            updateData(AboutScrollableHeader(), listOfNotNull(
                versionRes?.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) },
--- 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
@ -9,8 +9,6 @@ interface AboutView : BaseView {

    val feedbackRes: Triple<String, String, Drawable?>?

-    val faqRes: Triple<String, String, Drawable?>?
-
    val discordRes: Triple<String, String, Drawable?>?

    val homepageRes: Triple<String, String, Drawable?>?
@ -27,8 +25,6 @@ interface AboutView : BaseView {

    fun openEmailClient()

-    fun openFaqPage()
-
    fun openHomepage()

    fun openLicenses()
--- 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,17 +7,18 @@ import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
+import dagger.android.support.DaggerAppCompatDialogFragment
 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.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.base.BaseActivity
 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

-class AccountDialog : BaseDialogFragment(), AccountView {
+class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {

    @Inject
    lateinit var presenter: AccountPresenter
@ -76,6 +77,14 @@ class AccountDialog : BaseDialogFragment(), AccountView {
        }
    }

+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*>)?.showExpiredDialog()
+    }
+
+    override fun openClearLoginView() {
+        (activity as? BaseActivity<*>)?.openClearLoginView()
+    }
+
    override fun showConfirmDialog() {
        context?.let {
            AlertDialog.Builder(it)
@ -96,3 +105,4 @@ class AccountDialog : BaseDialogFragment(), AccountView {
        super.onDestroy()
    }
 }
+
--- 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
@ -6,11 +6,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
@ -21,11 +17,9 @@ 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.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_attendance.*
-import org.threeten.bp.LocalDate
 import javax.inject.Inject

 class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
@ -76,11 +70,7 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
        }

        attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
-        attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
        attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        attendanceNavDate.setOnClickListener { presenter.onPickDate() }
        attendanceNextButton.setOnClickListener { presenter.onNextDay() }

        attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
@ -120,19 +110,11 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
    }

    override fun showEmpty(show: Boolean) {
-        attendanceEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        attendanceError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        attendanceErrorMessage.text = message
+        attendanceEmpty.visibility = if (show) View.VISIBLE else View.GONE
    }

    override fun showProgress(show: Boolean) {
-        attendanceProgress.visibility = if (show) VISIBLE else GONE
+        attendanceProgress.visibility = if (show) View.VISIBLE else View.GONE
    }

    override fun enableSwipe(enable: Boolean) {
@ -140,7 +122,7 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
    }

    override fun showContent(show: Boolean) {
-        attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        attendanceRecycler.visibility = if (show) View.VISIBLE else View.GONE
    }

    override fun hideRefresh() {
@ -148,32 +130,17 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
    }

    override fun showPreButton(show: Boolean) {
-        attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendancePreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
    }

    override fun showNextButton(show: Boolean) {
-        attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        attendanceNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
    }

    override fun showAttendanceDialog(lesson: Attendance) {
        (activity as? MainActivity)?.showDialogFragment(AttendanceDialog.newInstance(lesson))
    }

-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            show(this@AttendanceFragment.parentFragmentManager, null)
-        }
-    }
-
    override fun openSummaryView() {
        (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
    }
--- 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,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.attendance

-import android.annotation.SuppressLint
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@ -38,13 +37,10 @@ class AttendancePresenter @Inject constructor(
    lateinit var currentDate: LocalDate
        private set

-    private lateinit var lastError: Throwable
-
    fun onAttachView(view: AttendanceView, date: Long?) {
        super.onAttachView(view)
        view.initView()
        Timber.i("Attendance view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
        if (currentDate.isHolidays) setBaseDateOnHolidays()
        reloadView()
@ -60,32 +56,11 @@ class AttendancePresenter @Inject constructor(
        reloadView()
    }

-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        loadData(LocalDate.of(year, month, day))
-        reloadView()
-    }
-
    fun onSwipeRefresh() {
        Timber.i("Force refreshing the attendance")
        loadData(currentDate, true)
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    fun onViewReselected() {
        Timber.i("Attendance view is reselected")
        view?.also { view ->
@ -155,29 +130,18 @@ class AttendancePresenter @Inject constructor(
                    view?.apply {
                        updateData(it)
                        showEmpty(it.isEmpty())
-                        showErrorView(false)
                        showContent(it.isNotEmpty())
                    }
                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh)
                }) {
                    Timber.i("Loading attendance result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                    errorHandler.dispatch(it)
                }
            )
        }
    }

-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
    private fun reloadView() {
        Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
        view?.apply {
@ -185,18 +149,16 @@ class AttendancePresenter @Inject constructor(
            enableSwipe(false)
            showContent(false)
            showEmpty(false)
-            showErrorView(false)
            clearData()
            reloadNavigation()
        }
    }

-    @SuppressLint("DefaultLocale")
    private fun reloadNavigation() {
        view?.apply {
            showPreButton(!currentDate.minusDays(1).isHolidays)
            showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
        }
    }
 }
--- 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,6 @@ package io.github.wulkanowy.ui.modules.attendance

 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate

 interface AttendanceView : BaseView {

@ -24,10 +23,6 @@ interface AttendanceView : BaseView {

    fun showEmpty(show: Boolean)

-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
    fun showProgress(show: Boolean)

    fun enableSwipe(enable: Boolean)
@ -40,8 +35,6 @@ interface AttendanceView : BaseView {

    fun showAttendanceDialog(lesson: Attendance)

-    fun showDatePickerDialog(currentDate: LocalDate)
-
    fun openSummaryView()

    fun popView()
--- 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
@ -57,8 +57,6 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
        }

        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)
@ -82,7 +80,7 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
    override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
        with(attendanceSummaryAdapter) {
            updateDataSet(data, true)
-            removeAllScrollableHeaders()
+            removeAllScrollableFooters()
            addScrollableHeader(header)
        }
    }
@ -95,14 +93,6 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
        attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
    }

-    override fun showErrorView(show: Boolean) {
-        attendanceSummaryError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        attendanceSummaryErrorMessage.text = message
-    }
-
    override fun showProgress(show: Boolean) {
        attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
    }
--- 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
@ -33,13 +33,10 @@ class AttendanceSummaryPresenter @Inject constructor(
    var currentSubjectId = -1
        private set

-    private lateinit var lastError: Throwable
-
    fun onAttachView(view: AttendanceSummaryView, subjectId: Int?) {
        super.onAttachView(view)
        view.initView()
        Timber.i("Attendance summary view was initialized with subject id ${subjectId ?: -1}")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
        loadData(subjectId ?: -1)
        loadSubjects()
    }
@ -49,26 +46,12 @@ class AttendanceSummaryPresenter @Inject constructor(
        loadData(currentSubjectId, true)
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentSubjectId, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    fun onSubjectSelected(name: String?) {
        Timber.i("Select attendance summary subject $name")
        view?.run {
            showContent(false)
            showProgress(true)
            enableSwipe(false)
-            showEmpty(false)
-            showErrorView(false)
            clearView()
        }
        (subjects.singleOrNull { it.name == name }?.realId ?: -1).let {
@ -105,23 +88,13 @@ class AttendanceSummaryPresenter @Inject constructor(
                    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")
+                    view?.run { showEmpty(isViewEmpty) }
                    errorHandler.dispatch(it)
                }
            )
        }
    }

-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
    private fun loadSubjects() {
        Timber.i("Loading attendance summary subjects started")
        disposable.add(studentRepository.getCurrentStudent()
--- 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
@ -18,10 +18,6 @@ interface AttendanceSummaryView : BaseView {

    fun showEmpty(show: Boolean)

-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
    fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)

    fun updateSubjects(data: ArrayList<String>)
--- 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
@ -61,9 +61,6 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
        }

        examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        examErrorRetry.setOnClickListener { presenter.onRetry() }
-        examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
        examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
        examNextButton.setOnClickListener { presenter.onNextWeek() }

@ -98,14 +95,6 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
        examEmpty.visibility = if (show) VISIBLE else GONE
    }

-    override fun showErrorView(show: Boolean) {
-        examError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        examErrorMessage.text = message
-    }
-
    override fun showProgress(show: Boolean) {
        examProgress.visibility = if (show) VISIBLE else GONE
    }
--- 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
@ -36,13 +36,10 @@ class ExamPresenter @Inject constructor(
    lateinit var currentDate: LocalDate
        private set

-    private lateinit var lastError: Throwable
-
    fun onAttachView(view: ExamView, date: Long?) {
        super.onAttachView(view)
        view.initView()
        Timber.i("Exam view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
        if (currentDate.isHolidays) setBaseDateOnHolidays()
        reloadView()
@ -63,18 +60,6 @@ class ExamPresenter @Inject constructor(
        loadData(currentDate, true)
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
        if (item is ExamItem) {
            Timber.i("Select exam item ${item.exam.id}")
@ -131,28 +116,17 @@ class ExamPresenter @Inject constructor(
                    view?.apply {
                        updateData(it)
                        showEmpty(it.isEmpty())
-                        showErrorView(false)
                        showContent(it.isNotEmpty())
                    }
                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh)
                }) {
                    Timber.i("Loading exam result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
                    errorHandler.dispatch(it)
                })
        }
    }

-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
    private fun createExamItems(items: Map<LocalDate, List<Exam>>): List<ExamItem> {
        return items.flatMap {
            ExamHeader(it.key).let { header ->
@ -168,7 +142,6 @@ class ExamPresenter @Inject constructor(
            enableSwipe(false)
            showContent(false)
            showEmpty(false)
-            showErrorView(false)
            clearData()
            reloadNavigation()
        }
--- 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
@ -21,10 +21,6 @@ interface ExamView : BaseView {

    fun showEmpty(show: Boolean)

-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
    fun showProgress(show: Boolean)

    fun enableSwipe(enable: Boolean)
--- 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
@ -13,7 +13,6 @@ import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.base.ErrorDialog
 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
@ -84,8 +83,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
            setElevationCompat(context.dpToPx(4f))
        }

-        gradeErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        gradeSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -106,18 +104,22 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
        gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
    }

-    override fun showErrorView(show: Boolean) {
-        gradeError.visibility = if (show) VISIBLE else INVISIBLE
+    override fun showEmpty(show: Boolean) {
+        gradeEmpty.visibility = if (show) VISIBLE else INVISIBLE
    }

-    override fun setErrorDetails(message: String) {
-        gradeErrorMessage.text = message
+    override fun showRefresh(show: Boolean) {
+        gradeSwipe.isRefreshing = show
    }

    override fun showSemesterSwitch(show: Boolean) {
        semesterSwitchMenu?.isVisible = show
    }

+    override fun enableSwipe(enable: Boolean) {
+        gradeSwipe.isEnabled = enable
+    }
+
    override fun showSemesterDialog(selectedIndex: Int) {
        val choices = arrayOf(
            getString(R.string.grade_semester, 1),
--- 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
@ -11,12 +11,13 @@ import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment

@Suppress("unused")
-@Module(includes = [GradeModule.Static::class])
+@Module
 abstract class GradeModule {

    @Module
-    object Static {
+    companion object {

+        @JvmStatic
        @PerFragment
        @Provides
        fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
--- 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
@ -25,14 +25,14 @@ class GradePresenter @Inject constructor(

    private val loadedSemesterId = mutableMapOf<Int, Int>()

-    private lateinit var lastError: Throwable
-
    fun onAttachView(view: GradeView, savedIndex: Int?) {
        super.onAttachView(view)
        selectedIndex = savedIndex ?: 0
-        view.initView()
+        view.run {
+            initView()
+            enableSwipe(false)
+        }
        Timber.i("Grade view was initialized with $selectedIndex index")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
        loadData()
    }

@ -71,7 +71,7 @@ class GradePresenter @Inject constructor(
        view?.apply {
            showContent(true)
            showProgress(false)
-            showErrorView(false)
+            showEmpty(false)
            loadedSemesterId[currentPageIndex] = semesterId
        }
    }
@ -80,18 +80,10 @@ class GradePresenter @Inject constructor(
        if (semesters.isNotEmpty()) loadChild(index)
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
+    fun onSwipeRefresh() {
        loadData()
    }

-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    private fun loadData() {
        Timber.i("Loading grade data started")
        disposable.add(studentRepository.getCurrentStudent()
@ -104,28 +96,25 @@ class GradePresenter @Inject constructor(
            }
            .subscribeOn(schedulers.backgroundThread)
            .observeOn(schedulers.mainThread)
-            .doFinally { view?.showProgress(false) }
+            .doFinally { view?.showRefresh(false) }
            .subscribe({
                view?.run {
                    Timber.i("Loading grade result: Attempt load index $currentPageIndex")
                    loadChild(currentPageIndex)
-                    showErrorView(false)
+                    enableSwipe(false)
                    showSemesterSwitch(true)
                }
            }) {
                Timber.i("Loading grade result: An exception occurred")
                errorHandler.dispatch(it)
+                view?.run {
+                    showProgress(false)
+                    showEmpty(true)
+                    enableSwipe(true)
+                }
            })
    }

-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        lastError = error
-        view?.run {
-            showErrorView(true)
-            setErrorDetails(message)
-        }
-    }
-
    private fun loadChild(index: Int, forceRefresh: Boolean = false) {
        semesters.first { it.semesterName == selectedIndex }.semesterId.also {
            if (forceRefresh || loadedSemesterId[index] != it) {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@ -12,14 +12,16 @@ interface GradeView : BaseView {

    fun showProgress(show: Boolean)

-    fun showErrorView(show: Boolean)
+    fun showEmpty(show: Boolean)

-    fun setErrorDetails(message: String)
+    fun showRefresh(show: Boolean)

    fun showSemesterSwitch(show: Boolean)

    fun showSemesterDialog(selectedIndex: Int)

+    fun enableSwipe(enable: Boolean)
+
    fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)

    fun notifyChildParentReselected(index: Int)
--- 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
@ -18,7 +18,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
@ -34,8 +33,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
    @Inject
    lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>

-    private var gradeDetailsMenu: Menu? = null
-
    companion object {
        fun newInstance() = GradeDetailsFragment()
    }
@ -72,8 +69,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh

    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
        inflater.inflate(R.menu.action_menu_grade_details, menu)
-        gradeDetailsMenu = menu
-        presenter.updateMarkAsDoneButton()
    }

    override fun initView() {
@ -91,8 +86,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
            )
        }
        gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -144,14 +137,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
        gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
    }

-    override fun showErrorView(show: Boolean) {
-        gradeDetailsError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        gradeDetailsErrorMessage.text = message
-    }
-
    override fun showRefresh(show: Boolean) {
        gradeDetailsSwipe.isRefreshing = show
    }
@ -180,10 +165,6 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
        (parentFragment as? GradeFragment)?.onChildRefresh()
    }

-    override fun enableMarkAsDoneButton(enable: Boolean) {
-        gradeDetailsMenu?.findItem(R.id.gradeDetailsMenuRead)?.isEnabled = enable
-    }
-
    override fun onDestroyView() {
        super.onDestroyView()
        presenter.onDetachView()
--- 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
@ -26,16 +26,11 @@ class GradeDetailsPresenter @Inject constructor(
    private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {

-    private var newGradesAmount: Int = 0
-
    private var currentSemesterId = 0

-    private lateinit var lastError: Throwable
-
    override fun onAttachView(view: GradeDetailsView) {
        super.onAttachView(view)
        view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
    }

    fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
@ -57,8 +52,6 @@ class GradeDetailsPresenter @Inject constructor(
                            updateItem(header)
                        }
                    }
-                    newGradesAmount--
-                    updateMarkAsDoneButton()
                    updateGrade(item.grade)
                }
            }
@ -92,18 +85,6 @@ class GradeDetailsPresenter @Inject constructor(
        view?.notifyParentRefresh()
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        view?.notifyParentRefresh()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    fun onParentViewReselected() {
        view?.run {
            if (!isViewEmpty) {
@ -125,10 +106,6 @@ class GradeDetailsPresenter @Inject constructor(
        disposable.clear()
    }

-    fun updateMarkAsDoneButton() {
-        view?.enableMarkAsDoneButton(newGradesAmount > 0)
-    }
-
    private fun loadData(semesterId: Int, forceRefresh: Boolean) {
        Timber.i("Loading grade details data started")
        disposable.add(studentRepository.getCurrentStudent()
@ -154,32 +131,19 @@ class GradeDetailsPresenter @Inject constructor(
            }
            .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")
+                view?.run { showEmpty(isViewEmpty) }
                errorHandler.dispatch(it)
            })
    }

-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
    private fun createGradeItems(items: Map<String, List<Grade>>, averages: Map<String, Double>): List<GradeDetailsHeader> {
        val isGradeExpandable = preferencesRepository.isGradeExpandable
        val gradeColorTheme = preferencesRepository.gradeColorTheme
--- 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
@ -38,10 +38,6 @@ interface GradeDetailsView : BaseView {

    fun showProgress(show: Boolean)

-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
    fun enableSwipe(enable: Boolean)

    fun showRefresh(show: Boolean)
@ -50,8 +46,6 @@ interface GradeDetailsView : BaseView {

    fun notifyParentRefresh()

-    fun enableMarkAsDoneButton(enable: Boolean)
-
    fun getGradeNumberString(number: Int): String

    fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
--- 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,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.statistics

-import android.graphics.Color
 import android.graphics.Color.WHITE
 import android.os.Bundle
 import android.view.LayoutInflater
@ -11,15 +10,11 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.LegendEntry
-import com.github.mikephil.charting.data.BarData
-import com.github.mikephil.charting.data.BarDataSet
-import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.data.PieData
 import com.github.mikephil.charting.data.PieDataSet
 import com.github.mikephil.charting.data.PieEntry
 import com.github.mikephil.charting.formatter.ValueFormatter
 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.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
@ -43,9 +38,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
        fun newInstance() = GradeStatisticsFragment()
    }

-    override val isPieViewEmpty get() = gradeStatisticsChart.isEmpty
-
-    override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty
+    override val isViewEmpty get() = gradeStatisticsChart.isEmpty

    private lateinit var gradeColors: List<Pair<Int, Int>>

@ -67,11 +60,6 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
        1 to R.color.grade_material_one
    )

-    private val gradePointsColors = listOf(
-        Color.parseColor("#37c69c"),
-        Color.parseColor("#d8b12a")
-    )
-
    private val gradeLabels = listOf(
        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
    )
@ -82,8 +70,8 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G

    override fun onActivityCreated(savedInstanceState: Bundle?) {
        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeStatisticsSwipe
-        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
+        messageContainer = gradeStatisticsChart
+        presenter.onAttachView(this, savedInstanceState?.getBoolean(SAVED_CHART_TYPE))
    }

    override fun initView() {
@ -96,13 +84,6 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
        }

-        with(gradeStatisticsChartPoints) {
-            description.isEnabled = false
-
-            animateXY(1000, 1000)
-            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-        }
-
        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
        subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)

@ -111,11 +92,9 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
        }

-        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
-
        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
    }

    override fun updateSubjects(data: ArrayList<String>) {
@ -126,25 +105,23 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
        }
    }

-    override fun updatePieData(items: List<GradeStatistics>, theme: String) {
+    override fun updateData(items: List<GradeStatistics>, theme: String) {
        gradeColors = when (theme) {
            "vulcan" -> vulcanGradeColors
            else -> materialGradeColors
        }

-        val dataset = PieDataSet(items.map {
-            PieEntry(it.amount.toFloat(), it.grade.toString())
-        }, "Legenda").apply {
-            valueTextSize = 12f
-            sliceSpace = 1f
-            valueTextColor = WHITE
-            setColors(items.map {
-                gradeColors.single { color -> color.first == it.grade }.second
-            }.toIntArray(), context)
-        }
-
-        with(gradeStatisticsChart) {
-            data = PieData(dataset).apply {
+        gradeStatisticsChart.run {
+            data = PieData(PieDataSet(items.map {
+                PieEntry(it.amount.toFloat(), it.grade.toString())
+            }, "Legenda").apply {
+                valueTextSize = 12f
+                sliceSpace = 1f
+                valueTextColor = WHITE
+                setColors(items.map {
+                    gradeColors.single { color -> color.first == it.grade }.second
+                }.toIntArray(), context)
+            }).apply {
                setTouchEnabled(false)
                setValueFormatter(object : ValueFormatter() {
                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
@ -167,47 +144,6 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
        }
    }

-    override fun updateBarData(item: GradePointsStatistics) {
-        val dataset = BarDataSet(listOf(
-            BarEntry(1f, item.others.toFloat()),
-            BarEntry(2f, item.student.toFloat())
-        ), "Legenda").apply {
-            valueTextSize = 12f
-            valueTextColor = requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
-            valueFormatter = object : ValueFormatter() {
-                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
-            }
-            colors = gradePointsColors
-        }
-
-        with(gradeStatisticsChartPoints) {
-            data = BarData(dataset).apply {
-                barWidth = 0.5f
-                setFitBars(true)
-            }
-            setTouchEnabled(false)
-            xAxis.setDrawLabels(false)
-            xAxis.setDrawGridLines(false)
-            requireContext().getThemeAttrColor(android.R.attr.textColorPrimary).let {
-                axisLeft.textColor = it
-                axisRight.textColor = it
-            }
-            legend.setCustom(listOf(
-                LegendEntry().apply {
-                    label = "Średnia klasy"
-                    formColor = gradePointsColors[0]
-                    form = Legend.LegendForm.SQUARE
-                },
-                LegendEntry().apply {
-                    label = "Uczeń"
-                    formColor = gradePointsColors[1]
-                    form = Legend.LegendForm.SQUARE
-                }
-            ))
-            invalidate()
-        }
-    }
-
    override fun showSubjects(show: Boolean) {
        gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
        gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
@ -215,29 +151,16 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G

    override fun clearView() {
        gradeStatisticsChart.clear()
-        gradeStatisticsChartPoints.clear()
    }

-    override fun showPieContent(show: Boolean) {
+    override fun showContent(show: Boolean) {
        gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
    }

-    override fun showBarContent(show: Boolean) {
-        gradeStatisticsChartPoints.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
    override fun showEmpty(show: Boolean) {
        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
    }

-    override fun showErrorView(show: Boolean) {
-        gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        gradeStatisticsErrorMessage.text = message
-    }
-
    override fun showProgress(show: Boolean) {
        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
    }
@ -273,17 +196,13 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
    override fun onResume() {
        super.onResume()
        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            presenter.onTypeChange(when (checkedId) {
-                R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
-                R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
-                else -> ViewType.POINTS
-            })
+            presenter.onTypeChange(checkedId == R.id.gradeStatisticsTypeSemester)
        }
    }

    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
-        outState.putSerializable(SAVED_CHART_TYPE, presenter.currentType)
+        outState.putBoolean(SAVED_CHART_TYPE, presenter.currentIsSemester)
    }

    override fun onDestroyView() {
--- 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
@ -30,22 +30,19 @@ class GradeStatisticsPresenter @Inject constructor(

    private var currentSubjectName: String = "Wszystkie"

-    private lateinit var lastError: Throwable
-
-    var currentType: ViewType = ViewType.PARTIAL
+    var currentIsSemester = false
        private set

-    fun onAttachView(view: GradeStatisticsView, type: ViewType?) {
+    fun onAttachView(view: GradeStatisticsView, isSemester: Boolean?) {
        super.onAttachView(view)
-        currentType = type ?: ViewType.PARTIAL
+        currentIsSemester = isSemester ?: false
        view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
    }

    fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
        currentSemesterId = semesterId
        loadSubjects()
-        loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
+        loadData(semesterId, currentSubjectName, currentIsSemester, forceRefresh)
    }

    fun onParentViewChangeSemester() {
@ -53,8 +50,7 @@ class GradeStatisticsPresenter @Inject constructor(
            showProgress(true)
            enableSwipe(false)
            showRefresh(false)
-            showBarContent(false)
-            showErrorView(false)
+            showContent(false)
            showEmpty(false)
            clearView()
        }
@ -66,47 +62,31 @@ class GradeStatisticsPresenter @Inject constructor(
        view?.notifyParentRefresh()
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        view?.notifyParentRefresh()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    fun onSubjectSelected(name: String?) {
        Timber.i("Select grade stats subject $name")
        view?.run {
-            showBarContent(false)
-            showPieContent(false)
+            showContent(false)
            showProgress(true)
            enableSwipe(false)
            showEmpty(false)
-            showErrorView(false)
            clearView()
        }
        (subjects.singleOrNull { it.name == name }?.name)?.let {
-            if (it != currentSubjectName) loadDataByType(currentSemesterId, it, currentType)
+            if (it != currentSubjectName) loadData(currentSemesterId, it, currentIsSemester)
        }
    }

-    fun onTypeChange(type: ViewType) {
-        Timber.i("Select grade stats semester: $type")
+    fun onTypeChange(isSemester: Boolean) {
+        Timber.i("Select grade stats semester: $isSemester")
        disposable.clear()
        view?.run {
-            showBarContent(false)
-            showPieContent(false)
+            showContent(false)
            showProgress(true)
            enableSwipe(false)
            showEmpty(false)
-            showErrorView(false)
            clearView()
        }
-        loadDataByType(currentSemesterId, currentSubjectName, type)
+        loadData(currentSemesterId, currentSubjectName, isSemester)
    }

    private fun loadSubjects() {
@ -131,18 +111,10 @@ class GradeStatisticsPresenter @Inject constructor(
        )
    }

-    private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
-        currentSubjectName = subjectName
-        currentType = type
-        when (type) {
-            ViewType.SEMESTER -> loadData(semesterId, subjectName, true, forceRefresh)
-            ViewType.PARTIAL -> loadData(semesterId, subjectName, false, forceRefresh)
-            ViewType.POINTS -> loadPointsData(semesterId, subjectName, forceRefresh)
-        }
-    }
-
    private fun loadData(semesterId: Int, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false) {
        Timber.i("Loading grade stats data started")
+        currentSubjectName = subjectName
+        currentIsSemester = isSemester
        disposable.add(studentRepository.getCurrentStudent()
            .flatMap { semesterRepository.getSemesters(it) }
            .flatMap { gradeStatisticsRepository.getGradesStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, isSemester, forceRefresh) }
@ -162,64 +134,14 @@ class GradeStatisticsPresenter @Inject constructor(
                Timber.i("Loading grade stats result: Success")
                view?.run {
                    showEmpty(it.isEmpty())
-                    showBarContent(false)
-                    showPieContent(it.isNotEmpty())
-                    showErrorView(false)
-                    updatePieData(it, preferencesRepository.gradeColorTheme)
+                    showContent(it.isNotEmpty())
+                    updateData(it, preferencesRepository.gradeColorTheme)
                }
                analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
            }) {
                Timber.e("Loading grade stats result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
                errorHandler.dispatch(it)
            })
    }
-
-    private fun loadPointsData(semesterId: Int, subjectName: String, forceRefresh: Boolean = false) {
-        Timber.i("Loading grade points stats data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMapMaybe { gradeStatisticsRepository.getGradesPointsStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, forceRefresh) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showRefresh(false)
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded(semesterId)
-                }
-            }
-            .subscribe({
-                Timber.i("Loading grade points stats result: Success")
-                view?.run {
-                    showEmpty(false)
-                    showPieContent(false)
-                    showBarContent(true)
-                    showErrorView(false)
-                    updateBarData(it)
-                }
-                analytics.logEvent("load_grade_points_statistics", "force_refresh" to forceRefresh)
-            }, {
-                Timber.e("Loading grade points stats result: An exception occurred")
-                errorHandler.dispatch(it)
-            }, {
-                Timber.d("Loading grade points stats result: No point stats found")
-                view?.run {
-                    showBarContent(false)
-                    showEmpty(true)
-                }
-            })
-        )
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isBarViewEmpty || isPieViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
 }
--- 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
@ -1,22 +1,17 @@
 package io.github.wulkanowy.ui.modules.grade.statistics

-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseView

 interface GradeStatisticsView : BaseView {

-    val isPieViewEmpty: Boolean
-
-    val isBarViewEmpty: Boolean
+    val isViewEmpty: Boolean

    fun initView()

    fun updateSubjects(data: ArrayList<String>)

-    fun updatePieData(items: List<GradeStatistics>, theme: String)
-
-    fun updateBarData(item: GradePointsStatistics)
+    fun updateData(items: List<GradeStatistics>, theme: String)

    fun showSubjects(show: Boolean)

@ -26,16 +21,10 @@ interface GradeStatisticsView : BaseView {

    fun clearView()

-    fun showPieContent(show: Boolean)
-
-    fun showBarContent(show: Boolean)
+    fun showContent(show: Boolean)

    fun showEmpty(show: Boolean)

-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
    fun showProgress(show: Boolean)

    fun enableSwipe(enable: Boolean)
--- 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 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.statistics
-
-enum class ViewType {
-    SEMESTER,
-    PARTIAL,
-    POINTS
-}
--- 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
@ -56,8 +56,6 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
            adapter = gradeSummaryAdapter
        }
        gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
    }

    override fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader) {
@ -84,14 +82,6 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
        gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
    }

-    override fun showErrorView(show: Boolean) {
-        gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
-    }
-
-    override fun setErrorDetails(message: String) {
-        gradeSummaryErrorMessage.text = message
-    }
-
    override fun showProgress(show: Boolean) {
        gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
    }
--- 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
@ -25,12 +25,9 @@ class GradeSummaryPresenter @Inject constructor(
    private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {

-    private lateinit var lastError: Throwable
-
    override fun onAttachView(view: GradeSummaryView) {
        super.onAttachView(view)
        view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
    }

    fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
@ -59,44 +56,21 @@ class GradeSummaryPresenter @Inject constructor(
                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")
+                view?.run { showEmpty(isViewEmpty) }
                errorHandler.dispatch(it)
            })
    }

-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
    fun onSwipeRefresh() {
        Timber.i("Force refreshing the grade summary")
        view?.notifyParentRefresh()
    }

-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        view?.notifyParentRefresh()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
    fun onParentViewReselected() {
        view?.run {
            if (!isViewEmpty) resetView()
--- 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
@ -26,10 +26,6 @@ interface GradeSummaryView : BaseView {

    fun showContent(show: Boolean)

-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
    fun showEmpty(show: Boolean)

    fun notifyParentDataLoaded(semesterId: Int)
--- 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
@ -3,8 +3,6 @@ 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 android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
@ -36,8 +34,6 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {

    override val titleStringId get() = R.string.homework_title

-    override val isViewEmpty get() = homeworkAdapter.isEmpty
-
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        return inflater.inflate(R.layout.fragment_homework, container, false)
    }
@ -45,7 +41,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
    override fun onActivityCreated(savedInstanceState: Bundle?) {
        super.onActivityCreated(savedInstanceState)
        messageContainer = homeworkRecycler
-        presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
+        presenter.onAttachView(this, savedInstanceState?.getLong(HomeworkFragment.SAVED_DATE_KEY))
    }

    override fun initView() {
@ -60,9 +56,6 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
        }

        homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
-        homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
        homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
        homeworkNextButton.setOnClickListener { presenter.onNextDay() }

@ -81,24 +74,18 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
        homeworkNavDate.text = date
    }

+    override fun isViewEmpty() = homeworkAdapter.isEmpty
+
    override fun hideRefresh() {
        homeworkSwipe.isRefreshing = false
    }

    override fun showEmpty(show: Boolean) {
-        homeworkEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        homeworkError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        homeworkErrorMessage.text = message
+        homeworkEmpty.visibility = if (show) View.VISIBLE else View.GONE
    }

    override fun showProgress(show: Boolean) {
-        homeworkProgress.visibility = if (show) VISIBLE else GONE
+        homeworkProgress.visibility = if (show) View.VISIBLE else View.GONE
    }

    override fun enableSwipe(enable: Boolean) {
@ -106,15 +93,15 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
    }

    override fun showContent(show: Boolean) {
-        homeworkRecycler.visibility = if (show) VISIBLE else GONE
+        homeworkRecycler.visibility = if (show) View.VISIBLE else View.GONE
    }

    override fun showPreButton(show: Boolean) {
-        homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
    }

    override fun showNextButton(show: Boolean) {
-        homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        homeworkNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
    }

    override fun showTimetableDialog(homework: Homework) {
--- a/Show more
+++ b/Show more