Merge branch 'release/0.13.0'

0.12.0

.circleci/config.yml

@@ -98,7 +98,7 @@ jobs:
           command: yes | sdkmanager --licenses && yes | sdkmanager --update
       - run:
           name: Setup emulator
-          command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;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 createPlayDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Collect logs from emulator
           command: adb logcat -d > ./app/build/reports/logcat_emulator.txt

.gitignore

@@ -110,4 +110,5 @@ Thumbs.db
 
 ### AndroidStudio Patch ###
 
-!/gradle/wrapper/gradle-wrapper.jar
+!/gradle/wrapper/gradle-wrapper.jar
+.idea/jarRepositories.xml

.idea/codeStyles/Project.xml

@@ -1,6 +1,9 @@
 <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>

.travis.yml

@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=28
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_API_LEVEL=29
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.10.0
+    - 0.13.0
 
 android:
  licenses:
@@ -34,12 +34,12 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-19
-    - sys-img-armeabi-v7a-android-19
+    - android-22
+    - sys-img-armeabi-v7a-android-22
 
 before_script:
     # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-22 --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 createPlayDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
   - ./gradlew jacocoTestReport --stacktrace --daemon
   - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
       git fetch --unshallow;

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)](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)
+[![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)
 
 Unofficial android VULCAN UONET+ register client for student and parent
 

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)](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)
+[![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)
 
 Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 

app/build.gradle

@@ -9,16 +9,16 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 43
-        versionName "0.10.0"
+        targetSdkVersion 29
+        versionCode 48
+        versionName "0.13.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -28,8 +28,10 @@ android {
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString(),
-                             "room.incremental"   : "true"]
+                arguments = [
+                        "room.schemaLocation": "$projectDir/schemas".toString(),
+                        "room.incremental"   : "true"
+                ]
             }
         }
     }
@@ -61,7 +63,6 @@ android {
             versionNameSuffix "-dev"
             testCoverageEnabled = true
             ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
-            multiDexKeepProguard file('proguard-multidex-rules.pro')
         }
     }
 
@@ -109,38 +110,36 @@ play {
 }
 
 ext {
-    work_manager = "2.2.0"
-    room = "2.2.0-beta01"
-    dagger = "2.24"
+    work_manager = "2.3.0-beta01"
+    room = "2.2.2"
+    dagger = "2.25.2"
     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.10.0"
+    implementation "io.github.wulkanowy:api:0.13.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.1.0-rc03"
-    implementation "androidx.activity:activity-ktx:1.0.0-rc01"
-    implementation "androidx.appcompat:appcompat:1.1.0-rc01"
-    implementation "androidx.appcompat:appcompat-resources:1.1.0-rc01"
-    implementation "androidx.fragment:fragment-ktx:1.1.0-rc04"
+    implementation "androidx.core:core-ktx:1.2.0-rc01"
+    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
+    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.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.0-rc01"
-    implementation "androidx.recyclerview:recyclerview:1.1.0-beta03"
+    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
-    implementation "com.google.android.material:material:1.1.0-alpha07"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+    implementation "com.google.android.material:material:1.1.0-beta02"
     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"
@@ -157,26 +156,28 @@ 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.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation "com.github.YarikSOffice:lingver:1.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.12"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.15"
 
-    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "com.google.code.gson:gson:2.8.6"
     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.3"
-    implementation "com.mikepenz:aboutlibraries:7.0.3"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
+    implementation "com.mikepenz:aboutlibraries:7.0.4"
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
 
-    playImplementation "com.google.firebase:firebase-core:17.2.0"
+    playImplementation "com.google.firebase:firebase-core:17.2.1"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
@@ -187,10 +188,7 @@ dependencies {
     testImplementation "junit:junit:4.12"
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-core:$mockito_core"
-    testImplementation("org.mockito:mockito-inline:3.0.6") {
-        exclude group: "org.mockito", module: "mockito-core"
-    }
+    testImplementation "org.mockito:mockito-inline:3.2.0"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -198,10 +196,7 @@ 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-core:$mockito_core"
-    androidTestImplementation("org.mockito:mockito-android:3.0.6") {
-        exclude group: 'org.mockito', module: 'mockito-core'
-    }
+    androidTestImplementation "org.mockito:mockito-android:3.2.0"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/proguard-multidex-rules.pro

@@ -1,3 +0,0 @@
--keep class android.support.test.internal** { *; }
--keep class org.junit.** { *; }
--keep public class io.github.wulkanowy** { *; }

app/proguard-rules.pro

@@ -42,4 +42,4 @@
 
 
 #Config for Material Components
--keep class com.google.android.material.tabs.**
+-keep class com.google.android.material.tabs.** { *; }

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt

@@ -22,12 +22,7 @@ abstract class AbstractMigrationTest {
     fun getMigratedRoomDatabase(): AppDatabase {
         val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
             AppDatabase::class.java, dbName)
-            .addMigrations(
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15()
-            )
+            .addMigrations(*AppDatabase.getMigrations())
             .build()
         // close the database and release any stream resources when the test finishes
         helper.closeWhenFinished(database)

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt

@@ -3,10 +3,14 @@ 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.assertFalse
+import org.junit.Assert.assertTrue
 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() {
@@ -97,11 +101,9 @@ class Migration13Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
-        val db = getMigratedRoomDatabase()
-
-        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
+        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
         assertTrue { semesters1.single { it.isCurrent }.isCurrent }
         semesters1[0].run {
             assertFalse(isCurrent)
@@ -119,7 +121,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, diaryId)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertEquals(1970, it[0].schoolYear)
             assertEquals(of(1970, 1, 1), it[0].end)
@@ -130,7 +132,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertTrue(it[3].isCurrent)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertFalse(it[0].isCurrent)
             assertFalse(it[1].isCurrent)
@@ -139,6 +141,30 @@ 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")

app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt

@@ -4,6 +4,7 @@ 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
@@ -24,7 +25,7 @@ class GradeStatisticsLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
     }
 
     @After
@@ -63,7 +64,52 @@ 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)
+    }
 }

app/src/debug/res/values-pl/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Wulkanowy DEV</string>
-</resources>

app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt

@@ -6,10 +6,13 @@ 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
@@ -32,6 +35,9 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
     @Inject
     lateinit var themeManager: ThemeManager
 
+    @Inject
+    lateinit var sharedPrefProvider: SharedPrefProvider
+
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -44,7 +50,9 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
+        Lingver.init(this)
         themeManager.applyDefaultTheme()
+        migrateSharedPreferences()
 
         initLogging()
         initCrashlytics(this, appInfo)
@@ -60,6 +68,13 @@ 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

app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt

@@ -85,6 +85,10 @@ 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
@@ -136,4 +140,12 @@ 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
 }

app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt

@@ -6,11 +6,13 @@ 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
@@ -20,15 +22,18 @@ 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
@@ -38,9 +43,11 @@ 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
@@ -48,6 +55,9 @@ 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
@@ -70,6 +80,7 @@ import javax.inject.Singleton
         Grade::class,
         GradeSummary::class,
         GradeStatistics::class,
+        GradePointsStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
@@ -78,7 +89,9 @@ import javax.inject.Singleton
         CompletedLesson::class,
         ReportingUnit::class,
         Recipient::class,
-        MobileDevice::class
+        MobileDevice::class,
+        Teacher::class,
+        School::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -87,29 +100,36 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 15
+        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()
+            )
+        }
 
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
                 .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
                 .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(
-                    Migration2(),
-                    Migration3(),
-                    Migration4(),
-                    Migration5(),
-                    Migration6(),
-                    Migration7(),
-                    Migration8(),
-                    Migration9(),
-                    Migration10(),
-                    Migration11(),
-                    Migration12(),
-                    Migration13(),
-                    Migration14(),
-                    Migration15()
-                )
+                .addMigrations(*getMigrations())
                 .build()
         }
     }
@@ -132,6 +152,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeStatistics: GradeStatisticsDao
 
+    abstract val gradePointsStatistics: GradePointsStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -149,4 +171,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val recipientDao: RecipientDao
 
     abstract val mobileDeviceDao: MobileDeviceDao
+
+    abstract val teacherDao: TeacherDao
+
+    abstract val schoolDao: SchoolDao
 }

app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt

@@ -8,6 +8,10 @@ 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) }
     }

app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt

@@ -1,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface AttendanceDao {
-
-    @Insert
-    fun insertAll(exams: List<Attendance>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Attendance>)
+interface AttendanceDao : BaseDao<Attendance> {
 
     @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>

app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt

@@ -1,20 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(exams: List<AttendanceSummary>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<AttendanceSummary>)
+interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
 
     @Query("SELECT * FROM AttendanceSummary WHERE diary_id = :diaryId AND student_id = :studentId AND subject_id = :subjectId")
     fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<List<AttendanceSummary>>

app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt

@@ -0,0 +1,17 @@
+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>)
+}

app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt

@@ -1,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface CompletedLessonsDao {
-
-    @Insert
-    fun insertAll(exams: List<CompletedLesson>)
-
-    @Delete
-    fun deleteAll(exams: List<CompletedLesson>)
+interface CompletedLessonsDao : BaseDao<CompletedLesson> {
 
     @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>

app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt

@@ -1,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ExamDao {
-
-    @Insert
-    fun insertAll(exams: List<Exam>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Exam>)
+interface ExamDao : BaseDao<Exam> {
 
     @Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt

@@ -1,26 +1,14 @@
 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 {
-
-    @Insert
-    fun insertAll(grades: List<Grade>)
-
-    @Update
-    fun updateAll(grade: List<Grade>)
-
-    @Delete
-    fun deleteAll(grades: List<Grade>)
+interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>

app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt

@@ -0,0 +1,18 @@
+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>>
+}

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeStatisticsDao {
-
-    @Insert
-    fun insertAll(gradesStatistics: List<GradeStatistics>)
-
-    @Delete
-    fun deleteAll(gradesStatistics: List<GradeStatistics>)
+interface GradeStatisticsDao : BaseDao<GradeStatistics> {
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
     fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface GradeSummaryDao {
-
-    @Insert
-    fun insertAll(gradesSummary: List<GradeSummary>)
-
-    @Delete
-    fun deleteAll(gradesSummary: List<GradeSummary>)
+interface GradeSummaryDao : BaseDao<GradeSummary> {
 
     @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>

app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt

@@ -1,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface HomeworkDao {
-
-    @Insert
-    fun insertAll(homework: List<Homework>)
-
-    @Delete
-    fun deleteAll(homework: List<Homework>)
+interface HomeworkDao : BaseDao<Homework> {
 
     @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>

app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt

@@ -1,10 +1,7 @@
 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
@@ -12,18 +9,8 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface LuckyNumberDao {
-
-    @Insert
-    fun insert(luckyNumber: LuckyNumber)
-
-    @Update
-    fun update(luckyNumber: LuckyNumber)
-
-    @Delete
-    fun delete(luckyNumber: LuckyNumber)
+interface LuckyNumberDao : BaseDao<LuckyNumber> {
 
     @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
     fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
-
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt

@@ -1,24 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(messages: List<Message>)
-
-    @Delete
-    fun deleteAll(messages: List<Message>)
-
-    @Update
-    fun updateAll(messages: List<Message>)
+interface MessagesDao : BaseDao<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>>

app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt

@@ -1,20 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(devices: List<MobileDevice>)
-
-    @Delete
-    fun deleteAll(devices: List<MobileDevice>)
+interface MobileDeviceDao : BaseDao<MobileDevice> {
 
     @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
     fun loadAll(studentId: Int): Maybe<List<MobileDevice>>

app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt

@@ -1,28 +1,15 @@
 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 {
-
-    @Insert
-    fun insertAll(notes: List<Note>)
-
-    @Update
-    fun updateAll(notes: List<Note>)
-
-    @Delete
-    fun deleteAll(notes: List<Note>)
+interface NoteDao : BaseDao<Note> {
 
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
     fun loadAll(studentId: Int): Maybe<List<Note>>
-
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface RecipientDao {
-
-    @Insert
-    fun insertAll(messages: List<Recipient>)
-
-    @Delete
-    fun deleteAll(messages: List<Recipient>)
+interface RecipientDao : BaseDao<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>>

app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface ReportingUnitDao {
-
-    @Insert
-    fun insertAll(reportingUnits: List<ReportingUnit>)
-
-    @Delete
-    fun deleteAll(reportingUnits: List<ReportingUnit>)
+interface ReportingUnitDao : BaseDao<ReportingUnit> {
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
     fun load(studentId: Int): Maybe<List<ReportingUnit>>

app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.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>
+}

app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt

@@ -1,8 +1,6 @@
 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
@@ -10,13 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface SemesterDao {
-
-    @Insert
-    fun insertAll(semester: List<Semester>)
-
-    @Delete
-    fun deleteAll(semester: List<Semester>)
+interface SemesterDao : BaseDao<Semester> {
 
     @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
     fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>

app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt

@@ -1,20 +1,12 @@
 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 {
-
-    @Insert
-    fun insertAll(subjects: List<Subject>): List<Long>
-
-    @Delete
-    fun deleteAll(subjects: List<Subject>)
+interface SubjectDao : BaseDao<Subject> {
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
     fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>

app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.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>>
+}

app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt

@@ -1,8 +1,6 @@
 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
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface TimetableDao {
-
-    @Insert
-    fun insertAll(exams: List<Timetable>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Timetable>)
+interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>

app/src/main/java/io/github/wulkanowy/data/db/entities/GradePointsStatistics.kt

@@ -0,0 +1,24 @@
+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
+}

app/src/main/java/io/github/wulkanowy/data/db/entities/School.kt

@@ -0,0 +1,30 @@
+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
+}

app/src/main/java/io/github/wulkanowy/data/db/entities/Teacher.kt

@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@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
+}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration16.kt

@@ -0,0 +1,20 @@
+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
+            )
+        """)
+    }
+}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration17.kt

@@ -0,0 +1,29 @@
+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")
+    }
+}

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration18.kt

@@ -0,0 +1,22 @@
+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
+            )
+        """)
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt

@@ -1,6 +1,8 @@
 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
@@ -8,27 +10,57 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
+class GradeStatisticsLocal @Inject constructor(
+    private val gradeStatisticsDb: GradeStatisticsDao,
+    private val gradePointsStatisticsDb: GradePointsStatisticsDao
+) {
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
-            .filter { !it.isEmpty() }
+        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() }
     }
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
-        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)
+        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)
+                }
             }
+            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)
+    }
 }

app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt

@@ -1,6 +1,7 @@
 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
@@ -12,7 +13,10 @@ 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 { it.getGradesStatistics(semester.semesterId, isSemester) }
+            .flatMap {
+                if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
+                else it.getGradesPartialStatistics(semester.semesterId)
+            }
             .map { gradeStatistics ->
                 gradeStatistics.map {
                     GradeStatistics(
@@ -26,4 +30,20 @@ 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
+                    )
+                }
+            }
+    }
 }

app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt

@@ -2,9 +2,11 @@ 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
@@ -31,4 +33,19 @@ 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) })
+    }
 }

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.insert(luckyNumber)
+        luckyNumberDb.insertAll(listOf(luckyNumber))
     }
 
     fun updateLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.update(luckyNumber)
+        luckyNumberDb.updateAll(listOf(luckyNumber))
     }
 
     fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.delete(luckyNumber)
+        luckyNumberDb.deleteAll(listOf(luckyNumber))
     }
 
     fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {

app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt

@@ -11,7 +11,6 @@ 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

app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt

@@ -3,7 +3,6 @@ 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

app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt

@@ -12,52 +12,64 @@ class PreferencesRepository @Inject constructor(
     val context: Context
 ) {
     val startMenuIndex: Int
-        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0
+        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
 
     val isShowPresent: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
+        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
 
     val gradeAverageMode: String
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
 
     val gradeAverageForceCalc: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
+        get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
 
     val isGradeExpandable: Boolean
-        get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
+        get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
-    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
+    val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
-        get() = sharedPref.getString(appThemeKey, "light") ?: "light"
+        get() = getString(appThemeKey, R.string.pref_default_app_theme)
 
     val gradeColorTheme: String
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
+        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
 
-    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
+    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 isServiceEnabled: Boolean
-        get() = sharedPref.getBoolean(serviceEnableKey, true)
+        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
 
-    val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
+    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
     val servicesInterval: Long
-        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60
+        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
 
-    val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
+    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
-        get() = sharedPref.getBoolean(servicesOnlyWifiKey, false)
+        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
 
     val isNotificationsEnable: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
+        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
-        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)
+        get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
 
     val gradePlusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
 
     val gradeMinusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
+        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
 
     val fillMessageContent: Boolean
-        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
+        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))
 }

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>) {
+    fun saveRecipients(recipients: List<Recipient>): List<Long> {
         return recipientDb.insertAll(recipients)
     }
 

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>) {
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 

app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt

@@ -0,0 +1,22 @@
+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)
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt

@@ -0,0 +1,26 @@
+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
+                )
+            }
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt

@@ -0,0 +1,41 @@
+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) })
+            )
+    }
+}

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.isEmpty() }
+            .filter { it.isNotEmpty() }
     }
 
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {

app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt

@@ -0,0 +1,22 @@
+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() }
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt

@@ -0,0 +1,28 @@
+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
+                    )
+                }
+            }
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt

@@ -0,0 +1,34 @@
+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()) })
+    }
+}

app/src/main/java/io/github/wulkanowy/di/AppModule.kt

@@ -2,6 +2,7 @@ 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
@@ -32,4 +33,8 @@ internal class AppModule {
     @Singleton
     @Provides
     fun provideAppInfo() = AppInfo()
+
+    @Singleton
+    @Provides
+    fun provideLingver() = Lingver.getInstance()
 }

app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt

@@ -21,6 +21,7 @@ import io.github.wulkanowy.services.sync.works.LuckyNumberWork
 import io.github.wulkanowy.services.sync.works.MessageWork
 import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
+import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
@@ -28,17 +29,15 @@ import javax.inject.Singleton
 
 @Suppress("unused")
 @AssistedModule
-@Module(includes = [AssistedInject_ServicesModule::class])
+@Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
 abstract class ServicesModule {
 
     @Module
-    companion object {
+    object Static {
 
-        @JvmStatic
         @Provides
         fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
-        @JvmStatic
         @Singleton
         @Provides
         fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
@@ -75,6 +74,10 @@ 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

app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt

@@ -11,6 +11,7 @@ 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
@@ -32,10 +33,6 @@ class SyncManager @Inject constructor(
     appInfo: AppInfo
 ) {
 
-    companion object {
-        private const val APP_VERSION_CODE_KEY = "app_version_code"
-    }
-
     init {
         if (now().isHolidays) stopSyncWorker()
 

app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.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()
+    }
+}

app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt

@@ -22,7 +22,8 @@ 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>
@@ -53,13 +54,15 @@ 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) {
-                    ErrorDialog.newInstance(error).show(supportFragmentManager, error.toString())
-                }
+                .setAction(R.string.all_details) { showErrorDetailsDialog(error) }
                 .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()

app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt

@@ -0,0 +1,27 @@
+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())
+    }
+}

app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt

@@ -13,15 +13,17 @@ 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) ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-                }
+                .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
                 .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()

app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt

@@ -9,4 +9,6 @@ interface BaseView {
     fun showExpiredDialog()
 
     fun openClearLoginView()
+
+    fun showErrorDetailsDialog(error: Throwable)
 }

app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt

@@ -43,16 +43,17 @@ class ErrorDialog : DialogFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        StringWriter().let { writer ->
-            error.printStackTrace(PrintWriter(writer))
 
-            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()
-            }
+        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()
         }
         errorDialogCancel.setOnClickListener { dismiss() }
     }

app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt

@@ -3,6 +3,7 @@ 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
@@ -22,8 +23,12 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
 
     fun applyDefaultTheme() {
         AppCompatDelegate.setDefaultNightMode(
-            if (preferencesRepository.appTheme == "light") MODE_NIGHT_NO
-            else MODE_NIGHT_YES
+            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")
+            }
         )
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt

@@ -47,6 +47,11 @@ 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))
@@ -130,6 +135,10 @@ 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())
     }

app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt

@@ -28,10 +28,15 @@ 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()
@@ -61,6 +66,7 @@ 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) },

app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt

@@ -9,6 +9,8 @@ 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?>?
@@ -25,6 +27,8 @@ interface AboutView : BaseView {
 
     fun openEmailClient()
 
+    fun openFaqPage()
+
     fun openHomepage()
 
     fun openLicenses()

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt

@@ -7,18 +7,17 @@ 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.BaseActivity
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
 
-class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
+class AccountDialog : BaseDialogFragment(), AccountView {
 
     @Inject
     lateinit var presenter: AccountPresenter
@@ -77,14 +76,6 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
         }
     }
 
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
-    }
-
     override fun showConfirmDialog() {
         context?.let {
             AlertDialog.Builder(it)
@@ -105,4 +96,3 @@ class AccountDialog : DaggerAppCompatDialogFragment(), AccountView {
         super.onDestroy()
     }
 }
-

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt

@@ -6,7 +6,11 @@ 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
@@ -17,9 +21,11 @@ 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,
@@ -70,7 +76,11 @@ 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))
@@ -110,11 +120,19 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun showEmpty(show: Boolean) {
-        attendanceEmpty.visibility = if (show) View.VISIBLE else View.GONE
+        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
     }
 
     override fun showProgress(show: Boolean) {
-        attendanceProgress.visibility = if (show) View.VISIBLE else View.GONE
+        attendanceProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
@@ -122,7 +140,7 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun showContent(show: Boolean) {
-        attendanceRecycler.visibility = if (show) View.VISIBLE else View.GONE
+        attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
@@ -130,17 +148,32 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun showPreButton(show: Boolean) {
-        attendancePreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        attendanceNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        attendanceNextButton.visibility = if (show) VISIBLE else 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())
     }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt

@@ -1,5 +1,6 @@
 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
@@ -37,10 +38,13 @@ 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()
@@ -56,11 +60,32 @@ 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 ->
@@ -130,18 +155,29 @@ 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 {
@@ -149,16 +185,18 @@ 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\ndd.MM.YYYY").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
         }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt

@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
+import org.threeten.bp.LocalDate
 
 interface AttendanceView : BaseView {
 
@@ -23,6 +24,10 @@ interface AttendanceView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -35,6 +40,8 @@ interface AttendanceView : BaseView {
 
     fun showAttendanceDialog(lesson: Attendance)
 
+    fun showDatePickerDialog(currentDate: LocalDate)
+
     fun openSummaryView()
 
     fun popView()

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt

@@ -57,6 +57,8 @@ 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)
@@ -80,7 +82,7 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
         with(attendanceSummaryAdapter) {
             updateDataSet(data, true)
-            removeAllScrollableFooters()
+            removeAllScrollableHeaders()
             addScrollableHeader(header)
         }
     }
@@ -93,6 +95,14 @@ 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
     }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt

@@ -33,10 +33,13 @@ 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()
     }
@@ -46,12 +49,26 @@ 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 {
@@ -88,13 +105,23 @@ 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()

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt

@@ -18,6 +18,10 @@ 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>)

app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt

@@ -61,6 +61,9 @@ 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() }
 
@@ -95,6 +98,14 @@ 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
     }

app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt

@@ -36,10 +36,13 @@ 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()
@@ -60,6 +63,18 @@ 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}")
@@ -116,17 +131,28 @@ 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 ->
@@ -142,6 +168,7 @@ class ExamPresenter @Inject constructor(
             enableSwipe(false)
             showContent(false)
             showEmpty(false)
+            showErrorView(false)
             clearData()
             reloadNavigation()
         }

app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt

@@ -21,6 +21,10 @@ interface ExamView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt

@@ -13,6 +13,7 @@ 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
@@ -83,7 +84,8 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             setElevationCompat(context.dpToPx(4f))
         }
 
-        gradeSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        gradeErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -104,22 +106,18 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
         gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showEmpty(show: Boolean) {
-        gradeEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    override fun showErrorView(show: Boolean) {
+        gradeError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showRefresh(show: Boolean) {
-        gradeSwipe.isRefreshing = show
+    override fun setErrorDetails(message: String) {
+        gradeErrorMessage.text = message
     }
 
     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),

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt

@@ -11,13 +11,12 @@ import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
 @Suppress("unused")
-@Module
+@Module(includes = [GradeModule.Static::class])
 abstract class GradeModule {
 
     @Module
-    companion object {
+    object Static {
 
-        @JvmStatic
         @PerFragment
         @Provides
         fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)

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.run {
-            initView()
-            enableSwipe(false)
-        }
+        view.initView()
         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)
-            showEmpty(false)
+            showErrorView(false)
             loadedSemesterId[currentPageIndex] = semesterId
         }
     }
@@ -80,10 +80,18 @@ class GradePresenter @Inject constructor(
         if (semesters.isNotEmpty()) loadChild(index)
     }
 
-    fun onSwipeRefresh() {
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
         loadData()
     }
 
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
     private fun loadData() {
         Timber.i("Loading grade data started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -96,25 +104,28 @@ class GradePresenter @Inject constructor(
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .doFinally { view?.showRefresh(false) }
+            .doFinally { view?.showProgress(false) }
             .subscribe({
                 view?.run {
                     Timber.i("Loading grade result: Attempt load index $currentPageIndex")
                     loadChild(currentPageIndex)
-                    enableSwipe(false)
+                    showErrorView(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) {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt

@@ -12,16 +12,14 @@ interface GradeView : BaseView {
 
     fun showProgress(show: Boolean)
 
-    fun showEmpty(show: Boolean)
+    fun showErrorView(show: Boolean)
 
-    fun showRefresh(show: Boolean)
+    fun setErrorDetails(message: String)
 
     fun showSemesterSwitch(show: Boolean)
 
     fun showSemesterDialog(selectedIndex: Int)
 
-    fun enableSwipe(enable: Boolean)
-
     fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
 
     fun notifyChildParentReselected(index: Int)

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt

@@ -18,6 +18,7 @@ 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
@@ -33,6 +34,8 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
     @Inject
     lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
+    private var gradeDetailsMenu: Menu? = null
+
     companion object {
         fun newInstance() = GradeDetailsFragment()
     }
@@ -69,6 +72,8 @@ 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() {
@@ -86,6 +91,8 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
             )
         }
         gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -137,6 +144,14 @@ 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
     }
@@ -165,6 +180,10 @@ 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()

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt

@@ -26,11 +26,16 @@ 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) {
@@ -52,6 +57,8 @@ class GradeDetailsPresenter @Inject constructor(
                             updateItem(header)
                         }
                     }
+                    newGradesAmount--
+                    updateMarkAsDoneButton()
                     updateGrade(item.grade)
                 }
             }
@@ -85,6 +92,18 @@ 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) {
@@ -106,6 +125,10 @@ 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()
@@ -131,19 +154,32 @@ 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

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt

@@ -38,6 +38,10 @@ interface GradeDetailsView : BaseView {
 
     fun showProgress(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun enableSwipe(enable: Boolean)
 
     fun showRefresh(show: Boolean)
@@ -46,6 +50,8 @@ interface GradeDetailsView : BaseView {
 
     fun notifyParentRefresh()
 
+    fun enableMarkAsDoneButton(enable: Boolean)
+
     fun getGradeNumberString(number: Int): String
 
     fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?

app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt

@@ -1,5 +1,6 @@
 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
@@ -10,11 +11,15 @@ 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
@@ -38,7 +43,9 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isViewEmpty get() = gradeStatisticsChart.isEmpty
+    override val isPieViewEmpty get() = gradeStatisticsChart.isEmpty
+
+    override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty
 
     private lateinit var gradeColors: List<Pair<Int, Int>>
 
@@ -60,6 +67,11 @@ 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+"
     )
@@ -70,8 +82,8 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeStatisticsChart
-        presenter.onAttachView(this, savedInstanceState?.getBoolean(SAVED_CHART_TYPE))
+        messageContainer = gradeStatisticsSwipe
+        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
@@ -84,6 +96,13 @@ 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)
 
@@ -92,9 +111,11 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-
         gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+
+        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+        gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
+        gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -105,23 +126,25 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         }
     }
 
-    override fun updateData(items: List<GradeStatistics>, theme: String) {
+    override fun updatePieData(items: List<GradeStatistics>, theme: String) {
         gradeColors = when (theme) {
             "vulcan" -> vulcanGradeColors
             else -> materialGradeColors
         }
 
-        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 {
+        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 {
                 setTouchEnabled(false)
                 setValueFormatter(object : ValueFormatter() {
                     override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
@@ -144,6 +167,47 @@ 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
@@ -151,16 +215,29 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun clearView() {
         gradeStatisticsChart.clear()
+        gradeStatisticsChartPoints.clear()
     }
 
-    override fun showContent(show: Boolean) {
+    override fun showPieContent(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
     }
@@ -196,13 +273,17 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     override fun onResume() {
         super.onResume()
         gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            presenter.onTypeChange(checkedId == R.id.gradeStatisticsTypeSemester)
+            presenter.onTypeChange(when (checkedId) {
+                R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
+                R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
+                else -> ViewType.POINTS
+            })
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putBoolean(SAVED_CHART_TYPE, presenter.currentIsSemester)
+        outState.putSerializable(SAVED_CHART_TYPE, presenter.currentType)
     }
 
     override fun onDestroyView() {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt

@@ -30,19 +30,22 @@ class GradeStatisticsPresenter @Inject constructor(
 
     private var currentSubjectName: String = "Wszystkie"
 
-    var currentIsSemester = false
+    private lateinit var lastError: Throwable
+
+    var currentType: ViewType = ViewType.PARTIAL
         private set
 
-    fun onAttachView(view: GradeStatisticsView, isSemester: Boolean?) {
+    fun onAttachView(view: GradeStatisticsView, type: ViewType?) {
         super.onAttachView(view)
-        currentIsSemester = isSemester ?: false
+        currentType = type ?: ViewType.PARTIAL
         view.initView()
+        errorHandler.showErrorMessage = ::showErrorViewOnError
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
-        loadData(semesterId, currentSubjectName, currentIsSemester, forceRefresh)
+        loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
     fun onParentViewChangeSemester() {
@@ -50,7 +53,8 @@ class GradeStatisticsPresenter @Inject constructor(
             showProgress(true)
             enableSwipe(false)
             showRefresh(false)
-            showContent(false)
+            showBarContent(false)
+            showErrorView(false)
             showEmpty(false)
             clearView()
         }
@@ -62,31 +66,47 @@ 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 {
-            showContent(false)
+            showBarContent(false)
+            showPieContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
+            showErrorView(false)
             clearView()
         }
         (subjects.singleOrNull { it.name == name }?.name)?.let {
-            if (it != currentSubjectName) loadData(currentSemesterId, it, currentIsSemester)
+            if (it != currentSubjectName) loadDataByType(currentSemesterId, it, currentType)
         }
     }
 
-    fun onTypeChange(isSemester: Boolean) {
-        Timber.i("Select grade stats semester: $isSemester")
+    fun onTypeChange(type: ViewType) {
+        Timber.i("Select grade stats semester: $type")
         disposable.clear()
         view?.run {
-            showContent(false)
+            showBarContent(false)
+            showPieContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
+            showErrorView(false)
             clearView()
         }
-        loadData(currentSemesterId, currentSubjectName, isSemester)
+        loadDataByType(currentSemesterId, currentSubjectName, type)
     }
 
     private fun loadSubjects() {
@@ -111,10 +131,18 @@ 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) }
@@ -134,14 +162,64 @@ class GradeStatisticsPresenter @Inject constructor(
                 Timber.i("Loading grade stats result: Success")
                 view?.run {
                     showEmpty(it.isEmpty())
-                    showContent(it.isNotEmpty())
-                    updateData(it, preferencesRepository.gradeColorTheme)
+                    showBarContent(false)
+                    showPieContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updatePieData(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)
+        }
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt

@@ -1,17 +1,22 @@
 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 isViewEmpty: Boolean
+    val isPieViewEmpty: Boolean
+
+    val isBarViewEmpty: Boolean
 
     fun initView()
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updateData(items: List<GradeStatistics>, theme: String)
+    fun updatePieData(items: List<GradeStatistics>, theme: String)
+
+    fun updateBarData(item: GradePointsStatistics)
 
     fun showSubjects(show: Boolean)
 
@@ -21,10 +26,16 @@ interface GradeStatisticsView : BaseView {
 
     fun clearView()
 
-    fun showContent(show: Boolean)
+    fun showPieContent(show: Boolean)
+
+    fun showBarContent(show: Boolean)
 
     fun showEmpty(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)

app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt

@@ -0,0 +1,7 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+enum class ViewType {
+    SEMESTER,
+    PARTIAL,
+    POINTS
+}

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt

@@ -56,6 +56,8 @@ 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) {
@@ -82,6 +84,14 @@ 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
     }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt

@@ -25,9 +25,12 @@ 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) {
@@ -56,21 +59,44 @@ 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()

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt

@@ -26,6 +26,10 @@ interface GradeSummaryView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
     fun showEmpty(show: Boolean)
 
     fun notifyParentDataLoaded(semesterId: Int)