diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ae402f5..d4e59be1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -159,7 +159,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index eb4efba7..a8407c84 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -19,7 +19,7 @@
       <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
       <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
-      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
+      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
     <Objective-C-extensions>
       <file>
diff --git a/.travis.yml b/.travis.yml
index a430c90e..56c64858 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,11 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
+#branches:
+#  only:
+#  - master
+#  - 0.7.x
+
 android:
  licenses:
     - android-sdk-preview-license-.+
@@ -41,7 +46,7 @@ before_script:
     - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
-  - ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --stacktrace --daemon
+  - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
   - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
   - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
@@ -56,7 +61,7 @@ script:
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publish -PenableCrashlytics --stacktrace;
     fi
 
 after_success:
diff --git a/README.md b/README.md
index ccbf14ca..97a4172c 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,12 @@
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
 [![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
-[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=shield)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_shield)
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=shield)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_shield)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 
 [Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)
 
-[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/0)
+[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
 [(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
 
 Androidowy klient dziennika VULCAN UONET+.
@@ -19,4 +19,4 @@ Androidowy klient dziennika VULCAN UONET+.
 
 ## License
 
-[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=large)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=large)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_large)
diff --git a/app/build.gradle b/app/build.gradle
index 6382469d..4b471bdc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,25 +11,20 @@ android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
-    playAccountConfigs {
-        defaultAccountConfig {
-            serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL")
-            pk12File = file('key.p12')
-        }
-    }
-
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 19
-        versionName "0.6.0"
+        versionCode 27
+        versionName "0.7.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-        playAccountConfig = playAccountConfigs.defaultAccountConfig
-        manifestPlaceholders = [crashlytics_enabled: project.hasProperty("enableCrashlytics")]
+        manifestPlaceholders = [
+                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
+                crashlytics_enabled: project.hasProperty("enableCrashlytics")
+        ]
     }
 
     signingConfigs {
@@ -45,7 +40,6 @@ android {
         release {
             buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
-            useProguard false
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
@@ -63,6 +57,11 @@ android {
     lintOptions {
         disable 'HardwareIds'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 androidExtensions {
@@ -70,66 +69,74 @@ androidExtensions {
 }
 
 play {
+    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
+    serviceAccountCredentials = file('key.p12')
+    defaultToAppBundles = true
     track = 'alpha'
-    uploadImages = true
-}
-
-configurations.all {
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp-urlconnection:3.11.0"
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.6.0') { exclude module: "threetenbp" }
+    implementation('io.github.wulkanowy:api:0.7.1') { exclude module: "threetenbp" }
 
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "com.google.android.material:material:1.0.0"
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation 'com.takisoft.preferencex:preferencex:1.0.0'
-    implementation "com.mikepenz:aboutlibraries:6.2.0"
-    implementation "com.firebase:firebase-jobdispatcher:0.8.5"
 
-    implementation "com.google.dagger:dagger-android-support:2.19"
-    kapt "com.google.dagger:dagger-compiler:2.19"
-    kapt "com.google.dagger:dagger-android-processor:2.19"
+    implementation "android.arch.work:work-rxjava2:1.0.0"
+    implementation "android.arch.work:work-runtime:1.0.0"
 
-    implementation "androidx.room:room-runtime:2.1.0-alpha03"
-    implementation "androidx.room:room-rxjava2:2.1.0-alpha03"
-    kapt "androidx.room:room-compiler:2.1.0-alpha03"
+    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.3.3'
+    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3'
+
+    implementation "com.google.dagger:dagger-android-support:2.21"
+    kapt "com.google.dagger:dagger-compiler:2.21"
+    kapt "com.google.dagger:dagger-android-processor:2.21"
+
+    implementation "androidx.room:room-runtime:2.1.0-alpha05"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha05"
+    kapt "androidx.room:room-compiler:2.1.0-alpha05"
 
     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.1.0'
 
-    implementation "com.aurelhubert:ahbottomnavigation:2.2.0"
-    implementation 'com.ncapdevi:frag-nav:3.0.0'
+    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+    implementation 'com.github.PhilJay:MPAndroidChart:971640b29d'
 
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.4"
-
-    implementation "com.jakewharton.threetenabp:threetenabp:1.1.0"
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "io.reactivex.rxjava2:rxjava:2.2.7"
 
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.0"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
+    implementation "com.mikepenz:aboutlibraries:6.2.3"
 
-    implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7'
+    implementation 'com.google.firebase:firebase-core:16.0.8'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
 
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
+    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.4'
+
+    debugImplementation 'fr.o80.chucker:library:2.0.4'
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.8.13.kotlin13"
-    testImplementation "org.mockito:mockito-inline:2.23.4"
+    testImplementation "io.mockk:mockk:1.9.1"
+    testImplementation "org.mockito:mockito-inline:2.25.0"
     testImplementation 'org.threeten:threetenbp:1.3.8'
 
+    androidTestImplementation "io.mockk:mockk-android:1.9.1"
     androidTestImplementation 'androidx.test:core:1.1.0'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'org.mockito:mockito-android:2.23.4'
+    androidTestImplementation 'org.mockito:mockito-android:2.25.0'
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
 
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 4f94ef19..f2b01b48 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.2"
+    toolVersion "0.8.3"
     reportsDir = file("$buildDir/reports")
 }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index cebd3d94..15b62838 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -5,6 +5,7 @@
 -dontskipnonpubliclibraryclasses
 -dontskipnonpubliclibraryclassmembers
 -dontpreverify
+-dontobfuscate
 -allowaccessmodification
 -repackageclasses ''
 -verbose
@@ -13,7 +14,6 @@
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
--renamesourcefileattribute SourceFile
 -keep class com.crashlytics.** {*;}
 -keep public class * extends java.lang.Exception
 -dontwarn com.crashlytics.**
@@ -32,5 +32,8 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
+#Config for MPAndroidChart
+-keep class com.github.mikephil.charting.** { *; }
+
 #Config for API
 -keep class io.github.wulkanowy.api.** {*;}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
new file mode 100644
index 00000000..7dc93c4a
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class TestInternetObservingStrategy : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(true)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(true)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
similarity index 85%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index 8cbd13cd..ee65cf84 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendance
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -34,13 +34,13 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "")
+                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
         ))
 
         val attendance = attendanceLocal
-                .getAttendance(Semester(1, 1, 2, "", 3, 1),
+            .getAttendance(Semester(1, 2, "", 1, 3, true, 1, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
new file mode 100644
index 00000000..014f0b8b
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -0,0 +1,57 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+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.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class CompletedLessonsLocalTest {
+
+    private lateinit var completedLessonsLocal: CompletedLessonsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        completedLessonsLocal.saveCompletedLessons(listOf(
+            getCompletedLesson(LocalDate.of(2018, 9, 10), 1),
+            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
+            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
+        ))
+
+        val completed = completedLessonsLocal
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, true, 1, 1),
+                LocalDate.of(2018, 9, 10),
+                LocalDate.of(2018, 9, 14)
+            )
+            .blockingGet()
+        assertEquals(2, completed.size)
+        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
+    }
+
+    private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
+        return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
similarity index 93%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index c60348e3..dc66fa42 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.exam
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -40,7 +40,7 @@ class ExamLocalTest {
         ))
 
         val exams = examLocal
-                .getExams(Semester(1, 1, 2, "", 3, 1),
+            .getExams(Semester(1, 2, "", 1, 3, true, 1, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
new file mode 100644
index 00000000..36238f1b
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -0,0 +1,50 @@
+package io.github.wulkanowy.data.repositories.grade
+
+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.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeLocalTest {
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
+            createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
+            createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
+        ))
+
+        val grades = gradeLocal
+            .getGrades(Semester(1, 2, "", 2, 3, true, 1, 1))
+            .blockingGet()
+
+        assertEquals(2, grades.size)
+        assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
+        assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
new file mode 100644
index 00000000..17e788fc
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -0,0 +1,112 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import android.os.Build.VERSION_CODES.P
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import io.github.wulkanowy.api.grades.Grade as GradeApi
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class GradeRepositoryTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var studentMock: Student
+
+    private lateinit var gradeRemote: GradeRemote
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeRemote = GradeRemote(mockApi)
+
+        every { mockApi.diaryId } returns 1
+        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.semesterId } returns 1
+        every { semesterMock.diaryId } returns 1
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun markOlderThanRegisterDateAsRead() {
+        every { mockApi.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
+            createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
+            createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
+            createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun mitigateOldGradesNotifications() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
+            createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
+            createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
+        ))
+
+        every { mockApi.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
+            createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
+            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
+            createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
new file mode 100644
index 00000000..e0fd05a8
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import io.github.wulkanowy.api.toDate
+import org.threeten.bp.LocalDate
+import io.github.wulkanowy.api.grades.Grade as GradeRemote
+import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
+
+fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
+    return GradeLocal(
+        semesterId = semesterId,
+        studentId = 1,
+        modifier = .0,
+        teacher = "",
+        subject = "",
+        date = date,
+        color = "",
+        comment = "",
+        description = desc,
+        entry = "",
+        gradeSymbol = "",
+        value = value,
+        weight = "",
+        weightValue = weight
+    )
+}
+
+fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
+    return GradeRemote().apply {
+        this.value = value
+        this.weightValue = weight
+        this.date = date.toDate()
+        this.description = desc
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
new file mode 100644
index 00000000..5c0590e7
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -0,0 +1,68 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+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.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeStatisticsLocalTest {
+
+    private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndRead_subject() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesStatistics(
+            Semester(2, 2, "", 1, 2, true, 1, 1), false,
+            "Matematyka"
+        ).blockingGet()
+        assertEquals(1, stats.size)
+        assertEquals(stats[0].subject, "Matematyka")
+    }
+
+    @Test
+    fun saveAndRead_all() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Chemia", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesStatistics(
+            Semester(2, 2, "", 1, 2, true, 1, 1), false,
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(1, stats.size)
+        assertEquals(stats[0].subject, "Wszystkie")
+    }
+
+    private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
+        return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
new file mode 100644
index 00000000..a656ac05
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -0,0 +1,47 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+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.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class LuckyNumberLocalTest {
+
+    private lateinit var luckyNumberLocal: LuckyNumberLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
+
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, true, 1, 1),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
+
+        assertEquals(1, luckyNumber.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
+        assertEquals(14, luckyNumber.luckyNumber)
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
new file mode 100644
index 00000000..1f6562a2
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+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.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class RecipientLocalTest {
+
+    private lateinit var recipientLocal: RecipientLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        recipientLocal = RecipientLocal(testDb.recipientDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        recipientLocal.saveRecipients(listOf(
+            Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
+            Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
+            Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
+        ))
+
+        val recipients = recipientLocal.getRecipients(
+            Student("fakelog.cf", "AUTO", "", "", "", 1, "", "", "", true, LocalDateTime.now()),
+            2,
+            ReportingUnit(1, 4, "", 0, "", emptyList())
+        ).blockingGet()
+
+        assertEquals(2, recipients.size)
+        assertEquals(1, recipients[0].studentId)
+        assertEquals("3rPracownik", recipients[1].realId)
+        assertEquals("Kowalski Jan", recipients[0].name)
+        assertEquals("Kowalska Karolina [KK] - Pracownik (Fake123456)", recipients[1].realName)
+        assertEquals(3, recipients[0].loginId)
+        assertEquals(4, recipients[1].unitId)
+        assertEquals(2, recipients[0].role)
+        assertEquals("hash", recipients[1].hash)
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
similarity index 82%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index 732dc5bc..c31bc806 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
 import androidx.room.Room
@@ -11,6 +11,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -28,7 +29,7 @@ class StudentLocalTest {
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
         sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
-        studentLocal = StudentLocal(testDb.studentDao, sharedHelper, context)
+        studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
     @After
@@ -38,9 +39,8 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true))
+        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, symbol = "", registrationDate = now()))
             .blockingGet()
-        assert(studentLocal.isStudentSaved)
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
new file mode 100644
index 00000000..438e95f4
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import io.github.wulkanowy.api.toDate
+import io.github.wulkanowy.utils.toDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
+import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = ""): TimetableLocal {
+    return TimetableLocal(
+        studentId = 1,
+        diaryId = 2,
+        number = number,
+        start = start,
+        end = now(),
+        date = start.toLocalDate(),
+        subject = subject,
+        subjectOld = "",
+        group = "",
+        room = room,
+        roomOld = "",
+        teacher = "",
+        teacherOld = "",
+        info = "",
+        changes = false,
+        canceled = false
+    )
+}
+
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = ""): TimetableRemote {
+    return TimetableRemote(
+        number = number,
+        start = start.toDate(),
+        end = start.plusMinutes(45).toDate(),
+        date = start.toLocalDate().toDate(),
+        subject = subject,
+        group = "",
+        room = room,
+        teacher = "",
+        info = "",
+        changes = false,
+        canceled = false
+    )
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
similarity index 58%
rename from app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index df0a7994..0ecbcf92 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -1,17 +1,16 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.timetable
 
 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.Semester
-import io.github.wulkanowy.data.db.entities.Timetable
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -23,7 +22,8 @@ class TimetableLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
         timetableDb = TimetableLocal(testDb.timetableDao)
     }
 
@@ -35,19 +35,17 @@ class TimetableLocalTest {
     @Test
     fun saveAndReadTest() {
         timetableDb.saveTimetable(listOf(
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 10), "", "", "", "", ""),
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 14), "", "", "", "", ""),
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 17), "", "", "", "", "")
+            createTimetableLocal(1, of(2018, 9, 10, 0, 0, 0)),
+            createTimetableLocal(1, of(2018, 9, 14, 0, 0, 0)),
+            createTimetableLocal(1, of(2018, 9, 17, 0, 0, 0))
         ))
 
         val exams = timetableDb.getTimetable(
-                Semester(0, 1, 2, "3", 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
+            Semester(1, 2, "", 1, 1, true, 1, 1),
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 14)
         ).blockingGet()
+
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
         assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
new file mode 100644
index 00000000..1c080263
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -0,0 +1,85 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import android.os.Build.VERSION_CODES.P
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
+import kotlin.test.assertEquals
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class TimetableRepositoryTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private lateinit var timetableRemote: TimetableRemote
+
+    private lateinit var timetableLocal: TimetableLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        timetableLocal = TimetableLocal(testDb.timetableDao)
+        timetableRemote = TimetableRemote(mockApi)
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 2
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun copyDetailsToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
+            createTimetableLocal(1, of(2019, 3, 5, 8, 50), "321", "Religia"),
+            createTimetableLocal(1, of(2019, 3, 5, 9, 40), "213", "W-F")
+        ))
+
+        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
+            createTimetableRemote(1, of(2019, 3, 5, 8, 50), "", "Religia"),
+            createTimetableRemote(1, of(2019, 3, 5, 9, 40), "", "W-F")
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(3, lessons.size)
+        assertEquals("123", lessons[0].room)
+        assertEquals("321", lessons[1].room)
+        assertEquals("213", lessons[2].room)
+    }
+}
diff --git a/app/src/debug/res/drawable/ic_launcher_foreground.xml b/app/src/debug/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..6be79909
--- /dev/null
+++ b/app/src/debug/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,58 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="1926.9231"
+        android:viewportHeight="1926.9231">
+    <group android:translateX="462.46155"
+            android:translateY="462.46155">
+      <path
+          android:pathData="M2000,1440.1V2002H1240.1L238.1,1000v0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8 1.6,-3.1 3.4,-6 5,-9.1 0.4,-0.8 0.6,-1.6 0.6,-2.5 9.2,-15.1 20.2,-28.9 31.4,-42.6 0.1,-0.2 0.3,-0.3 0.4,-0.5 5.1,-6.3 10.3,-12.6 15.3,-18.9 1,-1.2 1.9,-2.4 2.9,-3.7 0.2,-0.2 0.3,-0.4 0.5,-0.6 7.6,-9.7 14.8,-19.7 21.2,-30.2 1,-1.7 2,-3.4 2.9,-5.1 0.1,-0.2 0.2,-0.3 0.3,-0.5 6.2,-11.4 11.3,-23.3 17.7,-34.6 4.5,-8 9.3,-15.9 13.8,-23.9 0.1,-0.2 0.2,-0.3 0.3,-0.5 0.8,-1.5 1.6,-3 2.4,-4.4 0.2,-0.3 0.3,-0.6 0.5,-0.9 2,-3.7 3.8,-7.4 5.6,-11.2 6.2,-13.4 10.2,-27.7 14,-41.9 0,-0.2 0.1,-0.3 0.1,-0.5 0.3,-1 0.5,-2 0.8,-2.9 4,-15.3 7.3,-31.4 13.5,-45.9 1.4,-3.3 3,-6.5 4.6,-9.6 0.1,-0.2 0.2,-0.3 0.3,-0.5 5,-9.7 10.6,-19.1 13.5,-29.7 2.6,-9.2 3.5,-19 3.6,-28.8 0,-0.2 0,-0.3 0,-0.5 0.1,-7.2 -0.1,-14.4 -0.4,-21.3 0.9,-5.6 1.9,-11.3 3,-16.9 0.2,-0.9 0.3,-1.7 0.5,-2.6 1.2,-5.9 2.5,-11.7 4.2,-17.4 0,-0.1 0.1,-0.3 0.1,-0.4 0,-0.2 0.1,-0.3 0.1,-0.5 0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9 12.8,-3.9 24.9,-9.9 36.3,-16.8 2.8,-1.7 5.6,-3.4 8.3,-5.2 0.2,-0.1 0.3,-0.2 0.5,-0.3 7.7,-4.9 15.2,-10.2 22.1,-16 3.1,-2.7 5.9,-5.6 8.3,-8.9 0.1,-0.2 0.2,-0.3 0.4,-0.5 2.3,-3.4 4.2,-7.2 5.3,-11.4 2.4,-9.2 1.9,-19 1.9,-28.4 0,-0.2 0,-0.4 0,-0.6l5.7,-5.6 -0.3,0.1 4.1,1.3 45.3,45 9.6,9.6 14.3,14.3 100.8,100.8 17.2,17.2 16.3,16.3 30.3,-30.3 -192.9,-191.5c0.5,-0.5 1.1,-1.6 1.4,-2.3 0.3,-0.6 0.5,-1.2 0.4,-1.9 0,-0.8 -0.2,-1.6 -0.6,-2.3 -0.1,-0.3 -0.3,-0.7 -0.4,-1 -0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8 191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7 4.1,0 8.2,0.1 11.9,1.9 0.5,0.3 1.3,0.7 2.1,1.1 1.7,2.3 3.5,4.5 5.7,6.2 2.7,2.1 8.2,3 9.4,0.3z"
+          android:fillColor="#AD2A2A"/>
+      <path
+          android:pathData="m616.3,796.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3h-187.2c-4,0 -7.7,-2.3 -9.5,-5.6l-30.9,-57.4c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2 37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m386.7,253.5c0,-22.9 14.5,-42.6 35.3,-51.8 -1.5,-2.5 -2.4,-5.2 -2.4,-8.1 0,-11.1 12.8,-20.1 28.5,-20.1 0.4,0 0.7,0 1.1,0 6.5,-10.8 18.9,-18.1 33.1,-18.1 1,0 2,0 3,0.1 1.3,0.1 2.6,-0.5 3.3,-1.5 10.5,-16 37.1,-27.4 68.2,-27.4 11.5,0 22.4,1.6 32.1,4.3 2.3,-3.8 7.4,-6.4 13.3,-6.4 6.7,0 12.4,3.4 14.1,8.1 8.2,-9.5 22.1,-15.7 37.9,-15.7 25.2,0 45.6,15.9 45.6,35.5 0,2.4 -0.3,4.7 -0.9,7 -0.4,1.6 0.5,3.2 2.2,3.8 16.1,5.9 27,17.1 27,29.9 0,14.6 -14.1,27.1 -34,32 -1.6,0.4 -2.6,1.8 -2.6,3.3 0,0.1 0,0.2 0,0.3 0,11.3 -11.2,20.6 -25.6,21.6 0.1,0.5 0.1,1 0.1,1.6 0,21.7 -41.3,39.2 -92.2,39.2 -11,0 -21.5,-0.8 -31.2,-2.3 0,0.2 0,0.3 0,0.5 0,9 -11.6,16.3 -25.8,16.3 -0.8,0 -1.5,0 -2.2,-0.1 1,2.2 1.5,4.5 1.5,6.9 0,14 -17.7,25.3 -39.6,25.3 -2.4,0 -4.7,-0.1 -7,-0.4 -1.8,-0.2 -3.5,0.9 -3.9,2.6 -1.9,7 -8,12.1 -15.3,12.1 -8.8,0 -15.8,-7.5 -15.8,-16.7 0,-4.3 1.5,-8.2 4,-11.1 0.9,-1 1.2,-2.4 0.6,-3.6 -1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3 -27.1,-6 -47.5,-28.6 -47.5,-55.6z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m870.4,883h-124.4c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5l-41.5,-121.2c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7l-101.6,-51.3c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5l98.9,201.2c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6c5.8,6.4 0.9,16.5 -8.1,16.5z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m335.8,838.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1h-180.6c-8.4,0 -13.5,-8.8 -9,-15.4l116.3,-171.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4l-39.1,87.8c-0.9,2.1 -1.1,4.4 -0.4,6.5z"
+          android:fillColor="#FFFFFF"/>
+      <path
+          android:pathData="m424.22,657.05 l1580.54,-0.05c0.54,0 0,292 0,292l-1580.54,-0.03c-10.78,0 -19.46,-8.68 -19.46,-19.46l0,-252.99c0,-10.78 8.68,-19.46 19.46,-19.46z"
+          android:strokeAlpha="0.49803922"
+          android:strokeLineJoin="round"
+          android:strokeWidth="4"
+          android:fillColor="#3f3f3f"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero"
+          android:fillAlpha="1"
+          android:strokeLineCap="square"/>
+      <path
+          android:pathData="m728.71,710.91l0,19.89l-88.7,0l0,59.3l77.04,0L717.05,810l-77.04,0l0,65.39l89.84,0l0,19.9L616.56,895.29L616.56,791.16l-52.35,-52.35 -0.77,-0.18c5.41,6.64 9.65,14.32 12.69,23.09 3.72,10.39 5.62,21.92 5.7,34.6L581.84,809.87c-0.08,12.67 -1.98,24.25 -5.7,34.72 -3.63,10.39 -8.95,19.35 -15.97,26.87 -6.93,7.43 -15.46,13.26 -25.6,17.49 -7.54,3.1 -15.86,5.07 -24.97,5.89 -3.04,0.27 -6.16,0.42 -9.37,0.45L457.53,895.29l0,-6.55l-0.37,6.82 53.8,53.45l415.85,0c0.24,0 0.47,-0.02 0.69,-0.05L1132.91,948.97L953.5,769.55l-58.39,-58.39 -0.28,0.06 -58.03,184.06l-20.4,0l-44.66,-141.34zM783.29,711.07 L826.41,857.52 850.08,777.86zM509.6,711.29c1.52,0.15 3.01,0.33 4.49,0.54 -1.47,-0.21 -2.97,-0.39 -4.49,-0.54zM481.35,730.04l0,146.11l18.88,0c9.97,-0.08 18.59,-1.81 25.85,-5.19 7.27,-3.46 13.26,-8.15 17.99,-14.07 4.82,-5.91 8.36,-12.88 10.64,-20.91 2.37,-8.03 3.59,-16.73 3.68,-26.11l0,-13.81c-0.08,-9.38 -1.31,-18.04 -3.68,-25.98 -2.37,-8.03 -5.91,-14.95 -10.64,-20.78 -4.73,-5.91 -10.73,-10.56 -17.99,-13.94 -7.27,-3.38 -15.88,-5.15 -25.85,-5.32zM560.17,734.86c0.65,0.69 1.26,1.4 1.88,2.11 -0.61,-0.72 -1.23,-1.42 -1.88,-2.11z"
+          android:strokeAlpha="1"
+          android:strokeLineJoin="miter"
+          android:strokeWidth="1.94642854"
+          android:fillColor="#000000"
+          android:strokeColor="#00000000"
+          android:fillAlpha="0.18431373"
+          android:strokeLineCap="butt"/>
+      <path
+          android:pathData="m457.53,895.28l0,-184.51l42.7,0q19.26,0.25 34.34,6.59 15.21,6.21 25.6,17.49 10.52,11.15 15.97,26.86 5.58,15.59 5.7,34.59l0,13.56q-0.13,19.01 -5.7,34.72 -5.45,15.59 -15.97,26.86 -10.39,11.15 -25.6,17.49 -15.08,6.21 -34.34,6.34zM481.35,730.04l0,146.11l18.88,0q14.95,-0.13 25.85,-5.2 10.9,-5.2 17.99,-14.07 7.22,-8.87 10.64,-20.91 3.55,-12.04 3.67,-26.1l0,-13.81q-0.13,-14.07 -3.67,-25.98 -3.55,-12.04 -10.64,-20.78 -7.1,-8.87 -17.99,-13.94 -10.9,-5.07 -25.85,-5.32z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M717.05,810L640.01,810l0,65.39l89.84,0l0,19.9l-113.29,0l0,-184.51l112.15,0l0,20.02L640.01,730.8l0,59.31l77.05,0z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="m826.41,857.52 l43.59,-146.74l24.96,0l-58.16,184.51L816.4,895.28l-58.29,-184.51l25.09,0z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+    </group>
+</vector>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..7353dbd1
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..7353dbd1
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..5b688d7c
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..81e723ec
Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..48b13240
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..394b5707
Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..ff8bfa3e
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..365b4d66
Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..96be1ed4
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..463c089b
Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..57c7416f
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..53d6f5bb
Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/debug/res/values/ic_launcher_background.xml b/app/src/debug/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..9646c0b4
--- /dev/null
+++ b/app/src/debug/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#D32F2F</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 643fd292..352b6d2b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
+    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -18,14 +20,13 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -39,14 +40,12 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
+        <activity
+            android:name=".ui.modules.message.send.SendMessageActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/send_message_title"
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
 
-        <service
-            android:name=".services.job.SyncWorker"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
-            </intent-filter>
-        </service>
         <service
             android:name=".services.widgets.TimetableWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -62,6 +61,15 @@
                 android:resource="@xml/provider_widget_timetable" />
         </receiver>
 
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
+            tools:node="remove" />
+
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="${fabric_api_key}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${crashlytics_enabled}" />
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
deleted file mode 100644
index de216d36..00000000
Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 628d6ce6..68fc7c64 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -3,6 +3,8 @@ package io.github.wulkanowy
 import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
+import androidx.work.Configuration
+import androidx.work.WorkManager
 import com.crashlytics.android.Crashlytics
 import com.crashlytics.android.core.CrashlyticsCore
 import com.jakewharton.threetenabp.AndroidThreeTen
@@ -12,8 +14,9 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
 import io.fabric.sdk.android.Fabric
 import io.github.wulkanowy.BuildConfig.DEBUG
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.di.DaggerAppComponent
+import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
 import timber.log.Timber
@@ -24,6 +27,9 @@ class WulkanowyApp : DaggerApplication() {
     @Inject
     lateinit var prefRepository: PreferencesRepository
 
+    @Inject
+    lateinit var workerFactory: SyncWorkerFactory
+
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         MultiDex.install(this)
@@ -35,6 +41,7 @@ class WulkanowyApp : DaggerApplication() {
         initializeFabric()
         if (DEBUG) enableDebugLog()
         AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
+        WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
     }
 
     private fun enableDebugLog() {
diff --git a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
index 5b7b1072..5ef40ce8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
@@ -14,14 +14,20 @@ class ApiHelper @Inject constructor(private val api: Api) {
             symbol = student.symbol
             schoolSymbol = student.schoolSymbol
             studentId = student.studentId
-            useNewStudent = false
             host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
             ssl = student.endpoint.startsWith("https")
             loginType = Api.LoginType.valueOf(student.loginType)
+            useNewStudent = true
         }
     }
 
     fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        initApi(Student(email = email, password = password, symbol = symbol, endpoint = endpoint, loginType = "AUTO"))
+        api.apply {
+            this.email = email
+            this.password = password
+            this.symbol = symbol
+            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
+            ssl = endpoint.startsWith("https")
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index 3c58ea4b..c832368a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -5,11 +5,15 @@ import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
+import com.readystatesoftware.chuck.api.ChuckCollector
+import com.readystatesoftware.chuck.api.ChuckInterceptor
+import com.readystatesoftware.chuck.api.RetentionManager
 import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
 import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
@@ -23,22 +27,32 @@ internal class RepositoryModule {
     @Provides
     fun provideInternetObservingSettings(): InternetObservingSettings {
         return InternetObservingSettings.builder()
-            .strategy(SocketInternetObservingStrategy())
-            .host("www.google.com")
+            .strategy(WalledGardenInternetObservingStrategy())
             .build()
     }
 
     @Singleton
     @Provides
-    fun provideApi(): Api {
+    fun provideApi(chuckCollector: ChuckCollector, context: Context): Api {
         return Api().apply {
             logLevel = NONE
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
             setInterceptor(HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { Timber.d(it) }).setLevel(BASIC))
+
+            // for debug only
+            setInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true, 0)
         }
     }
 
+    @Singleton
+    @Provides
+    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
+        return ChuckCollector(context)
+            .showNotification(prefRepository.isDebugNotificationEnable)
+            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
+    }
+
     @Singleton
     @Provides
     fun provideDatabase(context: Context) = AppDatabase.newInstance(context)
@@ -67,6 +81,10 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
 
+    @Singleton
+    @Provides
+    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
+
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -98,4 +116,20 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSubjectDao(database: AppDatabase) = database.subjectDao
+
+    @Singleton
+    @Provides
+    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
+
+    @Singleton
+    @Provides
+    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
+
+    @Singleton
+    @Provides
+    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+
+    @Singleton
+    @Provides
+    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 30c957b4..4fefd9c9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -8,28 +8,48 @@ import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
 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.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
+import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.dao.MessagesDao
 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.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
 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.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Message
 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.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.migrations.Migration10
+import io.github.wulkanowy.data.db.migrations.Migration11
+import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration3
+import io.github.wulkanowy.data.db.migrations.Migration4
+import io.github.wulkanowy.data.db.migrations.Migration5
+import io.github.wulkanowy.data.db.migrations.Migration6
+import io.github.wulkanowy.data.db.migrations.Migration7
+import io.github.wulkanowy.data.db.migrations.Migration8
+import io.github.wulkanowy.data.db.migrations.Migration9
 import javax.inject.Singleton
 
 @Singleton
@@ -43,21 +63,42 @@ import javax.inject.Singleton
         AttendanceSummary::class,
         Grade::class,
         GradeSummary::class,
+        GradeStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
-        Subject::class
+        Subject::class,
+        LuckyNumber::class,
+        CompletedLesson::class,
+        ReportingUnit::class,
+        Recipient::class
     ],
-    version = 1,
+    version = AppDatabase.VERSION_SCHEMA,
     exportSchema = false
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
+        const val VERSION_SCHEMA = 11
+
         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()
+                )
                 .build()
         }
     }
@@ -78,6 +119,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeSummaryDao: GradeSummaryDao
 
+    abstract val gradeStatistics: GradeStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -85,4 +128,12 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val homeworkDao: HomeworkDao
 
     abstract val subjectDao: SubjectDao
+
+    abstract val luckyNumberDao: LuckyNumberDao
+
+    abstract val completedLessonsDao: CompletedLessonsDao
+
+    abstract val reportingUnitDao: ReportingUnitDao
+
+    abstract val recipientDao: RecipientDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index a550df89..73a04d23 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDate
@@ -36,4 +38,14 @@ class Converters {
 
     @TypeConverter
     fun intToMonth(value: Int?) = value?.let { Month.of(it) }
+
+    @TypeConverter
+    fun intListToGson(list: List<Int>): String {
+        return Gson().toJson(list)
+    }
+
+    @TypeConverter
+    fun gsonToIntList(value: String): List<Int> {
+        return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
index 656b39d4..b3b6f5e3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
@@ -19,14 +19,6 @@ class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPrefere
         return sharedPref.getLong(key, defaultValue)
     }
 
-    fun putBoolean(key: String, value: Boolean) {
-        sharedPref.edit().putBoolean(key, value).apply()
-    }
-
-    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
-        return sharedPref.getBoolean(key, defaultValue)
-    }
-
     fun delete(key: String) {
         sharedPref.edit().remove(key).apply()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
new file mode 100644
index 00000000..6816ceaa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface CompletedLessonsDao {
+
+    @Insert
+    fun insertAll(exams: List<CompletedLesson>)
+
+    @Delete
+    fun deleteAll(exams: List<CompletedLesson>)
+
+    @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index 629f201d..0bd210b0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -16,9 +16,6 @@ interface GradeDao {
     @Insert
     fun insertAll(grades: List<Grade>)
 
-    @Update
-    fun update(grade: Grade)
-
     @Update
     fun updateAll(grade: List<Grade>)
 
@@ -28,6 +25,4 @@ interface GradeDao {
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 
-    @Query("SELECT * FROM Grades WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
-    fun loadAllNew(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
new file mode 100644
index 00000000..338c369f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface GradeStatisticsDao {
+
+    @Insert
+    fun insertAll(gradesStatistics: List<GradeStatistics>)
+
+    @Delete
+    fun deleteAll(gradesStatistics: List<GradeStatistics>)
+
+    @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
+
+    @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
+    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Maybe<List<GradeStatistics>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index 3530118c..3f2e87bd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -18,6 +18,6 @@ interface GradeSummaryDao {
     @Delete
     fun deleteAll(gradesSummary: List<GradeSummary>)
 
-    @Query("SELECT * FROM grades_summary WHERE student_id = :studentId AND semester_id = :semesterId")
+    @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
index 4127460f..253bdb11 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
@@ -19,6 +19,6 @@ interface HomeworkDao {
     @Delete
     fun deleteAll(homework: List<Homework>)
 
-    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date = :date")
-    fun loadAll(semesterId: Int, studentId: Int, date: LocalDate): Maybe<List<Homework>>
+    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
new file mode 100644
index 00000000..afd7905c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
@@ -0,0 +1,29 @@
+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
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface LuckyNumberDao {
+
+    @Insert
+    fun insert(luckyNumber: LuckyNumber)
+
+    @Update
+    fun update(luckyNumber: LuckyNumber)
+
+    @Delete
+    fun delete(luckyNumber: LuckyNumber)
+
+    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
+    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
+
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 5018b690..3ef5d690 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -12,26 +12,20 @@ import io.reactivex.Maybe
 interface MessagesDao {
 
     @Insert
-    fun insertAll(messages: List<Message>): List<Long>
+    fun insertAll(messages: List<Message>)
 
     @Delete
     fun deleteAll(messages: List<Message>)
 
-    @Update
-    fun update(message: Message)
-
     @Update
     fun updateAll(messages: List<Message>)
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
-    fun loadOne(studentId: Int, id: Int): Maybe<Message>
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
+    fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun load(studentId: Int, folder: Int): Maybe<List<Message>>
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
+    fun load(studentId: Int, id: Int): Maybe<Message>
 
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>
-
-    @Query("SELECT * FROM Messages WHERE unread = 1 AND student_id = :studentId")
-    fun loadNewMessages(studentId: Int): Maybe<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
index 2c182860..867e06a2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
@@ -16,18 +16,13 @@ interface NoteDao {
     @Insert
     fun insertAll(notes: List<Note>)
 
-    @Update
-    fun update(note: Note)
-
     @Update
     fun updateAll(notes: List<Note>)
 
     @Delete
     fun deleteAll(notes: List<Note>)
 
-    @Query("SELECT * FROM Notes WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Note>>
+    @Query("SELECT * FROM Notes WHERE student_id = :studentId")
+    fun loadAll(studentId: Int): Maybe<List<Note>>
 
-    @Query("SELECT * FROM Notes WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
-    fun loadNew(semesterId: Int, studentId: Int): Maybe<List<Note>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
new file mode 100644
index 00000000..7c5fd6ca
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -0,0 +1,23 @@
+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
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface RecipientDao {
+
+    @Insert
+    fun insertAll(messages: List<Recipient>)
+
+    @Delete
+    fun deleteAll(messages: List<Recipient>)
+
+    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
+    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
new file mode 100644
index 00000000..1898390a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface ReportingUnitDao {
+
+    @Insert
+    fun insertAll(reportingUnits: List<ReportingUnit>)
+
+    @Delete
+    fun deleteAll(reportingUnits: List<ReportingUnit>)
+
+    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
+    fun load(studentId: Int): Maybe<List<ReportingUnit>>
+
+    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
+    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index 76e29539..c0c054c8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy.FAIL
+import androidx.room.OnConflictStrategy.ABORT
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
@@ -13,7 +13,7 @@ import javax.inject.Singleton
 @Dao
 interface StudentDao {
 
-    @Insert(onConflict = FAIL)
+    @Insert(onConflict = ABORT)
     fun insert(student: Student): Long
 
     @Delete
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index 7588201b..3c58971a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -10,30 +10,30 @@ import java.io.Serializable
 data class Attendance(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
-    var number: Int,
+    val number: Int,
 
-    var subject: String,
+    val subject: String,
 
-    var name: String,
+    val name: String,
 
-    var presence: Boolean = false,
+    val presence: Boolean,
 
-    var absence: Boolean = false,
+    val absence: Boolean,
 
-    var exemption: Boolean = false,
+    val exemption: Boolean,
 
-    var lateness: Boolean = false,
+    val lateness: Boolean,
 
-    var excused: Boolean = false,
+    val excused: Boolean,
 
-    var deleted: Boolean = false
+    val deleted: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
index de2de98f..d2e1f174 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
@@ -10,13 +10,13 @@ import java.io.Serializable
 data class AttendanceSummary(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
     @ColumnInfo(name = "subject_id")
-    var subjectId: Int = 0,
+    val subjectId: Int,
 
     val month: Month,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
new file mode 100644
index 00000000..775f3f55
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDate
+import java.io.Serializable
+
+@Entity(tableName = "CompletedLesson")
+data class CompletedLesson(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
+
+    val date: LocalDate,
+
+    val number: Int,
+
+    val subject: String,
+
+    val topic: String,
+
+    val teacher: String,
+
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String,
+
+    val substitution: String,
+
+    val absence: String,
+
+    val resources: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
index daa886d5..9ae795e7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
@@ -9,29 +9,29 @@ import java.io.Serializable
 @Entity(tableName = "Exams")
 data class Exam(
 
-        @ColumnInfo(name = "student_id")
-        var studentId: Int,
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
 
-        @ColumnInfo(name = "diary_id")
-        var diaryId: Int,
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
 
-        var date: LocalDate,
+    val date: LocalDate,
 
-        @ColumnInfo(name = "entry_date")
-        var entryDate: LocalDate = LocalDate.now(),
+    @ColumnInfo(name = "entry_date")
+    val entryDate: LocalDate,
 
-        var subject: String,
+    val subject: String,
 
-        var group: String,
+    val group: String,
 
-        var type: String,
+    val type: String,
 
-        var description: String,
+    val description: String,
 
-        var teacher: String,
+    val teacher: String,
 
-        @ColumnInfo(name = "teacher_symbol")
-        var teacherSymbol: String
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index d665f9d2..1221a7aa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -10,35 +10,35 @@ import java.io.Serializable
 data class Grade(
 
     @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
+    val semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
-    var subject: String,
+    val subject: String,
 
-    var entry: String,
+    val entry: String,
 
-    var value: Int,
+    val value: Int,
 
-    var modifier: Double,
+    val modifier: Double,
 
-    var comment: String,
+    val comment: String,
 
-    var color: String,
+    val color: String,
 
     @ColumnInfo(name = "grade_symbol")
-    var gradeSymbol: String,
+    val gradeSymbol: String,
 
-    var description: String,
+    val description: String,
 
-    var weight: String,
+    val weight: String,
 
-    var weightValue: Int,
+    val weightValue: Double,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
-    var teacher: String
+    val teacher: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
new file mode 100644
index 00000000..8ad8b8b8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "GradesStatistics")
+data class GradeStatistics(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
+
+    val subject: String,
+
+    val grade: Int,
+
+    val amount: Int,
+
+    @ColumnInfo(name = "is_semester")
+    val semester: Boolean
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index 74d709bb..e6ac4926 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -4,22 +4,21 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "Grades_Summary")
+@Entity(tableName = "GradesSummary")
 data class GradeSummary(
 
-        @ColumnInfo(name = "semester_id")
-        var semesterId: Int,
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
 
-        @ColumnInfo(name = "student_id")
-        var studentId: Int,
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
 
-        var subject: String,
+    val subject: String,
 
-        var predictedGrade: String,
+    val predictedGrade: String,
 
-        var finalGrade: String
+    val finalGrade: String
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
index 705d1d63..a22df096 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
@@ -10,24 +10,24 @@ import java.io.Serializable
 data class Homework(
 
     @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
+    val semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
     @ColumnInfo(name = "entry_date")
-    var entryDate: LocalDate,
+    val entryDate: LocalDate,
 
-    var subject: String,
+    val subject: String,
 
-    var content: String,
+    val content: String,
 
-    var teacher: String,
+    val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    var teacherSymbol: String
+    val teacherSymbol: String
 
 ) : Serializable {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
new file mode 100644
index 00000000..5b9130f5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.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 org.threeten.bp.LocalDate
+import java.io.Serializable
+
+@Entity(tableName = "LuckyNumbers")
+data class LuckyNumber (
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    val date: LocalDate,
+
+    @ColumnInfo(name = "lucky_number")
+    val luckyNumber: Int
+
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 320e9322..48b4fd02 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -10,40 +10,39 @@ import java.io.Serializable
 data class Message(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int? = null,
+    val studentId: Int,
 
     @ColumnInfo(name = "real_id")
-    val realId: Int? = null,
+    val realId: Int,
 
     @ColumnInfo(name = "message_id")
-    val messageId: Int? = null,
+    val messageId: Int,
 
     @ColumnInfo(name = "sender_name")
-    val sender: String? = null,
+    val sender: String,
 
     @ColumnInfo(name = "sender_id")
-    val senderId: Int? = null,
-
-    @ColumnInfo(name = "recipient_id")
-    val recipientId: Int? = null,
+    val senderId: Int,
 
     @ColumnInfo(name = "recipient_name")
-    val recipient: String? = "",
+    val recipient: String,
 
-    val subject: String = "",
+    val subject: String,
 
-    val date: LocalDateTime? = null,
+    val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
-    val folderId: Int = 0,
+    val folderId: Int,
 
-    var unread: Boolean? = false,
+    var unread: Boolean,
 
-    val unreadBy: Int? = 0,
+    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int,
 
-    val readBy: Int? = 0,
+    @ColumnInfo(name = "read_by")
+    val readBy: Int,
 
-    val removed: Boolean = false
+    val removed: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
index 1f61f087..5f3a92ab 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
@@ -9,26 +9,23 @@ import java.io.Serializable
 @Entity(tableName = "Notes")
 data class Note(
 
-    @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
-
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
-    var date: LocalDate,
+    val date: LocalDate,
 
-    var teacher: String,
+    val teacher: String,
 
-    var category: String,
+    val category: String,
 
-    var content: String
+    val content: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
     @ColumnInfo(name = "is_read")
-    var isRead: Boolean = false
+    var isRead: Boolean = true
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
new file mode 100644
index 00000000..3021da72
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
@@ -0,0 +1,38 @@
+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 = "Recipients")
+data class Recipient(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "real_id")
+    val realId: String,
+
+    val name: String,
+
+    @ColumnInfo(name = "real_name")
+    val realName: String,
+
+    @ColumnInfo(name = "login_id")
+    val loginId: Int,
+
+    @ColumnInfo(name = "unit_id")
+    val unitId: Int,
+
+    val role: Int,
+
+    val hash: String
+
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    override fun toString() = name
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
new file mode 100644
index 00000000..601d8aac
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "ReportingUnits")
+data class ReportingUnit(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "real_id")
+    val realId: Int,
+
+    @ColumnInfo(name = "short")
+    val shortName: String,
+
+    @ColumnInfo(name = "sender_id")
+    val senderId: Int,
+
+    @ColumnInfo(name = "sender_name")
+    val senderName: String,
+
+    val roles: List<Int>
+
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 509a692e..0f44fa2d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -8,24 +8,31 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
 
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0,
-
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
     @ColumnInfo(name = "diary_name")
-    var diaryName: String,
+    val diaryName: String,
 
     @ColumnInfo(name = "semester_id")
-    var semesterId: Int,
+    val semesterId: Int,
 
     @ColumnInfo(name = "semester_name")
-    var semesterName: Int,
+    val semesterName: Int,
 
     @ColumnInfo(name = "is_current")
-    var isCurrent: Boolean = false
-)
+    val isCurrent: Boolean,
+
+    @ColumnInfo(name = "class_id")
+    val classId: Int,
+
+    @ColumnInfo(name = "unit_id")
+    val unitId: Int
+) {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index 1fe4cf8d..261b35fb 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -4,35 +4,41 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
+import java.io.Serializable
 
 @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
 data class Student(
 
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0,
+    val endpoint: String,
 
-    var endpoint: String,
+    val loginType: String,
 
-    var loginType: String,
-
-    var email: String,
+    val email: String,
 
     var password: String,
 
-    var symbol: String = "",
+    val symbol: String,
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int = 0,
+    val studentId: Int,
 
     @ColumnInfo(name = "student_name")
-    var studentName: String = "",
+    val studentName: String,
 
     @ColumnInfo(name = "school_id")
-    var schoolSymbol: String = "",
+    val schoolSymbol: String,
 
     @ColumnInfo(name = "school_name")
-    var schoolName: String = "",
+    val schoolName: String,
 
     @ColumnInfo(name = "is_current")
-    var isCurrent: Boolean = false
-)
+    val isCurrent: Boolean,
+
+    @ColumnInfo(name = "registration_date")
+    val registrationDate: LocalDateTime
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt
index 45306be3..dbaa6f4e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Subject.kt
@@ -9,15 +9,15 @@ import java.io.Serializable
 data class Subject(
 
     @ColumnInfo(name = "student_id")
-    var studentId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    var diaryId: Int,
+    val diaryId: Int,
 
     @ColumnInfo(name = "real_id")
-    var realId: Int,
+    val realId: Int,
 
-    var name: String
+    val name: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index 2aa1eafa..9bc3d214 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -10,33 +10,39 @@ import java.io.Serializable
 @Entity(tableName = "Timetable")
 data class Timetable(
 
-        @ColumnInfo(name = "student_id")
-        var studentId: Int,
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
 
-        @ColumnInfo(name = "diary_id")
-        var diaryId: Int,
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
 
-        val number: Int = 0,
+    val number: Int,
 
-        val start: LocalDateTime = LocalDateTime.now(),
+    val start: LocalDateTime,
 
-        val end: LocalDateTime = LocalDateTime.now(),
+    val end: LocalDateTime,
 
-        val date: LocalDate,
+    val date: LocalDate,
 
-        val subject: String,
+    val subject: String,
 
-        val group: String,
+    val subjectOld: String,
 
-        val room: String,
+    val group: String,
 
-        val teacher: String,
+    val room: String,
 
-        val info: String,
+    val roomOld: String,
 
-        val changes: Boolean = false,
+    val teacher: String,
 
-        val canceled: Boolean = false
+    val teacherOld: String,
+
+    val info: String,
+
+    val changes: Boolean,
+
+    val canceled: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt
new file mode 100644
index 00000000..c26a02d1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration10.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration10 : Migration(9, 10) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Grades_Summary RENAME TO GradesSummary")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
new file mode 100644
index 00000000..cb437c0e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration11.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration11 : Migration(10, 11) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Grades_temp (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                is_read INTEGER NOT NULL,
+                is_notified INTEGER NOT NULL,
+                semester_id INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                entry TEXT NOT NULL,
+                value INTEGER NOT NULL,
+                modifier REAL NOT NULL,
+                comment TEXT NOT NULL,
+                color TEXT NOT NULL,
+                grade_symbol TEXT NOT NULL,
+                description TEXT NOT NULL,
+                weight TEXT NOT NULL,
+                weightValue REAL NOT NULL,
+                date INTEGER NOT NULL,
+                teacher TEXT NOT NULL
+            )
+        """)
+        database.execSQL("INSERT INTO Grades_temp SELECT * FROM Grades")
+        database.execSQL("DROP TABLE Grades")
+        database.execSQL("ALTER TABLE Grades_temp RENAME TO Grades")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt
new file mode 100644
index 00000000..c5a30991
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration2.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration2 : Migration(1, 2) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS LuckyNumbers (
+                id INTEGER PRIMARY KEY NOT NULL,
+                is_notified INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                date INTEGER NOT NULL,
+                lucky_number INTEGER NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt
new file mode 100644
index 00000000..d9699c0f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration3.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration3 : Migration(2, 3) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS CompletedLesson (
+                id INTEGER PRIMARY KEY NOT NULL,
+                student_id INTEGER NOT NULL,
+                diary_id INTEGER NOT NULL,
+                date INTEGER NOT NULL,
+                number INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                topic TEXT NOT NULL,
+                teacher TEXT NOT NULL,
+                teacher_symbol TEXT NOT NULL,
+                substitution TEXT NOT NULL,
+                absence TEXT NOT NULL,
+                resources TEXT NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt
new file mode 100644
index 00000000..0ae89bdd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration4.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration4 : Migration(3, 4) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Messages (
+                id INTEGER PRIMARY KEY NOT NULL,
+                is_notified INTEGER NOT NULL,
+                content TEXT,
+                student_id INTEGER NOT NULL,
+                real_id INTEGER NOT NULL,
+                message_id INTEGER NOT NULL,
+                sender_name TEXT NOT NULL,
+                sender_id INTEGER NOT NULL,
+                recipient_id INTEGER NOT NULL,
+                recipient_name TEXT NOT NULL,
+                subject TEXT NOT NULL,
+                date INTEGER NOT NULL,
+                folder_id INTEGER NOT NULL,
+                unread INTEGER NOT NULL,
+                unreadBy INTEGER NOT NULL,
+                readBy INTEGER NOT NULL,
+                removed INTEGER NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
new file mode 100644
index 00000000..fe0dec48
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import org.threeten.bp.LocalDateTime.now
+import org.threeten.bp.ZoneOffset
+
+class Migration5 : Migration(4, 5) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN registration_date INTEGER DEFAULT 0 NOT NULL")
+        database.execSQL("UPDATE Students SET registration_date = '${now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli()}'")
+        database.execSQL("DROP TABLE IF EXISTS Notes")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Notes (
+                id INTEGER PRIMARY KEY NOT NULL,
+                is_read INTEGER NOT NULL,
+                is_notified INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                date INTEGER NOT NULL,
+                teacher TEXT NOT NULL,
+                category TEXT NOT NULL,
+                content TEXT NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt
new file mode 100644
index 00000000..fa943618
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration6.kt
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration6 : Migration(5, 6) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS ReportingUnits (
+                id INTEGER PRIMARY KEY NOT NULL,
+                student_id INTEGER NOT NULL,
+                real_id INTEGER NOT NULL,
+                short TEXT NOT NULL,
+                sender_id INTEGER NOT NULL,
+                sender_name TEXT NOT NULL,
+                roles TEXT NOT NULL)
+                """)
+
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Recipients (
+                id INTEGER PRIMARY KEY NOT NULL,
+                student_id INTEGER NOT NULL,
+                real_id TEXT NOT NULL,
+                name TEXT NOT NULL,
+                real_name TEXT NOT NULL,
+                login_id INTEGER NOT NULL,
+                unit_id INTEGER NOT NULL,
+                role INTEGER NOT NULL,
+                hash TEXT NOT NULL)
+                """)
+
+        database.execSQL("DELETE FROM Semesters WHERE 1")
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
+        database.execSQL("ALTER TABLE Semesters ADD COLUMN unit_id INTEGER DEFAULT 0 NOT NULL")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt
new file mode 100644
index 00000000..120716c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration7.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration7 : Migration(6, 7) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS GradesStatistics (
+                id INTEGER PRIMARY KEY NOT NULL,
+                student_id INTEGER NOT NULL,
+                semester_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                grade INTEGER NOT NULL,
+                amount INTEGER NOT NULL,
+                is_semester INTEGER NOT NULL)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt
new file mode 100644
index 00000000..7009ee12
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration8.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration8 : Migration(7, 8) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Timetable ADD COLUMN subjectOld TEXT DEFAULT \"\" NOT NULL")
+        database.execSQL("ALTER TABLE Timetable ADD COLUMN roomOld TEXT DEFAULT \"\" NOT NULL")
+        database.execSQL("ALTER TABLE Timetable ADD COLUMN teacherOld TEXT DEFAULT \"\" NOT NULL")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt
new file mode 100644
index 00000000..d79a5706
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration9.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration9 : Migration(8, 9) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Messages (
+                id INTEGER PRIMARY KEY NOT NULL,
+                student_id INTEGER NOT NULL,
+                real_id INTEGER NOT NULL,
+                message_id INTEGER NOT NULL,
+                sender_name TEXT NOT NULL,
+                sender_id INTEGER NOT NULL,
+                recipient_name TEXT NOT NULL,
+                subject TEXT NOT NULL,
+                date INTEGER NOT NULL,
+                folder_id INTEGER NOT NULL,
+                unread INTEGER NOT NULL,
+                unread_by INTEGER NOT NULL,
+                read_by INTEGER NOT NULL,
+                removed INTEGER NOT NULL,
+                is_notified INTEGER NOT NULL,
+                content TEXT)
+            """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
deleted file mode 100644
index a2a477b5..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.HomeworkLocal
-import io.github.wulkanowy.data.repositories.remote.HomeworkRemote
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeworkRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: HomeworkLocal,
-    private val remote: HomeworkRemote
-) {
-
-    fun getHomework(semester: Semester, date: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
-        return local.getHomework(semester, date).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getHomework(semester, date)
-                    else Single.error(UnknownHostException())
-                }.flatMap { newGrades ->
-                    local.getHomework(semester, date).toSingle(emptyList())
-                        .doOnSuccess { oldGrades ->
-                            local.deleteHomework(oldGrades - newGrades)
-                            local.saveHomework(newGrades - oldGrades)
-                        }
-                }.flatMap { local.getHomework(semester, date).toSingle(emptyList()) })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt
deleted file mode 100644
index 06a0f6f9..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.local.MessagesLocal
-import io.github.wulkanowy.data.repositories.remote.MessagesRemote
-import io.reactivex.Completable
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessagesRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: MessagesLocal,
-    private val remote: MessagesRemote
-) {
-
-    enum class MessageFolder(val id: Int = 1) {
-        RECEIVED(1),
-        SENT(2),
-        TRASHED(3)
-    }
-
-    fun getMessages(studentId: Int, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return local.getMessages(studentId, folder).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getMessages(studentId, folder)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getMessages(studentId, folder).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteMessages(old - new)
-                            local.saveMessages((new - old)
-                                .onEach {
-                                    it.isNotified = !notify
-                                })
-                        }
-                }.flatMap { local.getMessages(studentId, folder).toSingle(emptyList()) }
-            )
-    }
-
-    fun getMessage(studentId: Int, messageId: Int, markAsRead: Boolean = false): Single<Message> {
-        return local.getMessage(studentId, messageId)
-            .filter { !it.content.isNullOrEmpty() }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) local.getMessage(studentId, messageId).toSingle()
-                    else Single.error(UnknownHostException())
-                }
-                .flatMap { dbMessage ->
-                    remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
-                        local.updateMessage(dbMessage.copy(unread = false).apply {
-                            id = dbMessage.id
-                            content = it
-                        })
-                    }
-                }.flatMap {
-                    local.getMessage(studentId, messageId).toSingle()
-                }
-            )
-    }
-
-    fun getNewMessages(student: Student): Single<List<Message>> {
-        return local.getNewMessages(student).toSingle(emptyList())
-    }
-
-    fun updateMessage(message: Message): Completable {
-        return Completable.fromCallable { local.updateMessage(message) }
-    }
-
-    fun updateMessages(messages: List<Message>): Completable {
-        return Completable.fromCallable { local.updateMessages(messages) }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
deleted file mode 100644
index 6cc6a043..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.Timetable
-import io.github.wulkanowy.data.repositories.local.TimetableLocal
-import io.github.wulkanowy.data.repositories.remote.TimetableRemote
-import io.github.wulkanowy.utils.friday
-import io.github.wulkanowy.utils.monday
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TimetableRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: TimetableLocal,
-    private val remote: TimetableRemote
-) {
-
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false)
-        : Single<List<Timetable>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getTimetable(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getTimetable(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { newTimetable ->
-                            local.getTimetable(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { oldTimetable ->
-                                    local.deleteTimetable(oldTimetable - newTimetable)
-                                    local.saveTimetable(newTimetable - oldTimetable)
-                                }
-                        }.flatMap {
-                            local.getTimetable(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
index 9a318dba..0f587376 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.entities.Attendance
@@ -6,14 +6,11 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
-                .filter { !it.isEmpty() }
-    }
-
     fun saveAttendance(attendance: List<Attendance>) {
         attendanceDb.insertAll(attendance)
     }
@@ -21,4 +18,8 @@ class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDa
     fun deleteAttendance(attendance: List<Attendance>) {
         attendanceDb.deleteAll(attendance)
     }
+
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index 79047606..b3544c3f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Attendance
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index eb7230ae..f6eb07da 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -1,11 +1,9 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.attendance
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.AttendanceLocal
-import io.github.wulkanowy.data.repositories.remote.AttendanceRemote
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Single
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
index 2bb9f122..2e9a1006 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
@@ -1,17 +1,15 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { !it.isEmpty() }
-    }
-
     fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.insertAll(attendance)
     }
@@ -19,4 +17,8 @@ class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: Atten
     fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.deleteAll(attendance)
     }
+
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index 079eb4b8..d38dd3a4 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index 8e21b12c..90d39aab 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -1,11 +1,9 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.attendancesummary
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.AttendanceSummaryLocal
-import io.github.wulkanowy.data.repositories.remote.AttendanceSummaryRemote
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -18,7 +16,7 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>>? {
+    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
         return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
new file mode 100644
index 00000000..9b275908
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
+
+    fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
+        completedLessonsDb.insertAll(completedLessons)
+    }
+
+    fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
+        completedLessonsDb.deleteAll(completedLessons)
+    }
+
+    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>> {
+        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end).filter { it.isNotEmpty() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
new file mode 100644
index 00000000..58dd5a9d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.toLocalDate
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsRemote @Inject constructor(private val api: Api) {
+
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { it.getCompletedLessons(startDate, endDate) }
+            .map { lessons ->
+                lessons.map {
+                    it.absence
+                    CompletedLesson(
+                        studentId = semester.studentId,
+                        diaryId = semester.diaryId,
+                        date = it.date.toLocalDate(),
+                        number = it.number,
+                        subject = it.subject,
+                        topic = it.topic,
+                        teacher = it.teacher,
+                        teacherSymbol = it.teacherSymbol,
+                        substitution = it.substitution,
+                        absence = it.absence,
+                        resources = it.resources
+                    )
+                }
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
new file mode 100644
index 00000000..5b594107
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: CompletedLessonsLocal,
+    private val remote: CompletedLessonsRemote
+) {
+
+    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return Single.fromCallable { startDate.monday to endDate.friday }
+            .flatMap { dates ->
+                local.getCompletedLessons(semester, dates.first, dates.second).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getCompletedLessons(semester, dates.first, dates.second)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getCompletedLessons(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteCompleteLessons(old - new)
+                                    local.saveCompletedLessons(new - old)
+                                }
+                        }.flatMap {
+                            local.getCompletedLessons(semester, dates.first, dates.second)
+                                .toSingle(emptyList())
+                        }).map { list -> list.filter { it.date in startDate..endDate } }
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
index 3e32a635..0f484d32 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.entities.Exam
@@ -6,7 +6,9 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ExamLocal @Inject constructor(private val examDb: ExamDao) {
 
     fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Exam>> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index 3937b768..f6d653a6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Exam
@@ -7,7 +7,9 @@ import io.github.wulkanowy.utils.toLocalDate
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ExamRemote @Inject constructor(private val api: Api) {
 
     fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index cb78df53..a0cb5ba1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -1,11 +1,9 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.exam
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.ExamLocal
-import io.github.wulkanowy.data.repositories.remote.ExamRemote
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
 import io.reactivex.Single
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
similarity index 55%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index d6d46340..4983a474 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -1,9 +1,8 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Completable
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -11,27 +10,19 @@ import javax.inject.Singleton
 @Singleton
 class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
 
-    fun getGrades(semester: Semester): Maybe<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { !it.isEmpty() }
-    }
-
-    fun getNewGrades(semester: Semester): Maybe<List<Grade>> {
-        return gradeDb.loadAllNew(semester.semesterId, semester.studentId)
-    }
-
     fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
     }
 
-    fun updateGrade(grade: Grade): Completable {
-        return Completable.fromCallable { gradeDb.update(grade) }
-    }
-
-    fun updateGrades(grades: List<Grade>): Completable {
-        return Completable.fromCallable { gradeDb.updateAll(grades) }
-    }
-
     fun deleteGrades(grades: List<Grade>) {
         gradeDb.deleteAll(grades)
     }
+
+    fun updateGrades(grades: List<Grade>) {
+        gradeDb.updateAll(grades)
+    }
+
+    fun getGrades(semester: Semester): Maybe<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
similarity index 87%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index df3bf4d2..570ab7a7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Grade
@@ -25,8 +25,8 @@ class GradeRemote @Inject constructor(private val api: Api) {
                         modifier = it.modifier,
                         comment = it.comment,
                         color = it.color,
-                        gradeSymbol = it.symbol ?: "",
-                        description = it.description,
+                        gradeSymbol = it.symbol.orEmpty(),
+                        description = it.description.orEmpty(),
                         weight = it.weight,
                         weightValue = it.weightValue,
                         date = it.date.toLocalDate(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
similarity index 56%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index 42266955..3dd456bf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -1,11 +1,10 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.grade
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.GradeLocal
-import io.github.wulkanowy.data.repositories.remote.GradeRemote
+import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Completable
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -19,7 +18,7 @@ class GradeRepository @Inject constructor(
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
         return local.getGrades(semester).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
@@ -28,25 +27,33 @@ class GradeRepository @Inject constructor(
                 }.flatMap { newGrades ->
                     local.getGrades(semester).toSingle(emptyList())
                         .doOnSuccess { oldGrades ->
+                            val notifyBreakDate = oldGrades.maxBy { it.date }?.date
+                                ?: student.registrationDate.toLocalDate()
                             local.deleteGrades(oldGrades - newGrades)
                             local.saveGrades((newGrades - oldGrades)
                                 .onEach {
-                                    if (oldGrades.isNotEmpty()) it.isRead = false
-                                    if (notify) it.isNotified = false
+                                    if (it.date >= notifyBreakDate) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
                                 })
                         }
                 }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
     }
 
-    fun getNewGrades(semester: Semester): Single<List<Grade>> {
-        return local.getNewGrades(semester).toSingle(emptyList())
+    fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+    }
+
+    fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
     }
 
     fun updateGrade(grade: Grade): Completable {
-        return local.updateGrade(grade)
+        return Completable.fromCallable { local.updateGrades(listOf(grade)) }
     }
 
     fun updateGrades(grades: List<Grade>): Completable {
-        return local.updateGrades(grades)
+        return Completable.fromCallable { local.updateGrades(grades) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
similarity index 87%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
index 6a72416d..e74641d3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.gradessummary
 
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.GradeSummary
@@ -10,11 +10,6 @@ import javax.inject.Singleton
 @Singleton
 class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
 
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
-                .filter { !it.isEmpty() }
-    }
-
     fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
         gradeSummaryDb.insertAll(gradesSummary)
     }
@@ -22,4 +17,8 @@ class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSum
     fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
         gradeSummaryDb.deleteAll(gradesSummary)
     }
+
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
similarity index 94%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
index af45ca73..d395decf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.gradessummary
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.GradeSummary
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
similarity index 88%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
index a59a2cd5..b19e07f0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
@@ -1,11 +1,9 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.gradessummary
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.GradeSummaryLocal
-import io.github.wulkanowy.data.repositories.remote.GradeSummaryRemote
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
new file mode 100644
index 00000000..581ac2f8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
+
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+            .filter { !it.isEmpty() }
+    }
+
+    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)
+            }
+        }
+        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
+    }
+
+    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+        gradeStatisticsDb.insertAll(gradesStatistics)
+    }
+
+    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+        gradeStatisticsDb.deleteAll(gradesStatistics)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
new file mode 100644
index 00000000..fa3b951f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+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) }
+            .map { gradeStatistics ->
+                gradeStatistics.map {
+                    GradeStatistics(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        subject = it.subject,
+                        grade = it.gradeValue,
+                        amount = it.amount ?: 0,
+                        semester = isSemester
+                    )
+                }
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
new file mode 100644
index 00000000..870bd1e9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -0,0 +1,33 @@
+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.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: GradeStatisticsLocal,
+    private val remote: GradeStatisticsRemote
+) {
+
+    fun getGradesStatistics(semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatistics>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradeStatistics(semester, isSemester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { newGradesStats ->
+                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
+                        .doOnSuccess { oldGradesStats ->
+                            local.deleteGradesStatistics(oldGradesStats - newGradesStats)
+                            local.saveGradesStatistics(newGradesStats - oldGradesStats)
+                        }
+                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
similarity index 73%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index ea18d814..671ecafd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.entities.Homework
@@ -11,10 +11,6 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
 
-    fun getHomework(semester: Semester, date: LocalDate): Maybe<List<Homework>> {
-        return homeworkDb.loadAll(semester.semesterId, semester.studentId, date).filter { !it.isEmpty() }
-    }
-
     fun saveHomework(homework: List<Homework>) {
         homeworkDb.insertAll(homework)
     }
@@ -22,4 +18,9 @@ class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
     fun deleteHomework(homework: List<Homework>) {
         homeworkDb.deleteAll(homework)
     }
+
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
+        return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
+            .filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 0fdc0251..681b6646 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Homework
@@ -12,9 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class HomeworkRemote @Inject constructor(private val api: Api) {
 
-    fun getHomework(semester: Semester, date: LocalDate): Single<List<Homework>> {
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
         return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getHomework(date, date) }
+            .flatMap { it.getHomework(startDate, endDate) }
             .map { homework ->
                 homework.map {
                     Homework(
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
new file mode 100644
index 00000000..0447c86f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.data.repositories.homework
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeworkRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: HomeworkLocal,
+    private val remote: HomeworkRemote
+) {
+
+    fun getHomework(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
+            local.getHomework(semester, monday, friday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                    .flatMap {
+                        if (it) remote.getHomework(semester, monday, friday)
+                        else Single.error(UnknownHostException())
+                    }.flatMap { newGrades ->
+                        local.getHomework(semester, monday, friday).toSingle(emptyList())
+                            .doOnSuccess { oldGrades ->
+                                local.deleteHomework(oldGrades - newGrades)
+                                local.saveHomework(newGrades - oldGrades)
+                            }
+                    }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt
deleted file mode 100644
index 531cd8b0..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.github.wulkanowy.data.repositories.local
-
-import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessagesLocal @Inject constructor(private val messagesDb: MessagesDao) {
-
-    fun getMessage(studentId: Int, id: Int): Maybe<Message> {
-        return messagesDb.loadOne(studentId, id)
-    }
-
-    fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Maybe<List<Message>> {
-        return when (folder) {
-            MessagesRepository.MessageFolder.TRASHED -> messagesDb.loadDeleted(studentId)
-            else -> messagesDb.load(studentId, folder.id)
-        }.filter { !it.isEmpty() }
-    }
-
-    fun getNewMessages(student: Student): Maybe<List<Message>> {
-        return messagesDb.loadNewMessages(student.studentId)
-    }
-
-    fun saveMessages(messages: List<Message>): List<Long> {
-        return messagesDb.insertAll(messages)
-    }
-
-    fun updateMessage(message: Message) {
-        return messagesDb.update(message)
-    }
-
-    fun updateMessages(messages: List<Message>) {
-        return messagesDb.updateAll(messages)
-    }
-
-    fun deleteMessages(messages: List<Message>) {
-        messagesDb.deleteAll(messages)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt
deleted file mode 100644
index 543eab9b..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.github.wulkanowy.data.repositories.local
-
-import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Completable
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
-
-    fun getNotes(semester: Semester): Maybe<List<Note>> {
-        return noteDb.loadAll(semester.semesterId, semester.studentId).filter { !it.isEmpty() }
-    }
-
-    fun getNewNotes(semester: Semester): Maybe<List<Note>> {
-        return noteDb.loadNew(semester.semesterId, semester.studentId)
-    }
-
-    fun saveNotes(notes: List<Note>) {
-        noteDb.insertAll(notes)
-    }
-
-    fun updateNote(note: Note): Completable {
-        return Completable.fromCallable { noteDb.update(note) }
-    }
-
-    fun updateNotes(notes: List<Note>): Completable {
-        return Completable.fromCallable { noteDb.updateAll(notes) }
-    }
-
-    fun deleteNotes(notes: List<Note>) {
-        noteDb.deleteAll(notes)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
new file mode 100644
index 00000000..115c8965
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
+
+    fun saveLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.insert(luckyNumber)
+    }
+
+    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.update(luckyNumber)
+    }
+
+    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.delete(luckyNumber)
+    }
+
+    fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
+        return luckyNumberDb.load(semester.studentId, date)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
new file mode 100644
index 00000000..1b0f12b3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Maybe
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberRemote @Inject constructor(private val api: Api) {
+
+    fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMapMaybe { it.getLuckyNumber() }
+            .map {
+                LuckyNumber(
+                    studentId = semester.studentId,
+                    date = LocalDate.now(),
+                    luckyNumber = it
+                )
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
new file mode 100644
index 00000000..4036521f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: LuckyNumberLocal,
+    private val remote: LuckyNumberRemote
+) {
+
+    fun getLuckyNumber(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMapMaybe {
+                    if (it) remote.getLuckyNumber(semester)
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getLuckyNumber(semester, LocalDate.now())
+                        .doOnSuccess { old ->
+                            if (new != old) {
+                                local.deleteLuckyNumber(old)
+                                local.saveLuckyNumber(new.apply {
+                                    if (notify) isNotified = false
+                                })
+                            }
+                        }
+                        .doOnComplete {
+                            local.saveLuckyNumber(new.apply {
+                                if (notify) isNotified = false
+                            })
+                        }
+                }.flatMap({ local.getLuckyNumber(semester, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(semester, LocalDate.now()) })
+            )
+    }
+
+    fun getNotNotifiedLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(semester, LocalDate.now()).filter { !it.isNotified }
+    }
+
+    fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
+        return Completable.fromCallable { local.updateLuckyNumber(luckyNumber) }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
new file mode 100644
index 00000000..06f5a1e0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.data.repositories.message
+
+enum class MessageFolder(val id: Int = 1) {
+    RECEIVED(1),
+    SENT(2),
+    TRASHED(3)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
new file mode 100644
index 00000000..e9ab7297
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.data.repositories.message
+
+import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
+
+    fun saveMessages(messages: List<Message>) {
+        messagesDb.insertAll(messages)
+    }
+
+    fun updateMessages(messages: List<Message>) {
+        messagesDb.updateAll(messages)
+    }
+
+    fun deleteMessages(messages: List<Message>) {
+        messagesDb.deleteAll(messages)
+    }
+
+    fun getMessage(student: Student, id: Int): Maybe<Message> {
+        return messagesDb.load(student.studentId, id)
+    }
+
+    fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
+        return when (folder) {
+            TRASHED -> messagesDb.loadDeleted(student.studentId)
+            else -> messagesDb.loadAll(student.studentId, folder.id)
+        }.filter { it.isNotEmpty() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
new file mode 100644
index 00000000..3fb01d30
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.data.repositories.message
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.messages.Folder
+import io.github.wulkanowy.api.messages.SentMessage
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.utils.toLocalDateTime
+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
+class MessageRemote @Inject constructor(private val api: Api) {
+
+    fun getMessages(studentId: Int, folder: MessageFolder): Single<List<Message>> {
+        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
+            messages.map {
+                Message(
+                    studentId = studentId,
+                    realId = it.id ?: 0,
+                    messageId = it.messageId ?: 0,
+                    sender = it.sender.orEmpty(),
+                    senderId = it.senderId ?: 0,
+                    recipient = it.recipient.orEmpty(),
+                    subject = it.subject.trim(),
+                    date = it.date?.toLocalDateTime() ?: now(),
+                    folderId = it.folderId,
+                    unread = it.unread ?: false,
+                    unreadBy = it.unreadBy ?: 0,
+                    readBy = it.readBy ?: 0,
+                    removed = it.removed
+                )
+            }
+        }
+    }
+
+    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
+        return api.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
+    }
+
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return api.sendMessage(
+            subject = subject,
+            content = content,
+            recipients = recipients.map {
+                ApiRecipient(
+                    id = it.realId,
+                    name = it.realName,
+                    loginId = it.loginId,
+                    reportingUnitId = it.unitId,
+                    role = it.role,
+                    hash = it.hash
+                )
+            }
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
new file mode 100644
index 00000000..d319689e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -0,0 +1,92 @@
+package io.github.wulkanowy.data.repositories.message
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.api.messages.SentMessage
+import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: MessageLocal,
+    private val remote: MessageRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    fun getMessages(student: Student, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getMessages(student, folder).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getMessages(student.studentId, folder)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getMessages(student, folder).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteMessages(old - new)
+                                    local.saveMessages((new - old)
+                                        .onEach {
+                                            it.isNotified = !notify
+                                        })
+                                }
+                        }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
+                    )
+            }
+    }
+
+    fun getMessage(student: Student, messageId: Int, markAsRead: Boolean = false): Single<Message> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getMessage(student, messageId)
+                    .filter { !it.content.isNullOrEmpty() }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) local.getMessage(student, messageId).toSingle()
+                            else Single.error(UnknownHostException())
+                        }
+                        .flatMap { dbMessage ->
+                            remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
+                                local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
+                                    id = dbMessage.id
+                                    content = it
+                                }))
+                            }
+                        }.flatMap {
+                            local.getMessage(student, messageId).toSingle()
+                        }
+                    )
+            }
+    }
+
+    fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
+        return local.getMessages(student, RECEIVED)
+            .map { it.filter { message -> !message.isNotified && message.unread } }
+            .toSingle(emptyList())
+    }
+
+    fun updateMessage(message: Message): Completable {
+        return Completable.fromCallable { local.updateMessages(listOf(message)) }
+    }
+
+    fun updateMessages(messages: List<Message>): Completable {
+        return Completable.fromCallable { local.updateMessages(messages) }
+    }
+
+    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.sendMessage(subject, content, recipients)
+                else Single.error(UnknownHostException())
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
new file mode 100644
index 00000000..784e61f0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.data.repositories.note
+
+import io.github.wulkanowy.data.db.dao.NoteDao
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
+
+    fun saveNotes(notes: List<Note>) {
+        noteDb.insertAll(notes)
+    }
+
+    fun updateNotes(notes: List<Note>) {
+        noteDb.updateAll(notes)
+    }
+
+    fun deleteNotes(notes: List<Note>) {
+        noteDb.deleteAll(notes)
+    }
+
+    fun getNotes(student: Student): Maybe<List<Note>> {
+        return noteDb.loadAll(student.studentId).filter { it.isNotEmpty() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
similarity index 89%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index 31f28e11..aebc6230 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.note
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Note
@@ -17,7 +17,6 @@ class NoteRemote @Inject constructor(private val api: Api) {
             .map { notes ->
                 notes.map {
                     Note(
-                        semesterId = semester.semesterId,
                         studentId = semester.studentId,
                         date = it.date.toLocalDate(),
                         teacher = it.teacher,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
similarity index 54%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index 2836894f..d74bc7ea 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -1,11 +1,10 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.note
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.local.NoteLocal
-import io.github.wulkanowy.data.repositories.remote.NoteRemote
+import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Completable
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -19,34 +18,36 @@ class NoteRepository @Inject constructor(
     private val remote: NoteRemote
 ) {
 
-    fun getNotes(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
-        return local.getNotes(semester).filter { !forceRefresh }
+    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
+        return local.getNotes(student).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
                     if (it) remote.getNotes(semester)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
-                    local.getNotes(semester).toSingle(emptyList())
+                    local.getNotes(student).toSingle(emptyList())
                         .doOnSuccess { old ->
                             local.deleteNotes(old - new)
                             local.saveNotes((new - old)
                                 .onEach {
-                                    if (notify) it.isNotified = false
+                                    if (it.date >= student.registrationDate.toLocalDate()) it.apply {
+                                        isRead = false
+                                        if (notify) isNotified = false
+                                    }
                                 })
                         }
-                }.flatMap { local.getNotes(semester).toSingle(emptyList()) }
-            )
+                }.flatMap { local.getNotes(student).toSingle(emptyList()) })
     }
 
-    fun getNewNotes(semester: Semester): Single<List<Note>> {
-        return local.getNewNotes(semester).toSingle(emptyList())
+    fun getNotNotifiedNotes(student: Student): Single<List<Note>> {
+        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }.toSingle(emptyList())
     }
 
     fun updateNote(note: Note): Completable {
-        return local.updateNote(note)
+        return Completable.fromCallable { local.updateNotes(listOf(note)) }
     }
 
     fun updateNotes(notes: List<Note>): Completable {
-        return local.updateNotes(notes)
+        return Completable.fromCallable { local.updateNotes(notes) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
similarity index 64%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index 205baa3a..d51fc495 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -12,7 +12,7 @@ class PreferencesRepository @Inject constructor(
     val context: Context
 ) {
     val startMenuIndex: Int
-        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toInt() ?: 0
+        get() = sharedPref.getString(context.getString(R.string.pref_key_start_menu), "0")?.toIntOrNull() ?: 0
 
     val isShowPresent: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
@@ -22,21 +22,18 @@ class PreferencesRepository @Inject constructor(
 
     val currentThemeKey: String = context.getString(R.string.pref_key_theme)
     val currentTheme: Int
-        get() = sharedPref.getString(currentThemeKey, "1")?.toInt() ?: 1
+        get() = sharedPref.getString(currentThemeKey, "1")?.toIntOrNull() ?: 1
 
-    val gradePlusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+    val gradeColorTheme: String
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
 
-    val gradeMinusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
-
-    val serviceEnablesKey: String = context.getString(R.string.pref_key_services_enable)
+    val serviceEnableKey: String = context.getString(R.string.pref_key_services_enable)
     val isServiceEnabled: Boolean
-        get() = sharedPref.getBoolean(serviceEnablesKey, true)
+        get() = sharedPref.getBoolean(serviceEnableKey, true)
 
     val servicesIntervalKey: String = context.getString(R.string.pref_key_services_interval)
-    val servicesInterval: Int
-        get() = sharedPref.getString(servicesIntervalKey, "60")?.toInt() ?: 60
+    val servicesInterval: Long
+        get() = sharedPref.getString(servicesIntervalKey, "60")?.toLongOrNull() ?: 60
 
     val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
@@ -44,4 +41,18 @@ class PreferencesRepository @Inject constructor(
 
     val isNotificationsEnable: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
+
+    val isDebugNotificationEnableKey: String = context.getString(R.string.pref_key_notification_debug)
+    val isDebugNotificationEnable: Boolean
+        get() = sharedPref.getBoolean(isDebugNotificationEnableKey, false)
+
+    val gradePlusModifier: Double
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
+
+    val gradeMinusModifier: Double
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble()
+            ?: 0.0
+
+    val fillMessageContent: Boolean
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
new file mode 100644
index 00000000..6b8328ec
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import io.github.wulkanowy.data.db.dao.RecipientDao
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao) {
+
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Maybe<List<Recipient>> {
+        return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
+    }
+
+    fun saveRecipients(recipients: List<Recipient>) {
+        return recipientDb.insertAll(recipients)
+    }
+
+    fun deleteRecipients(recipients: List<Recipient>) {
+        recipientDb.deleteAll(recipients)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
new file mode 100644
index 00000000..b726edda
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+import io.github.wulkanowy.api.messages.Recipient as ApiRecipient
+
+@Singleton
+class RecipientRemote @Inject constructor(private val api: Api) {
+
+    fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
+        return api.getRecipients(unit.realId, role)
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
+    }
+
+    fun getMessageRecipients(message: Message): Single<List<Recipient>> {
+        return api.getMessageRecipients(message.messageId, message.senderId)
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
+    }
+
+    private fun ApiRecipient.toRecipient(): Recipient {
+        return Recipient(
+            studentId = api.studentId,
+            realId = id,
+            realName = name,
+            name = shortName,
+            hash = hash,
+            loginId = loginId,
+            role = role,
+            unitId = reportingUnitId ?: 0
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
new file mode 100644
index 00000000..0b02721f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecipientRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: RecipientLocal,
+    private val remote: RecipientRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getRecipients(student, role, unit).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getRecipients(role, unit)
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getRecipients(student, role, unit).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteRecipients(old - new)
+                                    local.saveRecipients(new - old)
+                                }
+                        }.flatMap {
+                            local.getRecipients(student, role, unit).toSingle(emptyList())
+                        }
+                    )
+            }
+    }
+
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
+            .flatMap {
+                if (it) remote.getMessageRecipients(message)
+                else Single.error(UnknownHostException())
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt
deleted file mode 100644
index bc0f3400..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.data.repositories.remote
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.messages.Folder
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.utils.toLocalDateTime
-import io.reactivex.Single
-import javax.inject.Inject
-import io.github.wulkanowy.api.messages.Message as ApiMessage
-
-class MessagesRemote @Inject constructor(private val api: Api) {
-
-    fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Single<List<Message>> {
-        return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
-            messages.map {
-                Message(
-                    studentId = studentId,
-                    realId = it.id,
-                    messageId = it.messageId,
-                    sender = it.sender,
-                    senderId = it.senderId,
-                    recipient = it.recipient,
-                    recipientId = it.recipientId,
-                    subject = it.subject.trim(),
-                    date = it.date?.toLocalDateTime(),
-                    folderId = it.folderId,
-                    unread = it.unread,
-                    unreadBy = it.unreadBy,
-                    readBy = it.readBy,
-                    removed = it.removed
-                )
-            }
-        }
-    }
-
-    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
-        return api.getMessageContent(message.messageId ?: 0, message.folderId, markAsRead, message.realId ?: 0)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt
deleted file mode 100644
index 6c6e26a9..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.remote
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentRemote @Inject constructor(private val api: Api) {
-
-    fun getStudents(email: String, password: String, endpoint: String): Single<List<Student>> {
-        return api.getPupils().map { students ->
-            students.map { pupil ->
-                Student(
-                    email = email,
-                    password = password,
-                    symbol = pupil.symbol,
-                    studentId = pupil.studentId,
-                    studentName = pupil.studentName,
-                    schoolSymbol = pupil.schoolSymbol,
-                    schoolName = pupil.description,
-                    endpoint = endpoint,
-                    loginType = pupil.loginType.name
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
new file mode 100644
index 00000000..b4281cbf
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.data.repositories.reportingunit
+
+import io.github.wulkanowy.data.db.dao.ReportingUnitDao
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: ReportingUnitDao) {
+
+    fun getReportingUnits(student: Student): Maybe<List<ReportingUnit>> {
+        return reportingUnitDb.load(student.studentId).filter { !it.isEmpty() }
+    }
+
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return reportingUnitDb.loadOne(student.studentId, unitId)
+    }
+
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>) {
+        return reportingUnitDb.insertAll(reportingUnits)
+    }
+
+    fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
+        reportingUnitDb.deleteAll(reportingUnits)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
new file mode 100644
index 00000000..feb4b013
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.repositories.reportingunit
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitRemote @Inject constructor(private val api: Api) {
+
+    fun getReportingUnits(): Single<List<ReportingUnit>> {
+        return api.getReportingUnits().map {
+            it.map { unit ->
+                ReportingUnit(
+                    studentId = api.studentId,
+                    realId = unit.id,
+                    roles = unit.roles,
+                    senderId = unit.senderId,
+                    senderName = unit.senderName,
+                    shortName = unit.short
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
new file mode 100644
index 00000000..9184b4bb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.data.repositories.reportingunit
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.ApiHelper
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: ReportingUnitLocal,
+    private val remote: ReportingUnitRemote,
+    private val apiHelper: ApiHelper
+) {
+
+    fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
+        return Single.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getReportingUnits(student).filter { !forceRefresh }
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) remote.getReportingUnits()
+                            else Single.error(UnknownHostException())
+                        }.flatMap { new ->
+                            local.getReportingUnits(student).toSingle(emptyList())
+                                .doOnSuccess { old ->
+                                    local.deleteReportingUnits(old - new)
+                                    local.saveReportingUnits(new - old)
+                                }
+                        }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
+                    )
+            }
+    }
+
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return Maybe.just(apiHelper.initApi(student))
+            .flatMap { _ ->
+                local.getReportingUnit(student, unitId)
+                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                        .flatMap {
+                            if (it) getReportingUnits(student, true)
+                            else Single.error(UnknownHostException())
+                        }.flatMapMaybe {
+                            local.getReportingUnit(student, unitId)
+                        }
+                    )
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
similarity index 93%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index 77000478..5be82d7f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.semester
 
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
similarity index 80%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index 1cf10501..b25c8881 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.semester
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
@@ -19,7 +19,9 @@ class SemesterRemote @Inject constructor(private val api: Api) {
                     diaryName = semester.diaryName,
                     semesterId = semester.semesterId,
                     semesterName = semester.semesterNumber,
-                    isCurrent = semester.current
+                    isCurrent = semester.current,
+                    classId = semester.classId,
+                    unitId = semester.unitId
                 )
             }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
similarity index 90%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index b7902106..975868a2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -1,12 +1,10 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.semester
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.local.SemesterLocal
-import io.github.wulkanowy.data.repositories.remote.SemesterRemote
 import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -39,4 +37,3 @@ class SemesterRepository @Inject constructor(
         return getSemesters(student, forceRefresh).map { item -> item.single { it.isCurrent } }
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
similarity index 68%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index 0e4e9cbd..e05e7223 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -1,7 +1,6 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
-import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.security.decrypt
@@ -15,25 +14,17 @@ import javax.inject.Singleton
 @Singleton
 class StudentLocal @Inject constructor(
     private val studentDb: StudentDao,
-    private val sharedPref: SharedPrefHelper,
     private val context: Context
 ) {
 
-    companion object {
-        const val STUDENT_SAVED_KEY: String = "is_student_saved"
-    }
-
-    val isStudentSaved
-        get() = sharedPref.getBoolean(STUDENT_SAVED_KEY, false)
-
     fun saveStudent(student: Student): Single<Long> {
         return Single.fromCallable { studentDb.insert(student.copy(password = encrypt(student.password, context))) }
-            .doOnSuccess { sharedPref.putBoolean(STUDENT_SAVED_KEY, true) }
     }
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
         return studentDb.loadAll()
             .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
+            .filter { !it.isEmpty() }
     }
 
     fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
@@ -46,13 +37,10 @@ class StudentLocal @Inject constructor(
                 resetCurrent()
                 updateCurrent(student.studentId)
             }
-        }.doOnComplete { sharedPref.putBoolean(STUDENT_SAVED_KEY, true) }
+        }
     }
 
     fun logoutStudent(student: Student): Completable {
-        return Completable.fromCallable {
-            studentDb.delete(student)
-            if (student.isCurrent) sharedPref.putBoolean(STUDENT_SAVED_KEY, false)
-        }
+        return Completable.fromCallable { studentDb.delete(student) }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
new file mode 100644
index 00000000..7a504cca
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.repositories.student
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudentRemote @Inject constructor(private val api: Api) {
+
+    fun getStudents(email: String, password: String, endpoint: String): Single<List<Student>> {
+        return api.getStudents().map { students ->
+            students.map { student ->
+                Student(
+                    email = email,
+                    password = password,
+                    symbol = student.symbol,
+                    studentId = student.studentId,
+                    studentName = student.studentName,
+                    schoolSymbol = student.schoolSymbol,
+                    schoolName = student.schoolName,
+                    endpoint = endpoint,
+                    loginType = student.loginType.name,
+                    isCurrent = false,
+                    registrationDate = now()
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
similarity index 68%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index 97210da0..7ddff0aa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -1,12 +1,11 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.student
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.local.StudentLocal
-import io.github.wulkanowy.data.repositories.remote.StudentRemote
 import io.reactivex.Completable
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -20,20 +19,15 @@ class StudentRepository @Inject constructor(
     private val apiHelper: ApiHelper
 ) {
 
-    val isStudentSaved
-        get() = local.isStudentSaved
+    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
-    lateinit var cachedStudents: Single<List<Student>>
-        private set
-
-    fun getStudents(email: String, password: String, symbol: String, endpoint: String): Single<List<Student>> {
-        cachedStudents = ReactiveNetwork.checkInternetConnectivity(settings)
+    fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
                 apiHelper.initApi(email, password, symbol, endpoint)
                 if (it) remote.getStudents(email, password, endpoint)
                 else Single.error(UnknownHostException("No internet connection"))
-            }.doOnSuccess { cachedStudents = Single.just(it) }
-        return cachedStudents
+            }
     }
 
     fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
@@ -41,7 +35,9 @@ class StudentRepository @Inject constructor(
     }
 
     fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
-        return local.getCurrentStudent(decryptPass).toSingle()
+        return local.getCurrentStudent(decryptPass)
+            .switchIfEmpty(Maybe.error(NoSuchElementException("No current student")))
+            .toSingle()
     }
 
     fun saveStudent(student: Student): Single<Long> {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
similarity index 92%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index 7ca7c1b0..63e33401 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
similarity index 93%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index ae565d48..88fbb196 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
similarity index 86%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index e3e8a2a7..6167251b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -1,18 +1,16 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.data.repositories.subject
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.repositories.local.SubjectLocal
-import io.github.wulkanowy.data.repositories.remote.SubjectRemote
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SubjectRepostory @Inject constructor(
+class SubjectRepository @Inject constructor(
     private val settings: InternetObservingSettings,
     private val local: SubjectLocal,
     private val remote: SubjectRemote
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
similarity index 82%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
index 63cc7c94..e074ce2a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Semester
@@ -6,14 +6,11 @@ import io.github.wulkanowy.data.db.entities.Timetable
 import io.reactivex.Maybe
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
-        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
-            .filter { !it.isEmpty() }
-    }
-
     fun saveTimetable(timetables: List<Timetable>) {
         timetableDb.insertAll(timetables)
     }
@@ -21,4 +18,8 @@ class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao)
     fun deleteTimetable(timetables: List<Timetable>) {
         timetableDb.deleteAll(timetables)
     }
+
+    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
+        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
similarity index 85%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index aa8949fd..77742e7b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.remote
+package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.entities.Semester
@@ -8,7 +8,9 @@ import io.github.wulkanowy.utils.toLocalDateTime
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class TimetableRemote @Inject constructor(private val api: Api) {
 
     fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
@@ -24,9 +26,12 @@ class TimetableRemote @Inject constructor(private val api: Api) {
                         end = it.end.toLocalDateTime(),
                         date = it.date.toLocalDate(),
                         subject = it.subject,
+                        subjectOld = it.subjectOld,
                         group = it.group,
                         room = it.room,
+                        roomOld = it.roomOld,
                         teacher = it.teacher,
+                        teacherOld = it.teacherOld,
                         info = it.info,
                         changes = it.changes,
                         canceled = it.canceled
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
new file mode 100644
index 00000000..460d55fd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -0,0 +1,49 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TimetableRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: TimetableLocal,
+    private val remote: TimetableRemote
+) {
+
+    fun getTimetable(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
+            local.getTimetable(semester, monday, friday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                    if (it) remote.getTimetable(semester, monday, friday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { newTimetable ->
+                    local.getTimetable(semester, monday, friday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { oldTimetable ->
+                            local.deleteTimetable(oldTimetable - newTimetable)
+                            local.saveTimetable((newTimetable - oldTimetable).map { item ->
+                                item.apply {
+                                    oldTimetable.singleOrNull { this.start == it.start }?.let {
+                                        return@map copy(
+                                            room = if (room.isEmpty()) it.room else room,
+                                            teacher = if (teacher.isEmpty()) it.teacher else teacher
+                                        )
+                                    }
+                                }
+                            })
+                        }
+                }.flatMap {
+                    local.getTimetable(semester, monday, friday).toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
index 21c193e5..9e8b24ab 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -5,6 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.support.AndroidSupportInjectionModule
 import io.github.wulkanowy.WulkanowyApp
 import io.github.wulkanowy.data.RepositoryModule
+import io.github.wulkanowy.services.ServicesModule
 import javax.inject.Singleton
 
 @Singleton
@@ -12,6 +13,7 @@ import javax.inject.Singleton
     AndroidSupportInjectionModule::class,
     AppModule::class,
     RepositoryModule::class,
+    ServicesModule::class,
     BuilderModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {
 
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index fc2e9297..eb3b18f9 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -1,16 +1,17 @@
 package io.github.wulkanowy.di
 
+import android.appwidget.AppWidgetManager
 import android.content.Context
-import com.firebase.jobdispatcher.FirebaseJobDispatcher
-import com.firebase.jobdispatcher.GooglePlayDriver
 import com.google.firebase.analytics.FirebaseAnalytics
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.WulkanowyApp
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -29,9 +30,14 @@ internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideJobDispatcher(context: Context) = FirebaseJobDispatcher(GooglePlayDriver(context))
+    fun provideFirebaseAnalyticsHelper(context: Context) = FirebaseAnalyticsHelper(FirebaseAnalytics.getInstance(context))
 
     @Singleton
     @Provides
-    fun provideFirebaseAnalyticsHelper(context: Context) = FirebaseAnalyticsHelper(FirebaseAnalytics.getInstance(context))
+    fun provideAppWidgetManager(context: Context) = AppWidgetManager.getInstance(context)
+
+    @Singleton
+    @Named("isDebug")
+    @Provides
+    fun provideIsDebug() = DEBUG
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
index 9f4ecb80..2616acc3 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@@ -3,12 +3,12 @@ package io.github.wulkanowy.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
-import io.github.wulkanowy.services.job.SyncWorker
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
 
@@ -16,7 +16,7 @@ import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
 internal abstract class BuilderModule {
 
     @PerActivity
-    @ContributesAndroidInjector()
+    @ContributesAndroidInjector
     abstract fun bindSplashActivity(): SplashActivity
 
     @PerActivity
@@ -27,12 +27,12 @@ internal abstract class BuilderModule {
     @ContributesAndroidInjector(modules = [MainModule::class])
     abstract fun bindMainActivity(): MainActivity
 
+    @ContributesAndroidInjector
+    abstract fun bindMessageSendActivity(): SendMessageActivity
+
     @ContributesAndroidInjector
     abstract fun bindTimetableWidgetService(): TimetableWidgetService
 
     @ContributesAndroidInjector
     abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
-
-    @ContributesAndroidInjector
-    abstract fun bindSyncJob(): SyncWorker
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
new file mode 100644
index 00000000..70cbf84c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -0,0 +1,102 @@
+package io.github.wulkanowy.services
+
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Context.NOTIFICATION_SERVICE
+import androidx.core.app.NotificationManagerCompat
+import androidx.work.WorkManager
+import com.squareup.inject.assisted.dagger2.AssistedModule
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoSet
+import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
+import io.github.wulkanowy.services.sync.works.AttendanceWork
+import io.github.wulkanowy.services.sync.works.CompletedLessonWork
+import io.github.wulkanowy.services.sync.works.ExamWork
+import io.github.wulkanowy.services.sync.works.GradeStatisticsWork
+import io.github.wulkanowy.services.sync.works.GradeSummaryWork
+import io.github.wulkanowy.services.sync.works.GradeWork
+import io.github.wulkanowy.services.sync.works.HomeworkWork
+import io.github.wulkanowy.services.sync.works.LuckyNumberWork
+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.TimetableWork
+import io.github.wulkanowy.services.sync.works.Work
+import javax.inject.Singleton
+
+@AssistedModule
+@Module(includes = [AssistedInject_ServicesModule::class])
+abstract class ServicesModule {
+
+    @Module
+    companion object {
+
+        @JvmStatic
+        @Provides
+        fun provideWorkManager() = WorkManager.getInstance()
+
+        @JvmStatic
+        @Singleton
+        @Provides
+        fun provideNotificationManagerCompat(context: Context) = NotificationManagerCompat.from(context)
+
+        @JvmStatic
+        @Singleton
+        @Provides
+        fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+    }
+
+    @Binds
+    @IntoSet
+    abstract fun provideGradeWork(work: GradeWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideNoteWork(work: NoteWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideAttendanceWork(work: AttendanceWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideGradeSummaryWork(work: GradeSummaryWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideExamWork(work: ExamWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideAttendanceSummaryWork(work: AttendanceSummaryWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideTimetableWork(work: TimetableWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideLuckyNumberWork(work: LuckyNumberWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideCompletedLessonWork(work: CompletedLessonWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideHomeworkWork(work: HomeworkWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideMessageWork(work: MessageWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideRecipientWork(work: RecipientWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideGradeStatistics(work: GradeStatisticsWork): Work
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt b/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt
deleted file mode 100644
index d81b4b6d..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.github.wulkanowy.services.job
-
-import com.firebase.jobdispatcher.Constraint.ON_ANY_NETWORK
-import com.firebase.jobdispatcher.Constraint.ON_UNMETERED_NETWORK
-import com.firebase.jobdispatcher.FirebaseJobDispatcher
-import com.firebase.jobdispatcher.Lifetime.FOREVER
-import com.firebase.jobdispatcher.RetryStrategy.DEFAULT_EXPONENTIAL
-import com.firebase.jobdispatcher.Trigger.executionWindow
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.utils.isHolidays
-import org.threeten.bp.LocalDate
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ServiceHelper @Inject constructor(
-    private val prefRepository: PreferencesRepository,
-    private val dispatcher: FirebaseJobDispatcher
-) {
-
-    fun reloadFullSyncService() {
-        startFullSyncService(true)
-    }
-
-    fun startFullSyncService(replaceCurrent: Boolean = false) {
-        if (LocalDate.now().isHolidays || !prefRepository.isServiceEnabled) {
-            Timber.d("Services disabled or it's holidays")
-            return
-        }
-
-        dispatcher.mustSchedule(
-            dispatcher.newJobBuilder()
-                .setLifetime(FOREVER)
-                .setRecurring(true)
-                .setService(SyncWorker::class.java)
-                .setTag(SyncWorker.WORK_TAG)
-                .setTrigger(
-                    executionWindow(
-                        prefRepository.servicesInterval * 60,
-                        (prefRepository.servicesInterval + 10) * 60
-                    )
-                )
-                .setConstraints(if (prefRepository.isServicesOnlyWifi) ON_UNMETERED_NETWORK else ON_ANY_NETWORK)
-                .setReplaceCurrent(replaceCurrent)
-                .setRetryStrategy(DEFAULT_EXPONENTIAL)
-                .build()
-        )
-
-        Timber.d("Services started")
-    }
-
-    fun stopFullSyncService() {
-        dispatcher.cancel(SyncWorker.WORK_TAG)
-        Timber.d("Services stopped")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt
deleted file mode 100644
index 65fb3abc..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-package io.github.wulkanowy.services.job
-
-import com.firebase.jobdispatcher.JobParameters
-import com.firebase.jobdispatcher.SimpleJobService
-import dagger.android.AndroidInjection
-import io.github.wulkanowy.data.repositories.AttendanceRepository
-import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.NoteRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.services.notification.GradeNotification
-import io.github.wulkanowy.services.notification.MessageNotification
-import io.github.wulkanowy.services.notification.NoteNotification
-import io.github.wulkanowy.utils.friday
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.monday
-import io.reactivex.Single
-import io.reactivex.disposables.CompositeDisposable
-import org.threeten.bp.LocalDate
-import timber.log.Timber
-import javax.inject.Inject
-
-class SyncWorker : SimpleJobService() {
-
-    @Inject
-    lateinit var student: StudentRepository
-
-    @Inject
-    lateinit var semester: SemesterRepository
-
-    @Inject
-    lateinit var gradesDetails: GradeRepository
-
-    @Inject
-    lateinit var gradesSummary: GradeSummaryRepository
-
-    @Inject
-    lateinit var attendance: AttendanceRepository
-
-    @Inject
-    lateinit var exam: ExamRepository
-
-    @Inject
-    lateinit var timetable: TimetableRepository
-
-    @Inject
-    lateinit var message: MessagesRepository
-
-    @Inject
-    lateinit var note: NoteRepository
-
-    @Inject
-    lateinit var homework: HomeworkRepository
-
-    @Inject
-    lateinit var prefRepository: PreferencesRepository
-
-    private val disposable = CompositeDisposable()
-
-    companion object {
-        const val WORK_TAG = "FULL_SYNC"
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        AndroidInjection.inject(this)
-    }
-
-    override fun onRunJob(job: JobParameters?): Int {
-        Timber.d("Synchronization started")
-
-        val start = LocalDate.now().monday
-        val end = LocalDate.now().friday
-
-        if (start.isHolidays) return RESULT_FAIL_NORETRY
-
-        var error: Throwable? = null
-
-        disposable.add(student.getCurrentStudent()
-            .flatMap { semester.getCurrentSemester(it, true) }
-            .flatMapPublisher {
-                Single.merge(
-                    listOf(
-                        gradesDetails.getGrades(it, true, true),
-                        gradesSummary.getGradesSummary(it, true),
-                        attendance.getAttendance(it, start, end, true),
-                        exam.getExams(it, start, end, true),
-                        timetable.getTimetable(it, start, end, true),
-                        message.getMessages(it.studentId, RECEIVED, true, true),
-                        note.getNotes(it, true, true),
-                        homework.getHomework(it, LocalDate.now(), true),
-                        homework.getHomework(it, LocalDate.now().plusDays(1), true)
-                    )
-                )
-            }
-            .subscribe({}, { error = it }))
-
-        return if (null === error) {
-            if (prefRepository.isNotificationsEnable) sendNotifications()
-            Timber.d("Synchronization successful")
-            RESULT_SUCCESS
-        } else {
-            Timber.e(error, "Synchronization failed")
-            RESULT_FAIL_RETRY
-        }
-    }
-
-    private fun sendNotifications() {
-        sendGradeNotifications()
-        sendMessageNotification()
-        sendNoteNotification()
-    }
-
-    private fun sendGradeNotifications() {
-        disposable.add(student.getCurrentStudent()
-            .flatMap { semester.getCurrentSemester(it) }
-            .flatMap { gradesDetails.getNewGrades(it) }
-            .map { it.filter { grade -> !grade.isNotified } }
-            .doOnSuccess {
-                if (it.isNotEmpty()) {
-                    Timber.d("Found ${it.size} unread grades")
-                    GradeNotification(applicationContext).sendNotification(it)
-                }
-            }
-            .map { it.map { grade -> grade.apply { isNotified = true } } }
-            .flatMapCompletable { gradesDetails.updateGrades(it) }
-            .subscribe({}, { Timber.e(it, "Grade notifications sending failed") }))
-    }
-
-    private fun sendMessageNotification() {
-        disposable.add(student.getCurrentStudent()
-            .flatMap { message.getNewMessages(it) }
-            .map { it.filter { message -> !message.isNotified } }
-            .doOnSuccess{
-                if (it.isNotEmpty()) {
-                    Timber.d("Found ${it.size} unread messages")
-                    MessageNotification(applicationContext).sendNotification(it)
-                }
-            }
-            .map { it.map { message -> message.apply { isNotified = true } } }
-            .flatMapCompletable { message.updateMessages(it) }
-            .subscribe({}, { Timber.e(it, "Message notifications sending failed") })
-        )
-    }
-
-    private fun sendNoteNotification() {
-        disposable.add(student.getCurrentStudent()
-            .flatMap { semester.getCurrentSemester(it) }
-            .flatMap { note.getNewNotes(it) }
-            .map { it.filter { note -> !note.isNotified } }
-            .doOnSuccess {
-                if (it.isNotEmpty()) {
-                    Timber.d("Found ${it.size} unread notes")
-                    NoteNotification(applicationContext).sendNotification(it)
-                }
-            }
-            .map { it.map { note -> note.apply { isNotified = true } } }
-            .flatMapCompletable { note.updateNotes(it) }
-            .subscribe({}, { Timber.e("Notifications sending failed") })
-        )
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        disposable.clear()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/BaseNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/BaseNotification.kt
deleted file mode 100644
index 945d0b15..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/BaseNotification.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.app.Notification
-import android.app.NotificationManager
-import android.content.Context
-import android.content.Context.NOTIFICATION_SERVICE
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.O
-import androidx.core.app.NotificationCompat
-import timber.log.Timber
-import kotlin.random.Random
-
-abstract class BaseNotification(protected val context: Context) {
-
-    protected val notificationManager: NotificationManager by lazy {
-        context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-    }
-
-    fun notify(notification: Notification) {
-        notificationManager.notify(Random.nextInt(1000), notification)
-    }
-
-    fun notificationBuilder(channelId: String): NotificationCompat.Builder {
-        if (SDK_INT >= O) createChannel(channelId)
-        return NotificationCompat.Builder(context, channelId)
-    }
-
-    fun cancelAll() {
-        notificationManager.cancelAll()
-        Timber.d("Notifications canceled")
-    }
-
-    abstract fun createChannel(channelId: String)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
deleted file mode 100644
index df57ec28..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.annotation.TargetApi
-import android.app.Notification.VISIBILITY_PUBLIC
-import android.app.NotificationChannel
-import android.app.NotificationManager.IMPORTANCE_HIGH
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
-import timber.log.Timber
-
-class GradeNotification(context: Context) : BaseNotification(context) {
-
-    private val channelId = "Grade_Notify"
-
-    @TargetApi(26)
-    override fun createChannel(channelId: String) {
-        notificationManager.createNotificationChannel(NotificationChannel(
-            channelId, context.getString(R.string.notify_grade_channel), IMPORTANCE_HIGH
-        ).apply {
-            enableLights(true)
-            enableVibration(true)
-            lockscreenVisibility = VISIBILITY_PUBLIC
-        })
-    }
-
-    fun sendNotification(items: List<Grade>) {
-        notify(notificationBuilder(channelId)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, items.size, items.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.notify_grade_new_items, items.size, items.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_grade)
-            .setAutoCancel(true)
-            .setDefaults(NotificationCompat.DEFAULT_ALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0),
-                    FLAG_UPDATE_CURRENT
-                )
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, items.size, items.size))
-                items.forEach {
-                    addLine("${it.subject}: ${it.entry}")
-                }
-                this
-            })
-            .build()
-        )
-
-        Timber.d("Notification sent")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/MessageNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/MessageNotification.kt
deleted file mode 100644
index 8733cada..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/MessageNotification.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import timber.log.Timber
-
-class MessageNotification(context: Context) : BaseNotification(context) {
-
-    private val channelId = "Message_Notify"
-
-    @TargetApi(26)
-    override fun createChannel(channelId: String) {
-        notificationManager.createNotificationChannel(NotificationChannel(
-            channelId, context.getString(R.string.notify_message_channel), NotificationManager.IMPORTANCE_HIGH
-        ).apply {
-            enableLights(true)
-            enableVibration(true)
-            lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-        })
-    }
-
-    fun sendNotification(items: List<Message>) {
-        notify(notificationBuilder(channelId)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, items.size, items.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.notify_message_new_items, items.size, items.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_message)
-            .setAutoCancel(true)
-            .setDefaults(NotificationCompat.DEFAULT_ALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(MainActivity.EXTRA_START_MENU_INDEX, 4),
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, items.size, items.size))
-                items.forEach {
-                    addLine("${it.sender}: ${it.subject}")
-                }
-                this
-            })
-            .build()
-        )
-
-        Timber.d("Notification sent")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/NoteNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/NoteNotification.kt
deleted file mode 100644
index 33c2fdc7..00000000
--- a/app/src/main/java/io/github/wulkanowy/services/notification/NoteNotification.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.services.notification
-
-import android.annotation.TargetApi
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import timber.log.Timber
-
-class NoteNotification(context: Context) : BaseNotification(context) {
-
-    private val channelId = "Note_Notify"
-
-    @TargetApi(26)
-    override fun createChannel(channelId: String) {
-        notificationManager.createNotificationChannel(NotificationChannel(
-            channelId, context.getString(R.string.notify_note_channel), NotificationManager.IMPORTANCE_HIGH
-        ).apply {
-            enableLights(true)
-            enableVibration(true)
-            lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-        })
-    }
-
-    fun sendNotification(items: List<Note>) {
-        notify(notificationBuilder(channelId)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, items.size, items.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.notify_note_new_items, items.size, items.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_note)
-            .setAutoCancel(true)
-            .setDefaults(NotificationCompat.DEFAULT_ALL)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(MainActivity.EXTRA_START_MENU_INDEX, 4),
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, items.size, items.size))
-                items.forEach {
-                    addLine("${it.teacher}: ${it.category}")
-                }
-                this
-            })
-            .build()
-        )
-
-        Timber.d("Notification sent")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
new file mode 100644
index 00000000..7a9a9956
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.services.sync
+
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.O
+import androidx.work.BackoffPolicy.EXPONENTIAL
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy.KEEP
+import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
+import androidx.work.NetworkType.METERED
+import androidx.work.NetworkType.UNMETERED
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkManager
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.utils.isHolidays
+import org.threeten.bp.LocalDate.now
+import timber.log.Timber
+import java.util.concurrent.TimeUnit.MINUTES
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class SyncManager @Inject constructor(
+    private val workManager: WorkManager,
+    private val preferencesRepository: PreferencesRepository,
+    newEntriesChannel: NewEntriesChannel,
+    debugChannel: DebugChannel,
+    @Named("isDebug") isDebug: Boolean
+) {
+
+    init {
+        if (SDK_INT >= O) newEntriesChannel.create()
+        if (SDK_INT >= O && isDebug) debugChannel.create()
+        if (now().isHolidays) stopSyncWorker()
+        Timber.i("SyncManager was initialized")
+    }
+
+    fun startSyncWorker(restart: Boolean = false) {
+        if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
+            workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
+                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES)
+                    .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
+                    .setConstraints(Constraints.Builder()
+                        .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) METERED else UNMETERED)
+                        .build())
+                    .build())
+        }
+    }
+
+    fun stopSyncWorker() {
+        workManager.cancelUniqueWork(SyncWorker::class.java.simpleName)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
new file mode 100644
index 00000000..ec753b7e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -0,0 +1,68 @@
+package io.github.wulkanowy.services.sync
+
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.BigTextStyle
+import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
+import androidx.core.app.NotificationManagerCompat
+import androidx.work.ListenableWorker
+import androidx.work.RxWorker
+import androidx.work.WorkerParameters
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.works.Work
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import io.reactivex.Single
+import timber.log.Timber
+import kotlin.random.Random
+
+class SyncWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParameters: WorkerParameters,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val works: Set<@JvmSuppressWildcards Work>,
+    private val preferencesRepository: PreferencesRepository,
+    private val notificationManager: NotificationManagerCompat
+) : RxWorker(appContext, workerParameters) {
+
+    override fun createWork(): Single<Result> {
+        return studentRepository.getCurrentStudent()
+            .flatMapCompletable { student ->
+                semesterRepository.getCurrentSemester(student, true)
+                    .flatMapCompletable { semester ->
+                        Completable.mergeDelayError(works.map { it.create(student, semester) })
+                    }
+            }
+            .toSingleDefault(Result.success())
+            .onErrorReturn {
+                Timber.e(it, "There was an error during synchronization")
+                Result.retry()
+            }
+            .doOnSuccess { if (preferencesRepository.isDebugNotificationEnable) notify(it) }
+    }
+
+    private fun notify(result: Result) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
+            .setContentTitle("Debug notification")
+            .setSmallIcon(R.drawable.ic_more_settings_24dp)
+            .setAutoCancel(true)
+            .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
+            .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
+            .setPriority(PRIORITY_DEFAULT)
+            .build())
+    }
+
+    @AssistedInject.Factory
+    interface Factory {
+
+        fun create(appContext: Context, workerParameters: WorkerParameters): ListenableWorker
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
new file mode 100644
index 00000000..aadfc27f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.services.sync
+
+import android.content.Context
+import androidx.work.ListenableWorker
+import androidx.work.WorkerFactory
+import androidx.work.WorkerParameters
+import timber.log.Timber
+import javax.inject.Inject
+
+class SyncWorkerFactory @Inject constructor(private val syncWorkerFactory: SyncWorker.Factory) : WorkerFactory() {
+
+    override fun createWorker(appContext: Context, workerClassName: String, workerParameters: WorkerParameters): ListenableWorker? {
+        return if (workerClassName == SyncWorker::class.java.name) {
+            syncWorkerFactory.create(appContext, workerParameters)
+        } else {
+            Timber.e(IllegalArgumentException("Unknown worker class name: $workerClassName"))
+            null
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
new file mode 100644
index 00000000..02fff569
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification.VISIBILITY_PUBLIC
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
+import android.content.Context
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class DebugChannel @Inject constructor(
+    private val notificationManager: NotificationManager,
+    private val context: Context
+) {
+
+    companion object {
+        const val CHANNEL_ID = "debug_channel"
+    }
+
+    fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT).apply {
+                lockscreenVisibility = VISIBILITY_PUBLIC
+            })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
new file mode 100644
index 00000000..8e24a2a6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification.VISIBILITY_PUBLIC
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.NotificationManager.IMPORTANCE_HIGH
+import android.content.Context
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewEntriesChannel @Inject constructor(
+    private val notificationManager: NotificationManager,
+    private val context: Context
+) {
+
+    companion object {
+        const val CHANNEL_ID = "new_entries_channel"
+    }
+
+    fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH).apply {
+                enableLights(true)
+                enableVibration(true)
+                lockscreenVisibility = VISIBILITY_PUBLIC
+            })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
new file mode 100644
index 00000000..01978c5b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class AttendanceSummaryWork @Inject constructor(
+    private val attendanceSummaryRepository: AttendanceSummaryRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceSummaryRepository.getAttendanceSummary(semester, -1, true).ignoreElement()
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
new file mode 100644
index 00000000..e4b55b0e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceRepository.getAttendance(semester, now().monday, now().friday, true)
+            .ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
new file mode 100644
index 00000000..29642ad6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class CompletedLessonWork @Inject constructor(
+    private val completedLessonsRepository: CompletedLessonsRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return completedLessonsRepository.getCompletedLessons(semester, now().monday, now().friday, true)
+            .ignoreElement()
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
new file mode 100644
index 00000000..8744fcc7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.exam.ExamRepository
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return examRepository.getExams(semester, now().monday, now().friday, true).ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
new file mode 100644
index 00000000..1de39a95
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeStatisticsRepository.getGradesStatistics(semester, "Wszystkie", false, true)
+            .ignoreElement()
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
new file mode 100644
index 00000000..6de0bc5b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class GradeSummaryWork @Inject constructor(private val gradeSummaryRepository: GradeSummaryRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeSummaryRepository.getGradesSummary(semester, true).ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
new file mode 100644
index 00000000..66316934
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class GradeWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val gradeRepository: GradeRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { gradeRepository.getNotNotifiedGrades(semester) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
+            }
+    }
+
+    private fun notify(grades: List<Grade>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
+            .setSmallIcon(R.drawable.ic_stat_notify_grade)
+            .setAutoCancel(true)
+            .setPriority(PRIORITY_HIGH)
+            .setDefaults(DEFAULT_ALL)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, 0,
+                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0), FLAG_UPDATE_CURRENT))
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
+                grades.forEach { addLine("${it.subject}: ${it.entry}") }
+                this
+            })
+            .build()
+        )
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
new file mode 100644
index 00000000..32b356c6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return homeworkRepository.getHomework(semester, now().monday, now().friday, true).ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
new file mode 100644
index 00000000..ca7aaac6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class LuckyNumberWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val luckyNumberRepository: LuckyNumberRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return luckyNumberRepository.getLuckyNumber(semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(semester) }
+            .flatMapCompletable {
+                notify(it)
+                luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
+            }
+    }
+
+    private fun notify(luckyNumber: LuckyNumber) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+            .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
+            .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
+            .setSmallIcon(R.drawable.ic_stat_notify_lucky_number)
+            .setAutoCancel(true)
+            .setDefaults(DEFAULT_ALL)
+            .setPriority(PRIORITY_HIGH)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, 0,
+                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+            )
+            .build())
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
new file mode 100644
index 00000000..7ab2c8d4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.repositories.message.MessageRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class MessageWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val messageRepository: MessageRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return messageRepository.getMessages(student, RECEIVED, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { messageRepository.getNotNotifiedMessages(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
+            }
+    }
+
+    private fun notify(messages: List<Message>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+            .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
+            .setSmallIcon(R.drawable.ic_stat_notify_message)
+            .setAutoCancel(true)
+            .setDefaults(DEFAULT_ALL)
+            .setPriority(PRIORITY_HIGH)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, 0,
+                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+            )
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
+                messages.forEach { addLine("${it.sender}: ${it.subject}") }
+                this
+            })
+            .build())
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
new file mode 100644
index 00000000..d0e8fe21
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.services.sync.works
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.DEFAULT_ALL
+import androidx.core.app.NotificationCompat.PRIORITY_HIGH
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.note.NoteRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.utils.getCompatColor
+import io.reactivex.Completable
+import javax.inject.Inject
+import kotlin.random.Random
+
+class NoteWork @Inject constructor(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+    private val noteRepository: NoteRepository,
+    private val preferencesRepository: PreferencesRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { noteRepository.getNotNotifiedNotes(student) }
+            .flatMapCompletable {
+                if (it.isNotEmpty()) notify(it)
+                noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
+            }
+    }
+
+    private fun notify(notes: List<Note>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+            .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size))
+            .setSmallIcon(R.drawable.ic_stat_notify_note)
+            .setAutoCancel(true)
+            .setDefaults(DEFAULT_ALL)
+            .setPriority(PRIORITY_HIGH)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setContentIntent(
+                PendingIntent.getActivity(context, 0,
+                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+            )
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
+                notes.forEach { addLine("${it.teacher}: ${it.category}") }
+                this
+            })
+            .build())
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
new file mode 100644
index 00000000..af8de434
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -0,0 +1,24 @@
+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.recipient.RecipientRepository
+import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class RecipientWork @Inject constructor(
+    private val reportingUnitRepository: ReportingUnitRepository,
+    private val recipientRepository: RecipientRepository
+) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return reportingUnitRepository.getReportingUnits(student)
+            .flatMapCompletable { units ->
+                Completable.mergeDelayError(units.map {
+                    recipientRepository.getRecipients(student, 2, it).ignoreElement()
+                })
+            }
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
new file mode 100644
index 00000000..743ae0e8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
+import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
+import javax.inject.Inject
+
+class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return timetableRepository.getTimetable(semester, now().monday, now().friday, true)
+            .ignoreElement()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
new file mode 100644
index 00000000..1601a103
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Completable
+
+interface Work {
+
+    fun create(student: Student, semester: Semester): Completable
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index d1e275b7..0432ee14 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -4,10 +4,11 @@ import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.data.db.SharedPrefHelper
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class TimetableWidgetService : RemoteViewsService() {
@@ -24,8 +25,11 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var sharedPref: SharedPrefHelper
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
         AndroidInjection.inject(this)
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, sharedPref, applicationContext, intent)
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, sharedPref, schedulers, applicationContext, intent)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index 667b46ff..6e863c51 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -13,7 +13,7 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
         if (messageContainer == null) (activity as? BaseActivity)?.showError(text, error)
         else messageContainer?.also {
             Snackbar.make(it, text, Snackbar.LENGTH_LONG).setAction(R.string.all_details) {
-                ErrorDialog.newInstance(error).show(fragmentManager, error.toString())
+                ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
             }.show()
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
new file mode 100644
index 00000000..fcf7e980
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.base
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+
+class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+
+    private val pages = mutableMapOf<Fragment, String?>()
+
+    var containerId = 0
+
+    fun getFragmentInstance(position: Int): Fragment? {
+        if (containerId == 0) throw IllegalArgumentException("Container id is 0")
+        return fragmentManager.findFragmentByTag("android:switcher:$containerId:$position")
+    }
+
+    fun addFragments(fragments: List<Fragment>) {
+        fragments.forEach { pages[it] = null }
+    }
+
+    fun addFragmentsWithTitle(pages: Map<Fragment, String>) {
+        this.pages.putAll(pages)
+    }
+
+    override fun getItem(position: Int) = pages.keys.elementAt(position)
+
+    override fun getCount() = pages.size
+
+    override fun getPageTitle(position: Int) = pages.values.elementAt(position)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
deleted file mode 100644
index 000efdcd..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePagerAdapter.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.ui.base
-
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-
-class BasePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAdapter(fragmentManager) {
-
-    val fragments = mutableMapOf<String?, Fragment>()
-
-    val registeredFragments = mutableMapOf<Int, Fragment>()
-
-    override fun getItem(position: Int) = fragments.values.elementAt(position)
-
-    override fun getCount() = fragments.size
-
-    override fun getPageTitle(position: Int): CharSequence? {
-        return fragments.keys.elementAtOrNull(position)
-    }
-
-    override fun instantiateItem(container: ViewGroup, position: Int): Any {
-        return super.instantiateItem(container, position).also {
-            registeredFragments[position] = it as Fragment
-        }
-    }
-
-    override fun destroyItem(container: ViewGroup, position: Int, fragment: Any) {
-        registeredFragments.remove(position)
-        super.destroyItem(container, position, fragment)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index e0e32e2c..83cbf0ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -1,7 +1,9 @@
 package io.github.wulkanowy.ui.base
 
 import android.content.res.Resources
+import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.R
+import io.github.wulkanowy.api.interceptor.FeatureDisabledException
 import io.github.wulkanowy.api.interceptor.ServiceUnavailableException
 import io.github.wulkanowy.api.login.NotLoggedInException
 import timber.log.Timber
@@ -9,11 +11,12 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import javax.inject.Inject
 
-open class ErrorHandler @Inject constructor(protected val resources: Resources) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckCollector: ChuckCollector) {
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
     fun dispatch(error: Throwable) {
+        chuckCollector.onError(error.javaClass.simpleName, error)
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
     }
@@ -24,6 +27,7 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources)
             is SocketTimeoutException -> resources.getString(R.string.error_timeout)
             is NotLoggedInException -> resources.getString(R.string.error_login_failed)
             is ServiceUnavailableException -> resources.getString(R.string.error_service_unavailable)
+            is FeatureDisabledException -> resources.getString(R.string.error_feature_disabled)
             else -> resources.getString(R.string.error_unknown)
         }), error)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
index 89654732..1d81e932 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/session/SessionErrorHandler.kt
@@ -1,11 +1,15 @@
 package io.github.wulkanowy.ui.base.session
 
 import android.content.res.Resources
+import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.security.ScramblerException
 import javax.inject.Inject
 
-class SessionErrorHandler @Inject constructor(resources: Resources) : ErrorHandler(resources) {
+open class SessionErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckCollector: ChuckCollector
+) : ErrorHandler(resources, chuckCollector) {
 
     var onDecryptionFail: () -> Unit = {}
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index ddc4e11f..1002f914 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -1,12 +1,14 @@
 package io.github.wulkanowy.ui.modules.about
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.aboutlibraries.LibsFragmentCompat
+import io.github.wulkanowy.BuildConfig
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -36,12 +38,12 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
                 .withAboutVersionShown(true)
                 .withAboutIconShown(true)
                 .withLicenseShown(true)
-                .withAboutSpecial1(getString(R.string.about_source_code))
-                .withAboutSpecial2(getString(R.string.about_feedback))
+                .withAboutSpecial1(getString(R.string.about_discord_invite))
+                .withAboutSpecial2(getString(R.string.about_homepage))
+                .withAboutSpecial3(getString(R.string.about_feedback))
                 .withFields(R.string::class.java.fields)
                 .withCheckCachedDetection(false)
-                .withExcludedLibraries("fastadapter", "AndroidIconics", "gson",
-                    "Jsoup", "Retrofit", "okio", "OkHttp")
+                .withExcludedLibraries("fastadapter", "AndroidIconics", "gson", "Jsoup", "Retrofit", "okio", "OkHttp")
                 .withOnExtraListener { presenter.onExtraSelect(it) })
         }.let {
             fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
@@ -53,12 +55,33 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         fragmentCompat.onViewCreated(view, savedInstanceState)
     }
 
-    override fun openSourceWebView() {
-        startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy", 0))
+    override fun openDiscordInviteView() {
+        startActivity(Intent.parseUri("https://discord.gg/vccAQBr", 0))
     }
 
-    override fun openIssuesWebView() {
-        startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy/issues", 0))
+    override fun openHomepageWebView() {
+        startActivity(Intent.parseUri("https://wulkanowy.github.io/", 0))
+    }
+
+    override fun openEmailClientView() {
+        val intent = Intent(Intent.ACTION_SENDTO).apply {
+            data = Uri.parse("mailto:")
+            putExtra(Intent.EXTRA_EMAIL, Array(1) { "wulkanowyinc@gmail.com" })
+            putExtra(Intent.EXTRA_SUBJECT, "Zgłoszenie błędu")
+            putExtra(Intent.EXTRA_TEXT,"Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
+                Build: ${BuildConfig.VERSION_CODE}
+                SDK: ${android.os.Build.VERSION.SDK_INT}
+                Device: ${android.os.Build.MANUFACTURER} ${android.os.Build.MODEL}
+            """.trimIndent())
+        }
+
+        context?.let {
+            if (intent.resolveActivity(it.packageManager) != null) {
+                startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
+            } else {
+                startActivity(Intent.parseUri("https://github.com/wulkanowy/wulkanowy/issues", 0))
+            }
+        }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 9a512f70..116dbef3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -15,21 +15,28 @@ class AboutPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<AboutView>(errorHandler) {
 
+    override fun onAttachView(view: AboutView) {
+        super.onAttachView(view)
+        Timber.i("About view is attached")
+    }
+
     fun onExtraSelect(type: Libs.SpecialButton?) {
         view?.run {
             when (type) {
                 SPECIAL1 -> {
-                    Timber.i("Opening github page")
-                    analytics.logEvent("open_page", mapOf("name" to "github"))
-                    openSourceWebView()
+                    Timber.i("Opening discord invide page")
+                    analytics.logEvent("open_page", "name" to "discord")
+                    openDiscordInviteView()
                 }
                 SPECIAL2 -> {
-                    Timber.i("Opening issues page")
-                    analytics.logEvent("open_page", mapOf("name" to "issues"))
-                    openIssuesWebView()
+                    Timber.i("Opening home page")
+                    analytics.logEvent("open_page", "name" to "home")
+                    openHomepageWebView()
                 }
                 SPECIAL3 -> {
-                    //empty for now
+                    Timber.i("Opening email client")
+                    analytics.logEvent("open_page", "name" to "email")
+                    openEmailClientView()
                 }
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index a3ae2ada..5b206ad8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -4,7 +4,9 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface AboutView : BaseView {
 
-    fun openSourceWebView()
+    fun openDiscordInviteView()
 
-    fun openIssuesWebView()
+    fun openEmailClientView()
+
+    fun openHomepageWebView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index e1459fe7..0fc6cc45 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -1,34 +1,41 @@
 package io.github.wulkanowy.ui.modules.account
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Single
+import timber.log.Timber
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor(
     private val errorHandler: ErrorHandler,
     private val studentRepository: StudentRepository,
+    private val syncManager: SyncManager,
     private val schedulers: SchedulersProvider
 ) : BasePresenter<AccountView>(errorHandler) {
 
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
+        Timber.i("Account dialog is attached")
         view.initView()
         loadData()
     }
 
     fun onAddSelected() {
+        Timber.i("Select add account")
         view?.openLoginView()
     }
 
     fun onRemoveSelected() {
+        Timber.i("Select remove account")
         view?.showConfirmDialog()
     }
 
     fun onLogoutConfirm() {
+        Timber.i("Attempt to logout current user ")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMapCompletable { studentRepository.logoutStudent(it) }
             .andThen(studentRepository.getSavedStudents(false))
@@ -41,31 +48,55 @@ class AccountPresenter @Inject constructor(
             .doFinally { view?.dismissView() }
             .subscribe({
                 view?.apply {
-                    if (it.isEmpty()) openClearLoginView()
-                    else recreateView()
+                    if (it.isEmpty()) {
+                        Timber.i("Logout result: Open login view")
+                        syncManager.stopSyncWorker()
+                        openClearLoginView()
+                    } else {
+                        Timber.i("Logout result: Switch to another student")
+                        recreateView()
+                    }
                 }
-            }, { errorHandler.dispatch(it) }))
+            }, {
+                Timber.i("Logout result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 
     fun onItemSelected(item: AbstractFlexibleItem<*>) {
         if (item is AccountItem) {
+            Timber.i("Select student item ${item.student.id}")
             if (item.student.isCurrent) {
                 view?.dismissView()
             } else {
+                Timber.i("Attempt to change a student")
                 disposable.add(studentRepository.switchStudent(item.student)
                     .subscribeOn(schedulers.backgroundThread)
                     .observeOn(schedulers.mainThread)
-                    .subscribe({ view?.recreateView() }, { errorHandler.dispatch(it) }))
+                    .subscribe({
+                        Timber.i("Change a student result: Success")
+                        view?.recreateView()
+                    }, {
+                        Timber.i("Change a student result: An exception occurred")
+                        errorHandler.dispatch(it)
+                    }))
             }
         }
     }
 
     private fun loadData() {
+        Timber.i("Loading account data started")
         disposable.add(studentRepository.getSavedStudents(false)
             .map { it.map { item -> AccountItem(item) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ view?.updateData(it) }, { errorHandler.dispatch(it) }))
+            .subscribe({
+                Timber.i("Loading account result: Success")
+                view?.updateData(it)
+            }, {
+                Timber.i("Loading account result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index 3b60d8cb..f0cab7f1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -8,6 +8,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
@@ -66,6 +67,10 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
         attendanceRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         attendanceSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
@@ -113,6 +118,10 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
         attendanceProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        attendanceSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         attendanceRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -130,7 +139,7 @@ class AttendanceFragment : BaseSessionFragment(), AttendanceView, MainView.MainC
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
-        AttendanceDialog.newInstance(lesson).show(fragmentManager, lesson.toString())
+        (activity as? MainActivity)?.showDialogFragment(AttendanceDialog.newInstance(lesson))
     }
 
     override fun openSummaryView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 9be87b44..988681b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.AttendanceRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -18,6 +18,7 @@ import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
+import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
@@ -36,6 +37,7 @@ class AttendancePresenter @Inject constructor(
 
     fun onAttachView(view: AttendanceView, date: Long?) {
         super.onAttachView(view)
+        Timber.i("Attendance view is attached")
         view.initView()
         loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
         reloadView()
@@ -52,10 +54,12 @@ class AttendancePresenter @Inject constructor(
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the attendance")
         loadData(currentDate, true)
     }
 
     fun onViewReselected() {
+        Timber.i("Attendance view is reselected")
         view?.also { view ->
             if (view.currentStackSize == 1) {
                 now().previousOrSameSchoolDay.also {
@@ -69,7 +73,10 @@ class AttendancePresenter @Inject constructor(
     }
 
     fun onAttendanceItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is AttendanceItem) view?.showAttendanceDialog(item.attendance)
+        if (item is AttendanceItem) {
+            Timber.i("Select attendance item ${item.attendance.id}")
+            view?.showAttendanceDialog(item.attendance)
+        }
     }
 
     fun onSummarySwitchSelected(): Boolean {
@@ -78,6 +85,7 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading attendance data started")
         currentDate = date
         disposable.apply {
             clear()
@@ -97,16 +105,19 @@ class AttendancePresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading attendance result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_attendance", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading attendance result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 }
@@ -115,8 +126,10 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun reloadView() {
+        Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index f839e89a..ef3b874b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -25,6 +25,8 @@ interface AttendanceView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showPreButton(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index 1a3fc16f..b8d2c952 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
+import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
@@ -96,12 +97,16 @@ class AttendanceSummaryFragment : BaseSessionFragment(), AttendanceSummaryView,
         attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        attendanceSummarySwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showSubjects(show: Boolean) {
-        attendanceSummarySubjects.visibility = if (show) VISIBLE else VISIBLE
+        attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun hideRefresh() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index 5086e80c..8b17f743 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -2,16 +2,17 @@ package io.github.wulkanowy.ui.modules.attendance.summary
 
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.SubjectRepostory
+import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calculatePercentage
 import io.github.wulkanowy.utils.getFormattedName
+import timber.log.Timber
 import java.lang.String.format
 import java.util.Locale.FRANCE
 import java.util.concurrent.TimeUnit.MILLISECONDS
@@ -20,7 +21,7 @@ import javax.inject.Inject
 class AttendanceSummaryPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
-    private val subjectRepository: SubjectRepostory,
+    private val subjectRepository: SubjectRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val schedulers: SchedulersProvider,
@@ -34,25 +35,32 @@ class AttendanceSummaryPresenter @Inject constructor(
 
     fun onAttachView(view: AttendanceSummaryView, subjectId: Int?) {
         super.onAttachView(view)
+        Timber.i("Attendance summary view is attached with subject id ${subjectId ?: -1}")
         view.initView()
         loadData(subjectId ?: -1)
         loadSubjects()
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the attendance summary")
         loadData(currentSubjectId, true)
     }
 
     fun onSubjectSelected(name: String) {
+        Timber.i("Select attendance summary subject $name")
         view?.run {
             showContent(false)
             showProgress(true)
+            enableSwipe(false)
             clearView()
         }
-        loadData(subjects.singleOrNull { it.name == name }?.realId ?: -1)
+        (subjects.singleOrNull { it.name == name }?.realId ?: -1).let {
+            if (it != currentSubjectId) loadData(it)
+        }
     }
 
     private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
+        Timber.i("Loading attendance summary data started")
         currentSubjectId = subjectId
         disposable.apply {
             clear()
@@ -67,16 +75,19 @@ class AttendanceSummaryPresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading attendance summary result: Success")
                     view?.apply {
                         showEmpty(it.first.isEmpty())
                         showContent(it.first.isNotEmpty())
                         updateDataSet(it.first, it.second)
                     }
-                    analytics.logEvent("load_attendance_summary", mapOf("items" to it.first.size, "force_refresh" to forceRefresh, "item_id" to subjectId))
+                    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)
                 }
@@ -85,6 +96,7 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
+        Timber.i("Loading attendance summary subjects started")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getCurrentSemester(it) }
             .flatMap { subjectRepository.getSubjects(it) }
@@ -93,11 +105,15 @@ class AttendanceSummaryPresenter @Inject constructor(
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .subscribe({
+                Timber.i("Loading attendance summary subjects result: Success")
                 view?.run {
                     view?.updateSubjects(it)
                     showSubjects(true)
                 }
-            }, { errorHandler.dispatch(it) })
+            }, {
+                Timber.i("Loading attendance summary subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
index af62a2de..e4c36db7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@@ -14,6 +14,8 @@ interface AttendanceSummaryView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showEmpty(show: Boolean)
 
     fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index d39688d4..97e97727 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -8,11 +8,13 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_exam.*
@@ -55,6 +57,10 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
         examRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = examAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider(R.layout.item_exam)
+                .withDrawDividerOnLastItem(false)
+            )
         }
         examSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
@@ -93,6 +99,10 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
         examProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        examSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         examRecycler.visibility = if (show) VISIBLE else GONE
     }
@@ -106,7 +116,7 @@ class ExamFragment : BaseSessionFragment(), ExamView, MainView.MainChildView, Ma
     }
 
     override fun showExamDialog(exam: Exam) {
-        ExamDialog.newInstance(exam).show(fragmentManager, exam.toString())
+        (activity as? MainActivity)?.showDialogFragment(ExamDialog.newInstance(exam))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index 88a0eaa5..4b6ef298 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -3,9 +3,9 @@ package io.github.wulkanowy.ui.modules.exam
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.exam.ExamRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -18,6 +18,7 @@ import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
+import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
@@ -35,6 +36,7 @@ class ExamPresenter @Inject constructor(
 
     fun onAttachView(view: ExamView, date: Long?) {
         super.onAttachView(view)
+        Timber.i("Exam view is attached")
         view.initView()
         loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
         reloadView()
@@ -51,14 +53,19 @@ class ExamPresenter @Inject constructor(
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the exam")
         loadData(currentDate, true)
     }
 
     fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is ExamItem) view?.showExamDialog(item.exam)
+        if (item is ExamItem) {
+            Timber.i("Select exam item ${item.exam.id}")
+            view?.showExamDialog(item.exam)
+        }
     }
 
     fun onViewReselected() {
+        Timber.i("Exam view is reselected")
         now().nextOrSameSchoolDay.also {
             if (currentDate != it) {
                 loadData(it)
@@ -68,6 +75,7 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading exam data started")
         currentDate = date
         disposable.apply {
             clear()
@@ -84,16 +92,19 @@ class ExamPresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading exam result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_exam", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading exam result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
@@ -109,8 +120,10 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun reloadView() {
+        Timber.i("Reload exam view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
index b6a926f3..2ced3f2d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@@ -23,6 +23,8 @@ interface ExamView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showNextButton(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
new file mode 100644
index 00000000..e6f01497
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/CustomTabLayout.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.ViewGroup
+import com.google.android.material.tabs.TabLayout
+
+/**
+ * @see <a href="https://stackoverflow.com/a/50382854">Tabs don't fit to screen with tabmode=scrollable, Even with a Custom Tab Layout</a>
+ */
+class CustomTabLayout : TabLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        setMeasuredDimension(widthMeasureSpec, heightMeasureSpec)
+        val tabLayout = getChildAt(0) as ViewGroup
+        val childCount = tabLayout.childCount
+
+        if (childCount == 0) return
+
+        val tabMinWidth = context.resources.displayMetrics.widthPixels / childCount
+
+        for (i in 0 until childCount) {
+            tabLayout.getChildAt(i).minimumWidth = tabMinWidth
+        }
+
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index a4d948a9..20d3fad7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -11,9 +11,10 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import io.github.wulkanowy.R
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 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
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnSelectPageListener
@@ -26,7 +27,9 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
     lateinit var presenter: GradePresenter
 
     @Inject
-    lateinit var pagerAdapter: BasePagerAdapter
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
+
+    private var semesterSwitchMenu: MenuItem? = null
 
     companion object {
         private const val SAVED_SEMESTER_KEY = "CURRENT_SEMESTER"
@@ -56,18 +59,27 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
 
     override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
         inflater?.inflate(R.menu.action_menu_grade, menu)
+        semesterSwitchMenu = menu?.findItem(R.id.gradeMenuSemester)
+        presenter.onCreateMenu()
     }
 
     override fun initView() {
-        pagerAdapter.fragments.putAll(mapOf(
-            getString(R.string.all_details) to GradeDetailsFragment.newInstance(),
-            getString(R.string.grade_menu_summary) to GradeSummaryFragment.newInstance()
-        ))
+        pagerAdapter.apply {
+            containerId = gradeViewPager.id
+            addFragmentsWithTitle(mapOf(
+                GradeDetailsFragment.newInstance() to getString(R.string.all_details),
+                GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
+                GradeStatisticsFragment.newInstance() to getString(R.string.grade_menu_statistics)
+            ))
+        }
+
         gradeViewPager.run {
             adapter = pagerAdapter
+            offscreenPageLimit = 3
             setOnSelectPageListener { presenter.onPageSelected(it) }
         }
         gradeTabLayout.setupWithViewPager(gradeViewPager)
+        gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
@@ -88,8 +100,20 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
         gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showEmpty() {
-        gradeEmpty.visibility = VISIBLE
+    override fun showEmpty(show: Boolean) {
+        gradeEmpty.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showRefresh(show: Boolean) {
+        gradeSwipe.isRefreshing = show
+    }
+
+    override fun showSemesterSwitch(show: Boolean) {
+        semesterSwitchMenu?.isVisible = show
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        gradeSwipe.isEnabled = enable
     }
 
     override fun showSemesterDialog(selectedIndex: Int) {
@@ -117,15 +141,15 @@ class GradeFragment : BaseSessionFragment(), GradeView, MainView.MainChildView,
     }
 
     override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) {
-        (childFragmentManager.fragments[index] as GradeView.GradeChildView).onParentLoadData(semesterId, forceRefresh)
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentLoadData(semesterId, forceRefresh)
     }
 
     override fun notifyChildParentReselected(index: Int) {
-        (pagerAdapter.registeredFragments[index] as? GradeView.GradeChildView)?.onParentReselected()
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentReselected()
     }
 
     override fun notifyChildSemesterChange(index: Int) {
-        (pagerAdapter.registeredFragments[index] as? GradeView.GradeChildView)?.onParentChangeSemester()
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentChangeSemester()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
index c47ddc57..46a923d9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -5,8 +5,9 @@ import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerChildFragment
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
+import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
 @Module
@@ -18,7 +19,7 @@ abstract class GradeModule {
         @JvmStatic
         @PerFragment
         @Provides
-        fun provideGradePagerAdapter(fragment: GradeFragment) = BasePagerAdapter(fragment.childFragmentManager)
+        fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
     }
 
     @PerChildFragment
@@ -28,4 +29,8 @@ abstract class GradeModule {
     @PerChildFragment
     @ContributesAndroidInjector
     abstract fun binGradeSummaryFragment(): GradeSummaryFragment
+
+    @PerChildFragment
+    @ContributesAndroidInjector
+    abstract fun binGradeStatisticsFragment(): GradeStatisticsFragment
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index d2dd8031..98eb2a9f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -1,13 +1,14 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Completable
+import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
@@ -28,15 +29,24 @@ class GradePresenter @Inject constructor(
 
     fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
+        Timber.i("Grade view is attached")
         disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
             .subscribe {
                 selectedIndex = savedIndex ?: 0
-                view.initView()
+                view.run {
+                    initView()
+                    enableSwipe(false)
+                }
                 loadData()
             })
     }
 
+    fun onCreateMenu() {
+        if (semesters.isEmpty()) view?.showSemesterSwitch(false)
+    }
+
     fun onViewReselected() {
+        Timber.i("Grade view is reselected")
         view?.run { notifyChildParentReselected(currentPageIndex) }
     }
 
@@ -47,13 +57,14 @@ class GradePresenter @Inject constructor(
 
     fun onSemesterSelected(index: Int) {
         if (selectedIndex != index - 1) {
+            Timber.i("Change semester in grade view to ${index + 1}")
             selectedIndex = index + 1
             loadedSemesterId.clear()
             view?.let {
                 notifyChildrenSemesterChange()
                 loadChild(it.currentPageIndex)
             }
-            analytics.logEvent("changed_semester", mapOf("number" to index + 1))
+            analytics.logEvent("changed_semester", "number" to index + 1)
         }
     }
 
@@ -65,6 +76,7 @@ class GradePresenter @Inject constructor(
         view?.apply {
             showContent(true)
             showProgress(false)
+            showEmpty(false)
             loadedSemesterId[currentPageIndex] = semesterId
         }
     }
@@ -73,7 +85,12 @@ class GradePresenter @Inject constructor(
         loadChild(index)
     }
 
+    fun onSwipeRefresh() {
+        loadData()
+    }
+
     private fun loadData() {
+        Timber.i("Loading grade data started")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it) }
             .doOnSuccess {
@@ -84,11 +101,21 @@ class GradePresenter @Inject constructor(
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ view?.run { loadChild(currentPageIndex) } }) {
+            .doFinally { view?.showRefresh(false) }
+            .subscribe({
+                view?.run {
+                    Timber.i("Loading grade result: Attempt load index $currentPageIndex")
+                    loadChild(currentPageIndex)
+                    enableSwipe(false)
+                    showSemesterSwitch(true)
+                }
+            }) {
+                Timber.i("Loading grade result: An exception occurred")
                 errorHandler.dispatch(it)
                 view?.run {
                     showProgress(false)
-                    showEmpty()
+                    showEmpty(true)
+                    enableSwipe(true)
                 }
             })
     }
@@ -96,12 +123,13 @@ class GradePresenter @Inject constructor(
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
         semesters.first { it.semesterName == selectedIndex }.semesterId.also {
             if (forceRefresh || loadedSemesterId[index] != it) {
+                Timber.i("Load grade child view index: $index")
                 view?.notifyChildLoadData(index, it, forceRefresh)
             }
         }
     }
 
     private fun notifyChildrenSemesterChange() {
-        for (i in 0..1) view?.notifyChildSemesterChange(i)
+        for (i in 0..2) view?.notifyChildSemesterChange(i)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
index 3f1a197c..9fdd46b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@@ -12,10 +12,16 @@ interface GradeView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
-    fun showEmpty()
+    fun showEmpty(show: Boolean)
+
+    fun showRefresh(show: Boolean)
+
+    fun showSemesterSwitch(show: Boolean)
 
     fun showSemesterDialog(selectedIndex: Int)
 
+    fun enableSwipe(enable: Boolean)
+
     fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
 
     fun notifyChildParentReselected(index: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 19b462b1..0abeaeea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -9,21 +9,26 @@ import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.utils.colorStringId
+import io.github.wulkanowy.utils.getBackgroundColor
 import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.valueColor
 import kotlinx.android.synthetic.main.dialog_grade.*
 
-
 class GradeDetailsDialog : DialogFragment() {
 
     private lateinit var grade: Grade
 
+    private lateinit var colorScheme: String
+
     companion object {
         private const val ARGUMENT_KEY = "Item"
+        private const val COLOR_SCHEME_KEY = "Scheme"
 
-        fun newInstance(grade: Grade): GradeDetailsDialog {
+        fun newInstance(grade: Grade, colorScheme: String): GradeDetailsDialog {
             return GradeDetailsDialog().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, grade) }
+                arguments = Bundle().apply {
+                    putSerializable(ARGUMENT_KEY, grade)
+                    putString(COLOR_SCHEME_KEY, colorScheme)
+                }
             }
         }
     }
@@ -33,6 +38,7 @@ class GradeDetailsDialog : DialogFragment() {
         setStyle(STYLE_NO_TITLE, 0)
         arguments?.run {
             grade = getSerializable(ARGUMENT_KEY) as Grade
+            colorScheme = getString(COLOR_SCHEME_KEY) ?: "default"
         }
     }
 
@@ -57,7 +63,7 @@ class GradeDetailsDialog : DialogFragment() {
 
         gradeDialogValue.run {
             text = grade.entry
-            setBackgroundResource(grade.valueColor)
+            setBackgroundResource(grade.getBackgroundColor(colorScheme))
         }
 
         gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index a9ee9ce2..205cde77 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -20,6 +20,7 @@ import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject
@@ -45,6 +46,9 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
     override val weightString: String
         get() = getString(R.string.grade_weight)
 
+    override val noDescriptionString: String
+        get() = getString(R.string.all_no_description)
+
     override val isViewEmpty
         get() = gradeDetailsAdapter.isEmpty
 
@@ -77,6 +81,9 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         gradeDetailsRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = gradeDetailsAdapter
+            addItemDecoration(GradeDetailsHeaderItemDecoration(context)
+                .withDefaultDivider(R.layout.header_grade_details)
+            )
         }
         gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
@@ -103,7 +110,7 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
     }
 
     override fun scrollToStart() {
-        gradeDetailsAdapter.smoothScrollToPosition(0)
+        gradeDetailsRecycler.scrollToPosition(0)
     }
 
     override fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>? {
@@ -118,6 +125,10 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        gradeDetailsSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
@@ -130,8 +141,8 @@ class GradeDetailsFragment : BaseSessionFragment(), GradeDetailsView, GradeView.
         gradeDetailsSwipe.isRefreshing = show
     }
 
-    override fun showGradeDialog(grade: Grade) {
-        GradeDetailsDialog.newInstance(grade).show(fragmentManager, grade.toString())
+    override fun showGradeDialog(grade: Grade, colorScheme: String) {
+        (activity as? MainActivity)?.showDialogFragment(GradeDetailsDialog.newInstance(grade, colorScheme))
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
index 5dec00a9..e5f6e824 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
@@ -38,6 +38,7 @@ class GradeDetailsHeader(
             gradeHeaderAverage.text = average
             gradeHeaderNumber.text = number
             gradeHeaderNote.visibility = if (newGrades > 0) VISIBLE else GONE
+            gradeHeaderContainer.isEnabled = isExpandable
 
             isViewExpandable = isExpandable
         }
@@ -52,6 +53,7 @@ class GradeDetailsHeader(
         if (subject != other.subject) return false
         if (number != other.number) return false
         if (average != other.average) return false
+        if (isExpandable != other.isExpandable) return false
 
         return true
     }
@@ -60,6 +62,7 @@ class GradeDetailsHeader(
         var result = subject.hashCode()
         result = 31 * result + number.hashCode()
         result = 31 * result + average.hashCode()
+        result = 31 * result + isExpandable.hashCode()
         return result
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
new file mode 100644
index 00000000..39a911e6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.content.Context
+import android.graphics.Canvas
+import androidx.recyclerview.widget.RecyclerView
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
+
+class GradeDetailsHeaderItemDecoration(context: Context) : FlexibleItemDecoration(context) {
+
+    override fun drawVertical(canvas: Canvas, parent: RecyclerView) {
+        canvas.save()
+        val left: Int
+        val right: Int
+        if (parent.clipToPadding) {
+            left = parent.paddingLeft
+            right = parent.width - parent.paddingRight
+            canvas.clipRect(left, parent.paddingTop, right,
+                parent.height - parent.paddingBottom)
+        } else {
+            left = 0
+            right = parent.width
+        }
+
+        val itemCount = parent.childCount
+        for (i in 1 until itemCount) {
+            val child = parent.getChildAt(i)
+            val viewHolder = parent.getChildViewHolder(child)
+            if (shouldDrawDivider(viewHolder)) {
+                parent.getDecoratedBoundsWithMargins(child, mBounds)
+                val bottom = mBounds.top + Math.round(child.translationY)
+                val top = bottom - mDivider.intrinsicHeight
+                mDivider.setBounds(left, top, right, bottom)
+                mDivider.draw(canvas)
+            }
+        }
+        canvas.restore()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 18c2656d..de1d88f7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -14,8 +14,12 @@ import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_grade_details.*
 
-class GradeDetailsItem(val grade: Grade, private val weightString: String, private val valueColor: Int)
-    : AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
+class GradeDetailsItem(
+    val grade: Grade,
+    private val valueBgColor: Int,
+    private val weightString: String,
+    private val noDescriptionString: String
+) : AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
 
     override fun getLayoutRes() = R.layout.item_grade_details
 
@@ -24,14 +28,20 @@ class GradeDetailsItem(val grade: Grade, private val weightString: String, priva
     }
 
     @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
-                                position: Int, payloads: MutableList<Any>?) {
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
         holder.run {
             gradeItemValue.run {
                 text = grade.entry
-                setBackgroundResource(valueColor)
+                setBackgroundResource(valueBgColor)
+            }
+            gradeItemDescription.text = when {
+                grade.description.isNotBlank() -> grade.description
+                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
+                else -> noDescriptionString
             }
-            gradeItemDescription.text = if (grade.description.isNotBlank()) grade.description else grade.gradeSymbol
             gradeItemDate.text = grade.date.toFormattedString()
             gradeItemWeight.text = "$weightString: ${grade.weight}"
             gradeItemNote.visibility = if (!grade.isRead) VISIBLE else GONE
@@ -45,22 +55,23 @@ class GradeDetailsItem(val grade: Grade, private val weightString: String, priva
         other as GradeDetailsItem
 
         if (grade != other.grade) return false
+        if (grade.id != other.grade.id) return false
         if (weightString != other.weightString) return false
-        if (valueColor != other.valueColor) return false
+        if (valueBgColor != other.valueBgColor) return false
 
         return true
     }
 
     override fun hashCode(): Int {
         var result = grade.hashCode()
+        result = 31 * result + grade.id.toInt()
         result = 31 * result + weightString.hashCode()
-        result = 31 * result + valueColor
+        result = 31 * result + valueBgColor
         return result
     }
 
-
     class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-            LayoutContainer {
+        LayoutContainer {
 
         override val containerView: View
             get() = contentView
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index b80a7108..1be0b36f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -2,17 +2,17 @@ package io.github.wulkanowy.ui.modules.grade.details
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
-import io.github.wulkanowy.utils.valueColor
+import io.github.wulkanowy.utils.getBackgroundColor
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -40,8 +40,9 @@ class GradeDetailsPresenter @Inject constructor(
 
     fun onGradeItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is GradeDetailsItem) {
+            Timber.i("Select grade item ${item.grade.id}")
             view?.apply {
-                showGradeDialog(item.grade)
+                showGradeDialog(item.grade, preferencesRepository.gradeColorTheme)
                 if (!item.grade.isRead) {
                     item.grade.isRead = true
                     updateItem(item)
@@ -58,18 +59,29 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     fun onMarkAsReadSelected(): Boolean {
+        Timber.i("Select mark grades as read")
         disposable.add(studentRepository.getCurrentStudent()
             .flatMap { semesterRepository.getSemesters(it) }
-            .flatMap { gradeRepository.getNewGrades(it.first { item -> item.semesterId == currentSemesterId }) }
+            .flatMap { gradeRepository.getUnreadGrades(it.first { item -> item.semesterId == currentSemesterId }) }
             .map { it.map { grade -> grade.apply { isRead = true } } }
-            .flatMapCompletable { gradeRepository.updateGrades(it) }
+            .flatMapCompletable {
+                Timber.i("Mark as read ${it.size} grades")
+                gradeRepository.updateGrades(it)
+            }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ loadData(currentSemesterId, false) }, { errorHandler.dispatch(it) }))
+            .subscribe({
+                Timber.i("Mark as read result: Success")
+                loadData(currentSemesterId, false)
+            }, {
+                Timber.i("Mark as read result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the grade details")
         view?.notifyParentRefresh()
     }
 
@@ -85,6 +97,7 @@ class GradeDetailsPresenter @Inject constructor(
     fun onParentViewChangeSemester() {
         view?.run {
             showProgress(true)
+            enableSwipe(false)
             showRefresh(false)
             showContent(false)
             showEmpty(false)
@@ -94,9 +107,11 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
+        Timber.i("Loading grade details data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMap { gradeRepository.getGrades(it.first { item -> item.semesterId == semesterId }, forceRefresh) }
+            .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
+            .flatMap { gradeRepository.getGrades(it.second, it.first.first { item -> item.semesterId == semesterId }, forceRefresh) }
+            .map { it.sortedByDescending { grade -> grade.date } }
             .map { it.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) } }
             .map { createGradeItems(it.groupBy { grade -> grade.subject }.toSortedMap()) }
             .subscribeOn(schedulers.backgroundThread)
@@ -105,17 +120,20 @@ class GradeDetailsPresenter @Inject constructor(
                 view?.run {
                     showRefresh(false)
                     showProgress(false)
+                    enableSwipe(true)
                     notifyParentDataLoaded(semesterId)
                 }
             }
             .subscribe({
+                Timber.i("Loading grade details result: Success")
                 view?.run {
                     showEmpty(it.isEmpty())
                     showContent(it.isNotEmpty())
                     updateData(it)
                 }
-                analytics.logEvent("load_grade_details", mapOf("items" to it.size, "force_refresh" to forceRefresh))
+                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)
             })
@@ -134,8 +152,9 @@ class GradeDetailsPresenter @Inject constructor(
                     subItems = it.value.map { item ->
                         GradeDetailsItem(
                             grade = item,
+                            valueBgColor = item.getBackgroundColor(preferencesRepository.gradeColorTheme),
                             weightString = view?.weightString.orEmpty(),
-                            valueColor = item.valueColor
+                            noDescriptionString = view?.noDescriptionString.orEmpty()
                         )
                     }
                 }
@@ -151,10 +170,14 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun updateGrade(grade: Grade) {
+        Timber.i("Attempt to update grade ${grade.id}")
         disposable.add(gradeRepository.updateGrade(grade)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({}) { error -> errorHandler.dispatch(error) })
-        Timber.d("Grade ${grade.id} updated")
+            .subscribe({ Timber.i("Update grade result: Success") })
+            { error ->
+                Timber.i("Update grade result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
index 24254260..1fb98216 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@@ -16,6 +16,8 @@ interface GradeDetailsView : BaseSessionView {
 
     val weightString: String
 
+    val noDescriptionString: String
+
     fun initView()
 
     fun updateData(data: List<GradeDetailsHeader>)
@@ -28,7 +30,7 @@ interface GradeDetailsView : BaseSessionView {
 
     fun collapseAllItems()
 
-    fun showGradeDialog(grade: Grade)
+    fun showGradeDialog(grade: Grade, colorScheme: String)
 
     fun showContent(show: Boolean)
 
@@ -36,6 +38,8 @@ interface GradeDetailsView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showRefresh(show: Boolean)
 
     fun notifyParentDataLoaded(semesterId: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
new file mode 100644
index 00000000..f27a13c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -0,0 +1,214 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import android.graphics.Color.WHITE
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.components.LegendEntry
+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.GradeStatistics
+import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.grade.GradeFragment
+import io.github.wulkanowy.ui.modules.grade.GradeView
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.setOnItemSelectedListener
+import kotlinx.android.synthetic.main.fragment_grade_statistics.*
+import javax.inject.Inject
+
+class GradeStatisticsFragment : BaseSessionFragment(), GradeStatisticsView, GradeView.GradeChildView {
+
+    @Inject
+    lateinit var presenter: GradeStatisticsPresenter
+
+    private lateinit var subjectsAdapter: ArrayAdapter<String>
+
+    companion object {
+        private const val SAVED_CHART_TYPE = "CURRENT_TYPE"
+
+        fun newInstance() = GradeStatisticsFragment()
+    }
+
+    override val isViewEmpty
+        get() = gradeStatisticsChart.isEmpty
+
+    private lateinit var gradeColors: List<Pair<Int, Int>>
+
+    private val vulcanGradeColors = listOf(
+        6 to R.color.grade_vulcan_six,
+        5 to R.color.grade_vulcan_five,
+        4 to R.color.grade_vulcan_four,
+        3 to R.color.grade_vulcan_three,
+        2 to R.color.grade_vulcan_two,
+        1 to R.color.grade_vulcan_one
+    )
+
+    private val materialGradeColors = listOf(
+        6 to R.color.grade_material_six,
+        5 to R.color.grade_material_five,
+        4 to R.color.grade_material_four,
+        3 to R.color.grade_material_three,
+        2 to R.color.grade_material_two,
+        1 to R.color.grade_material_one
+    )
+
+    private val gradeLabels = listOf(
+        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
+    )
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_grade_statistics, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = gradeStatisticsChart
+        presenter.onAttachView(this, savedInstanceState?.getBoolean(SAVED_CHART_TYPE))
+    }
+
+    override fun initView() {
+        gradeStatisticsChart.run {
+            description.isEnabled = false
+            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
+            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
+            animateXY(1000, 1000)
+            minAngleForSlices = 25f
+            legend.apply {
+                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            }
+        }
+
+        context?.let {
+            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
+            subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
+        }
+
+        gradeStatisticsSubjects.run {
+            adapter = subjectsAdapter
+            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+        }
+
+        gradeStatisticsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+    }
+
+    override fun updateSubjects(data: ArrayList<String>) {
+        subjectsAdapter.run {
+            clear()
+            addAll(data)
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun updateData(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 {
+                setTouchEnabled(false)
+                setValueFormatter(object : ValueFormatter() {
+                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
+                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
+                    }
+                })
+                centerText = items.fold(0) { acc, it -> acc + it.amount }
+                    .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
+            }
+            legend.apply {
+                setCustom(gradeLabels.mapIndexed { i, it ->
+                    LegendEntry().apply {
+                        label = it
+                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
+                        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
+    }
+
+    override fun clearView() {
+        gradeStatisticsChart.clear()
+    }
+
+    override fun showContent(show: Boolean) {
+        gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showEmpty(show: Boolean) {
+        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showProgress(show: Boolean) {
+        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        gradeStatisticsSwipe.isEnabled = enable
+    }
+
+    override fun showRefresh(show: Boolean) {
+        gradeStatisticsSwipe.isRefreshing = show
+    }
+
+    override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
+        presenter.onParentViewLoadData(semesterId, forceRefresh)
+    }
+
+    override fun onParentReselected() {
+        //
+    }
+
+    override fun onParentChangeSemester() {
+        presenter.onParentViewChangeSemester()
+    }
+
+    override fun notifyParentDataLoaded(semesterId: Int) {
+        (parentFragment as? GradeFragment)?.onChildFragmentLoaded(semesterId)
+    }
+
+    override fun notifyParentRefresh() {
+        (parentFragment as? GradeFragment)?.onChildRefresh()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+            presenter.onTypeChange(checkedId == R.id.gradeStatisticsTypeSemester)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(GradeStatisticsFragment.SAVED_CHART_TYPE, presenter.currentIsSemester)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        presenter.onDetachView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
new file mode 100644
index 00000000..5111420d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -0,0 +1,147 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.subject.SubjectRepository
+import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
+import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
+import javax.inject.Inject
+
+class GradeStatisticsPresenter @Inject constructor(
+    private val errorHandler: SessionErrorHandler,
+    private val gradeStatisticsRepository: GradeStatisticsRepository,
+    private val subjectRepository: SubjectRepository,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val schedulers: SchedulersProvider,
+    private val analytics: FirebaseAnalyticsHelper
+) : BaseSessionPresenter<GradeStatisticsView>(errorHandler) {
+
+    private var subjects = emptyList<Subject>()
+
+    private var currentSemesterId = 0
+
+    private var currentSubjectName: String = "Wszystkie"
+
+    var currentIsSemester = false
+        private set
+
+    fun onAttachView(view: GradeStatisticsView, isSemester: Boolean?) {
+        super.onAttachView(view)
+        currentIsSemester = isSemester ?: false
+        view.initView()
+    }
+
+    fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
+        currentSemesterId = semesterId
+        loadSubjects()
+        loadData(semesterId, currentSubjectName, currentIsSemester, forceRefresh)
+    }
+
+    fun onParentViewChangeSemester() {
+        view?.run {
+            showProgress(true)
+            enableSwipe(false)
+            showRefresh(false)
+            showContent(false)
+            showEmpty(false)
+            clearView()
+        }
+        disposable.clear()
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the grade stats")
+        view?.notifyParentRefresh()
+    }
+
+    fun onSubjectSelected(name: String) {
+        Timber.i("Select attendance stats subject $name")
+        view?.run {
+            showContent(false)
+            showProgress(true)
+            enableSwipe(false)
+            showEmpty(false)
+            clearView()
+        }
+        (subjects.singleOrNull { it.name == name }?.name).let {
+            if (it != currentSubjectName) loadData(currentSemesterId, name, currentIsSemester)
+        }
+    }
+
+    fun onTypeChange(isSemester: Boolean) {
+        Timber.i("Select attendance stats semester: $isSemester")
+        disposable.clear()
+        view?.run {
+            showContent(false)
+            showProgress(true)
+            enableSwipe(false)
+            showEmpty(false)
+            clearView()
+        }
+        loadData(currentSemesterId, currentSubjectName, isSemester)
+    }
+
+    private fun loadSubjects() {
+        Timber.i("Loading grade stats subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .flatMap { subjectRepository.getSubjects(it) }
+            .doOnSuccess { subjects = it }
+            .map { ArrayList(it.map { subject -> subject.name }) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading grade stats subjects result: Success")
+                view?.run {
+                    updateSubjects(it)
+                    showSubjects(true)
+                }
+            }, {
+                Timber.e("Loading grade stats subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
+    }
+
+    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) }
+            .map { list -> list.sortedByDescending { it.grade } }
+            .map { list -> list.filter { it.amount != 0 } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
+                }
+            }
+            .subscribe({
+                Timber.i("Loading grade stats result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    updateData(it, preferencesRepository.gradeColorTheme)
+                }
+                analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
+            }) {
+                Timber.e("Loading grade stats result: An exception occurred")
+                view?.run { showEmpty(isViewEmpty) }
+                errorHandler.dispatch(it)
+            })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
new file mode 100644
index 00000000..dbdde459
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.ui.base.session.BaseSessionView
+
+interface GradeStatisticsView : BaseSessionView {
+
+    val isViewEmpty: Boolean
+
+    fun initView()
+
+    fun updateSubjects(data: ArrayList<String>)
+
+    fun updateData(items: List<GradeStatistics>, theme: String)
+
+    fun showSubjects(show: Boolean)
+
+    fun notifyParentDataLoaded(semesterId: Int)
+
+    fun notifyParentRefresh()
+
+    fun clearView()
+
+    fun showContent(show: Boolean)
+
+    fun showEmpty(show: Boolean)
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showRefresh(show: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index 13833b74..f174f96c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -71,7 +71,7 @@ class GradeSummaryFragment : BaseSessionFragment(), GradeSummaryView, GradeView.
     }
 
     override fun resetView() {
-        gradeSummaryAdapter.smoothScrollToPosition(0)
+        gradeSummaryRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
@@ -86,6 +86,10 @@ class GradeSummaryFragment : BaseSessionFragment(), GradeSummaryView, GradeView.
         gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        gradeSummarySwipe.isEnabled = enable
+    }
+
     override fun showRefresh(show: Boolean) {
         gradeSummarySwipe.isRefreshing = show
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt
deleted file mode 100644
index fba3fde6..00000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryHeader.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_grade_summary.*
-
-class GradeSummaryHeader(private val name: String, private val average: String) : AbstractHeaderItem<GradeSummaryHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.header_grade_summary
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder?.run {
-            gradeSummaryHeaderName.text = name
-            gradeSummaryHeaderAverage.text = average
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeSummaryHeader
-
-        if (name != other.name) return false
-        if (average != other.average) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = name.hashCode()
-        result = 31 * result + average.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) :
-            FlexibleViewHolder(view, adapter), LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
index 54302fa6..0daf0665 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
@@ -2,16 +2,19 @@ package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradeSummary
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_grade_summary.*
 
-class GradeSummaryItem(header: GradeSummaryHeader, private val grade: String, private val title: String) :
-    AbstractSectionableItem<GradeSummaryItem.ViewHolder, GradeSummaryHeader>(header) {
+class GradeSummaryItem(
+    private val title: String,
+    private val average: String,
+    private val predictedGrade: String,
+    private val finalGrade: String
+) : AbstractFlexibleItem<GradeSummaryItem.ViewHolder>() {
 
     override fun getLayoutRes() = R.layout.item_grade_summary
 
@@ -24,8 +27,10 @@ class GradeSummaryItem(header: GradeSummaryHeader, private val grade: String, pr
         position: Int, payloads: MutableList<Any>?
     ) {
         holder?.run {
-            gradeSummaryItemGrade.text = grade
             gradeSummaryItemTitle.text = title
+            gradeSummaryItemAverage.text = average
+            gradeSummaryItemPredicted.text = predictedGrade
+            gradeSummaryItemFinal.text = finalGrade
         }
     }
 
@@ -35,17 +40,19 @@ class GradeSummaryItem(header: GradeSummaryHeader, private val grade: String, pr
 
         other as GradeSummaryItem
 
-        if (grade != other.grade) return false
+        if (average != other.average) return false
         if (title != other.title) return false
-        if (header != other.header) return false
+        if (predictedGrade != other.predictedGrade) return false
+        if (finalGrade != other.finalGrade) return false
 
         return true
     }
 
     override fun hashCode(): Int {
-        var result = header.hashCode()
-        result = 31 * result + grade.hashCode()
-        result = 31 * result + title.hashCode()
+        var result = title.hashCode()
+        result = 31 * result + average.hashCode()
+        result = 31 * result + predictedGrade.hashCode()
+        result = 31 * result + finalGrade.hashCode()
         return result
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index a67ad894..5dbf7513 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,17 +1,18 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
+import timber.log.Timber
 import java.lang.String.format
 import java.util.Locale.FRANCE
 import javax.inject.Inject
@@ -33,13 +34,14 @@ class GradeSummaryPresenter @Inject constructor(
     }
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
+        Timber.i("Loading grade summary data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .map { semester -> semester.first { it.semesterId == semesterId } }
+            .flatMap { semesterRepository.getSemesters(it).map { semester -> semester to it } }
+            .map { pair -> pair.first.first { it.semesterId == semesterId } to pair.second }
             .flatMap {
-                gradeSummaryRepository.getGradesSummary(it, forceRefresh)
+                gradeSummaryRepository.getGradesSummary(it.first, forceRefresh)
                     .flatMap { gradesSummary ->
-                        gradeRepository.getGrades(it, forceRefresh)
+                        gradeRepository.getGrades(it.second, it.first, forceRefresh)
                             .map { grades ->
                                 grades.map { item -> item.changeModifier(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier) }
                                     .groupBy { grade -> grade.subject }
@@ -61,22 +63,26 @@ class GradeSummaryPresenter @Inject constructor(
                 view?.run {
                     showRefresh(false)
                     showProgress(false)
+                    enableSwipe(true)
                     notifyParentDataLoaded(semesterId)
                 }
             }.subscribe({
+                Timber.i("Loading grade summary result: Success")
                 view?.run {
                     showEmpty(it.first.isEmpty())
                     showContent(it.first.isNotEmpty())
                     updateData(it.first, it.second)
                 }
-                analytics.logEvent("load_grade_summary", mapOf("items" to it.first.size, "force_refresh" to forceRefresh))
+                analytics.logEvent("load_grade_summary", "items" to it.first.size, "force_refresh" to forceRefresh)
             }) {
+                Timber.i("Loading grade summary result: An exception occurred")
                 view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the grade summary")
         view?.notifyParentRefresh()
     }
 
@@ -89,6 +95,7 @@ class GradeSummaryPresenter @Inject constructor(
     fun onParentViewChangeSemester() {
         view?.run {
             showProgress(true)
+            enableSwipe(false)
             showRefresh(false)
             showContent(false)
             showEmpty(false)
@@ -99,23 +106,14 @@ class GradeSummaryPresenter @Inject constructor(
 
     private fun createGradeSummaryItems(gradesSummary: List<GradeSummary>, averages: Map<String, Double>)
         : List<GradeSummaryItem> {
-        return gradesSummary.filter { !checkEmpty(it, averages) }
-            .flatMap { gradeSummary ->
-                GradeSummaryHeader(
-                    name = gradeSummary.subject,
-                    average = formatAverage(averages.getOrElse(gradeSummary.subject) { 0.0 }, "")
-                ).let {
-                    listOf(GradeSummaryItem(
-                        header = it,
-                        title = view?.predictedString.orEmpty(),
-                        grade = gradeSummary.predictedGrade
-                    ), GradeSummaryItem(
-                        header = it,
-                        title = view?.finalString.orEmpty(),
-                        grade = gradeSummary.finalGrade
-                    ))
-                }
-            }
+        return gradesSummary.filter { !checkEmpty(it, averages) }.map { it ->
+            GradeSummaryItem(
+                title = it.subject,
+                average = formatAverage(averages.getOrElse(it.subject) { 0.0 }, ""),
+                predictedGrade = it.predictedGrade,
+                finalGrade = it.finalGrade
+            )
+        }
     }
 
     private fun checkEmpty(gradeSummary: GradeSummary, averages: Map<String, Double>): Boolean {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
index 2602ec99..5f7c7b16 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
@@ -20,6 +20,8 @@ interface GradeSummaryView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showRefresh(show: Boolean)
 
     fun showContent(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index 135098fb..7325e3ec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -5,11 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_homework.*
@@ -50,6 +52,10 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
         homeworkRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = homeworkAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         homeworkSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
@@ -64,7 +70,7 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
         homeworkAdapter.clear()
     }
 
-    override fun updateNavigationDay(date: String) {
+    override fun updateNavigationWeek(date: String) {
         homeworkNavDate.text = date
     }
 
@@ -82,6 +88,10 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
         homeworkProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        homeworkSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         homeworkRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -95,7 +105,7 @@ class HomeworkFragment : BaseSessionFragment(), HomeworkView, MainView.TitledVie
     }
 
     override fun showTimetableDialog(homework: Homework) {
-        HomeworkDialog.newInstance(homework).show(fragmentManager, homework.toString())
+        (activity as? MainActivity)?.showDialogFragment(HomeworkDialog.newInstance(homework))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
new file mode 100644
index 00000000..49023788
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.homework
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractHeaderItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.ExpandableViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.header_homework.*
+import org.threeten.bp.LocalDate
+
+class HomeworkHeader(private val date: LocalDate) : AbstractHeaderItem<HomeworkHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.header_homework
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
+        return ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(
+        adapter: FlexibleAdapter<IFlexible<*>>?, holder: HomeworkHeader.ViewHolder,
+        position: Int, payloads: MutableList<Any>?
+    ) {
+        holder.run {
+            homeworkHeaderDay.text = date.weekDayName.capitalize()
+            homeworkHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as HomeworkHeader
+
+        if (date != other.date) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return date.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
index 97ff188c..a2b8cc0a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
@@ -1,9 +1,8 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
@@ -11,15 +10,16 @@ import io.github.wulkanowy.data.db.entities.Homework
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_homework.*
 
-class HomeworkItem(val homework: Homework) : AbstractFlexibleItem<HomeworkItem.ViewHolder>() {
+class HomeworkItem(
+    header: HomeworkHeader, val homework: Homework
+) : AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
 
-    override fun getLayoutRes(): Int = R.layout.item_homework
+    override fun getLayoutRes() = R.layout.item_homework
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
         return ViewHolder(view, adapter)
     }
 
-    @SuppressLint("SetTextI18n")
     override fun bindViewHolder(
         adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder,
         position: Int, payloads: MutableList<Any>?
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index e4d42745..739d4494 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -2,19 +2,21 @@ package io.github.wulkanowy.ui.modules.homework
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -32,69 +34,90 @@ class HomeworkPresenter @Inject constructor(
 
     fun onAttachView(view: HomeworkView, date: Long?) {
         super.onAttachView(view)
+        Timber.i("Homework view is attached")
         view.initView()
         loadData(LocalDate.ofEpochDay(date ?: LocalDate.now().nextOrSameSchoolDay.toEpochDay()))
         reloadView()
     }
 
     fun onPreviousDay() {
-        loadData(currentDate.previousSchoolDay)
+        loadData(currentDate.minusDays(7))
         reloadView()
     }
 
     fun onNextDay() {
-        loadData(currentDate.nextSchoolDay)
+        loadData(currentDate.plusDays(7))
         reloadView()
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the homework")
         loadData(currentDate, true)
     }
 
     fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is HomeworkItem) view?.showTimetableDialog(item.homework)
+        if (item is HomeworkItem) {
+            Timber.i("Select homework item ${item.homework.id}")
+            view?.showTimetableDialog(item.homework)
+        }
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading homework data started")
         currentDate = date
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
                 .delay(200, TimeUnit.MILLISECONDS)
                 .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { homeworkRepository.getHomework(it, currentDate, forceRefresh) }
-                .map { items -> items.map { HomeworkItem(it) } }
+                .flatMap { homeworkRepository.getHomework(it, currentDate, currentDate, forceRefresh) }
+                .map { it.groupBy { homework -> homework.date }.toSortedMap() }
+                .map { createHomeworkItem(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally {
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading homework result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_homework", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_homework", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading homework result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty()) }
                     errorHandler.dispatch(it)
                 })
         }
     }
 
+    private fun createHomeworkItem(items: Map<LocalDate, List<Homework>>): List<HomeworkItem> {
+        return items.flatMap {
+            HomeworkHeader(it.key).let { header ->
+                it.value.reversed().map { item -> HomeworkItem(header, item) }
+            }
+        }
+    }
+
     private fun reloadView() {
+        Timber.i("Reload homework view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
-            showPreButton(!currentDate.minusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
+            showNextButton(!currentDate.plusDays(7).isHolidays)
+            showPreButton(!currentDate.minusDays(7).isHolidays)
+            updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
+                currentDate.friday.toFormattedString("dd.MM"))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
index 521020e6..546d0526 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
@@ -11,7 +11,7 @@ interface HomeworkView : BaseSessionView {
 
     fun clearData()
 
-    fun updateNavigationDay(date: String)
+    fun updateNavigationWeek(date: String)
 
     fun isViewEmpty(): Boolean
 
@@ -21,6 +21,8 @@ interface HomeworkView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showPreButton(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index c9c1aeb4..da054bb5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -4,10 +4,12 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.options.LoginOptionsFragment
+import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
+import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
@@ -18,7 +20,7 @@ class LoginActivity : BaseActivity(), LoginView {
     lateinit var presenter: LoginPresenter
 
     @Inject
-    lateinit var loginAdapter: BasePagerAdapter
+    lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
@@ -36,14 +38,19 @@ class LoginActivity : BaseActivity(), LoginView {
     }
 
     override fun initAdapter() {
-        loginAdapter.fragments.putAll(mapOf(
-            "1" to LoginFormFragment.newInstance(),
-            "2" to LoginOptionsFragment.newInstance()
-        ))
+        loginAdapter.apply {
+            containerId = loginViewpager.id
+            addFragments(listOf(
+                LoginFormFragment.newInstance(),
+                LoginSymbolFragment.newInstance(),
+                LoginStudentSelectFragment.newInstance()
+            ))
+        }
 
         loginViewpager.run {
+            offscreenPageLimit = 2
             adapter = loginAdapter
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener { presenter.onViewSelected(it) }
         }
     }
 
@@ -51,22 +58,30 @@ class LoginActivity : BaseActivity(), LoginView {
         loginViewpager.setCurrentItem(index, false)
     }
 
-    override fun notifyOptionsViewLoadData() {
-        (supportFragmentManager.fragments[1] as? LoginOptionsFragment)?.onParentLoadData()
-    }
-
-    fun onChildFragmentSwitchOptions() {
-        presenter.onChildViewSwitchOptions()
-    }
-
-    override fun hideActionBar() {
-        supportActionBar?.hide()
+    override fun showActionBar(show: Boolean) {
+        supportActionBar?.apply { if (show) show() else hide() }
     }
 
     override fun onBackPressed() {
         presenter.onBackPressed { super.onBackPressed() }
     }
 
+    override fun notifyInitSymbolFragment(loginData: Triple<String, String, String>) {
+        (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
+    }
+
+    override fun notifyInitStudentSelectFragment(students: List<Student>) {
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(students)
+    }
+
+    fun onFormFragmentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        presenter.onFormViewAccountLogged(students, loginData)
+    }
+
+    fun onSymbolFragmentAccountLogged(students: List<Student>) {
+        presenter.onSymbolViewAccountLogged(students)
+    }
+
     public override fun onDestroy() {
         presenter.onDetachView()
         super.onDestroy()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index 40f1d711..a70ff2d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -2,12 +2,16 @@ package io.github.wulkanowy.ui.modules.login
 
 import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
+import com.readystatesoftware.chuck.api.ChuckCollector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.api.login.BadCredentialsException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
-class LoginErrorHandler @Inject constructor(resources: Resources) : ErrorHandler(resources) {
+class LoginErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckCollector: ChuckCollector
+) : ErrorHandler(resources, chuckCollector) {
 
     var onBadCredentials: () -> Unit = {}
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
index 3cdf8367..7c3e7bac 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -5,9 +5,10 @@ import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.options.LoginOptionsFragment
+import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
+import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
 @Module
 internal abstract class LoginModule {
@@ -18,14 +19,18 @@ internal abstract class LoginModule {
         @JvmStatic
         @PerActivity
         @Provides
-        fun provideLoginAdapter(activity: LoginActivity) = BasePagerAdapter(activity.supportFragmentManager)
+        fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
     }
 
     @PerFragment
-    @ContributesAndroidInjector()
+    @ContributesAndroidInjector
     abstract fun bindLoginFormFragment(): LoginFormFragment
 
     @PerFragment
-    @ContributesAndroidInjector()
-    abstract fun bindLoginOptionsFragment(): LoginOptionsFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSymbolFragment(): LoginSymbolFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index 0687e2f2..fb025bee 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -1,7 +1,9 @@
 package io.github.wulkanowy.ui.modules.login
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresenter<LoginView>(errorHandler) {
@@ -10,24 +12,49 @@ class LoginPresenter @Inject constructor(errorHandler: ErrorHandler) : BasePrese
         super.onAttachView(view)
         view.run {
             initAdapter()
-            hideActionBar()
+            showActionBar(false)
+        }
+        Timber.i("Login view is attached")
+    }
+
+    fun onFormViewAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        view?.apply {
+            if (students.isEmpty()) {
+                Timber.i("Switch to symbol form")
+                notifyInitSymbolFragment(loginData)
+                switchView(1)
+            } else {
+                Timber.i("Switch to student select")
+                notifyInitStudentSelectFragment(students)
+                switchView(2)
+            }
         }
     }
 
-    fun onPageSelected(index: Int) {
-        if (index == 1) view?.notifyOptionsViewLoadData()
+    fun onSymbolViewAccountLogged(students: List<Student>) {
+        view?.apply {
+            Timber.i("Switch to student select")
+            notifyInitStudentSelectFragment(students)
+            switchView(2)
+        }
     }
 
-    fun onChildViewSwitchOptions() {
-        view?.switchView(1)
+    fun onViewSelected(index: Int) {
+        view?.apply {
+            when (index) {
+                0, 1 -> showActionBar(false)
+                2 -> showActionBar(true)
+            }
+        }
     }
 
     fun onBackPressed(default: () -> Unit) {
-        view?.run {
-            if (currentViewIndex == 1) {
-                switchView(0)
-                hideActionBar()
-            } else default()
+        Timber.i("Back pressed in login view")
+        view?.apply {
+            when (currentViewIndex) {
+                1, 2 -> switchView(0)
+                else -> default()
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 52cb9180..58d356bb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.login
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginView : BaseView {
@@ -8,9 +9,11 @@ interface LoginView : BaseView {
 
     fun initAdapter()
 
-    fun hideActionBar()
-
     fun switchView(index: Int)
 
-    fun notifyOptionsViewLoadData()
+    fun showActionBar(show: Boolean)
+
+    fun notifyInitSymbolFragment(loginData: Triple<String, String, String>)
+
+    fun notifyInitStudentSelectFragment(students: List<Student>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 7985ef6e..54fd0704 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -10,12 +10,14 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
-import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.setOnItemSelectedListener
+import io.github.wulkanowy.utils.setOnTextChangedListener
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.fragment_login_form.*
 import javax.inject.Inject
@@ -29,7 +31,14 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         fun newInstance() = LoginFormFragment()
     }
 
-    override val isDebug = DEBUG
+    override val formNameValue: String
+        get() = loginFormName.text.toString()
+
+    override val formPassValue: String
+        get() = loginFormPass.text.toString()
+
+    override val formHostValue: String?
+        get() = resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_login_form, container, false)
@@ -41,93 +50,60 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun initView() {
-        loginSignButton.setOnClickListener {
-            presenter.attemptLogin(
-                loginNicknameEdit.text.toString(),
-                loginPassEdit.text.toString(),
-                loginSymbolEdit.text.toString(),
-                resources.getStringArray(R.array.endpoints_values)[loginHostEdit.selectedItemPosition]
-            )
+        loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
+        loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
+        loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
+        loginFormSignIn.setOnClickListener { presenter.attemptLogin() }
+
+        loginFormPass.setOnEditorActionListener { _, id, _ ->
+            if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
         }
 
-        loginPassEdit.setOnEditorActionListener { _, id, _ -> onEditAction(id) }
-
-        loginHostEdit.apply {
-            adapter = ArrayAdapter.createFromResource(context, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
+        context?.let {
+            loginFormHost.adapter = ArrayAdapter.createFromResource(it, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
                 .apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
         }
-
-        loginSymbolEdit.run {
-            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
-            setOnEditorActionListener { _, id, _ -> onEditAction(id) }
-        }
     }
 
-    override fun showSymbolInput() {
-        loginHeader.text = getString(R.string.login_header_symbol)
-        loginMainForm.visibility = GONE
-        loginSymbolInput.visibility = VISIBLE
-        loginSymbolEdit.requestFocus()
-        showSoftKeyboard()
+    override fun setDefaultCredentials(name: String, pass: String) {
+        loginFormName.setText(name)
+        loginFormPass.setText(pass)
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun showVersion() {
-        loginVersion.apply {
-            visibility = VISIBLE
-            text = "${getString(R.string.app_name)} $VERSION_NAME"
-        }
-    }
-
-    override fun switchOptionsView() {
-        (activity as? LoginActivity)?.onChildFragmentSwitchOptions()
-    }
-
-    override fun setErrorNicknameRequired() {
-        loginNicknameEdit.run {
+    override fun setErrorNameRequired() {
+        loginFormNameLayout.run {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
-        loginPassEdit.run {
+        loginFormPassLayout.run {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        loginPassEdit.run {
+        loginFormPassLayout.run {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
-    override fun setErrorSymbolRequire() {
-        loginSymbolEdit.run {
-            requestFocus()
-            error = getString(R.string.login_field_required)
-        }
-    }
-
     override fun setErrorPassIncorrect() {
-        loginPassEdit.run {
+        loginFormPassLayout.run {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
-    override fun setErrorSymbolIncorrect() {
-        loginSymbolEdit.run {
-            requestFocus()
-            error = getString(R.string.login_incorrect_symbol)
-        }
+    override fun clearNameError() {
+        loginFormNameLayout.error = null
     }
 
-    override fun resetViewErrors() {
-        loginNicknameEdit.error = null
-        loginPassEdit.error = null
+    override fun clearPassError() {
+        loginFormPassLayout.error = null
     }
 
     override fun showSoftKeyboard() {
@@ -139,20 +115,29 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginFormProgressContainer.visibility = if (show) VISIBLE else GONE
+        loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
         loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    private fun onEditAction(actionId: Int): Boolean {
-        return when (actionId) {
-            IME_ACTION_DONE, IME_NULL -> loginSignButton.callOnClick()
-            else -> false
+    @SuppressLint("SetTextI18n")
+    override fun showVersion() {
+        loginFormVersion.apply {
+            visibility = VISIBLE
+            text = "${getString(R.string.app_name)} $VERSION_NAME"
         }
     }
 
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
+            loginFormName.text.toString(),
+            loginFormPass.text.toString(),
+            resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+        ))
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         presenter.onDetachView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 58ce34a7..a0717649 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import com.google.firebase.analytics.FirebaseAnalytics.Event.SIGN_UP
-import com.google.firebase.analytics.FirebaseAnalytics.Param.GROUP_ID
 import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class LoginFormPresenter @Inject constructor(
     private val schedulers: SchedulersProvider,
     private val errorHandler: LoginErrorHandler,
     private val studentRepository: StudentRepository,
-    private val analytics: FirebaseAnalyticsHelper
+    private val analytics: FirebaseAnalyticsHelper,
+    @param:Named("isDebug") private val isDebug: Boolean
 ) : BasePresenter<LoginFormView>(errorHandler) {
 
-    private var wasEmpty = false
-
     override fun onAttachView(view: LoginFormView) {
         super.onAttachView(view)
         view.run {
@@ -33,10 +31,30 @@ class LoginFormPresenter @Inject constructor(
         }
     }
 
-    fun attemptLogin(email: String, password: String, symbol: String, endpoint: String) {
-        if (!validateCredentials(email, password, symbol)) return
+    fun onHostSelected() {
+        view?.apply {
+            clearPassError()
+            clearNameError()
+            if (formHostValue?.contains("fakelog") == true) setDefaultCredentials("jan@fakelog.cf", "jan123")
+        }
+    }
 
-        disposable.add(studentRepository.getStudents(email, password, symbol, endpoint)
+    fun onPassTextChanged() {
+        view?.clearPassError()
+    }
+
+    fun onNameTextChanged() {
+        view?.clearNameError()
+    }
+
+    fun attemptLogin() {
+        val email = view?.formNameValue.orEmpty()
+        val password = view?.formPassValue.orEmpty()
+        val endpoint = view?.formHostValue.orEmpty()
+
+        if (!validateCredentials(email, password)) return
+
+        disposable.add(studentRepository.getStudents(email, password, endpoint)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
             .doOnSubscribe {
@@ -45,6 +63,7 @@ class LoginFormPresenter @Inject constructor(
                     showProgress(true)
                     showContent(false)
                 }
+                Timber.i("Login started")
             }
             .doFinally {
                 view?.apply {
@@ -53,29 +72,21 @@ class LoginFormPresenter @Inject constructor(
                 }
             }
             .subscribe({
-                view?.run {
-                    if (it.isEmpty() && !wasEmpty) {
-                        showSymbolInput()
-                        wasEmpty = true
-                    } else if (it.isEmpty() && wasEmpty) {
-                        showSymbolInput()
-                        setErrorSymbolIncorrect()
-                        analytics.logEvent(SIGN_UP, mapOf(SUCCESS to false, "students" to it.size, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "nil" }))
-                    } else {
-                        switchOptionsView()
-                    }
-                }
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", SUCCESS to true, "students" to it.size, "endpoint" to endpoint, "error" to "No error")
+                view?.notifyParentAccountLogged(it)
             }, {
-                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to true, "endpoint" to endpoint, GROUP_ID to symbol.ifEmpty { "nil" }))
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", SUCCESS to false, "students" to -1, "endpoint" to endpoint, "error" to it.localizedMessage)
                 errorHandler.dispatch(it)
             }))
     }
 
-    private fun validateCredentials(login: String, password: String, symbol: String): Boolean {
+    private fun validateCredentials(login: String, password: String): Boolean {
         var isCorrect = true
 
         if (login.isEmpty()) {
-            view?.setErrorNicknameRequired()
+            view?.setErrorNameRequired()
             isCorrect = false
         }
 
@@ -84,11 +95,6 @@ class LoginFormPresenter @Inject constructor(
             isCorrect = false
         }
 
-        if (symbol.isEmpty() && wasEmpty) {
-            view?.setErrorSymbolRequire()
-            isCorrect = false
-        }
-
         if (password.length < 6 && password.isNotEmpty()) {
             view?.setErrorPassInvalid(focus = isCorrect)
             isCorrect = false
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 4d540226..69672780 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,30 +1,31 @@
 package io.github.wulkanowy.ui.modules.login.form
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginFormView : BaseView {
 
-    val isDebug: Boolean
-
     fun initView()
 
-    fun switchOptionsView()
+    val formNameValue: String
 
-    fun setErrorNicknameRequired()
+    val formPassValue: String
+
+    val formHostValue: String?
+
+    fun setDefaultCredentials(name: String, pass: String)
+
+    fun setErrorNameRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
-    fun setErrorSymbolRequire()
-
     fun setErrorPassInvalid(focus: Boolean)
 
     fun setErrorPassIncorrect()
 
-    fun setErrorSymbolIncorrect()
+    fun clearNameError()
 
-    fun resetViewErrors()
-
-    fun showVersion()
+    fun clearPassError()
 
     fun showSoftKeyboard()
 
@@ -34,5 +35,7 @@ interface LoginFormView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun showSymbolInput()
+    fun showVersion()
+
+    fun notifyParentAccountLogged(students: List<Student>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
similarity index 62%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 3e306b19..2bcb6b4e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.login.options
+package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
@@ -13,47 +13,47 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_login_options.*
+import kotlinx.android.synthetic.main.fragment_login_student_select.*
+import java.io.Serializable
 import javax.inject.Inject
 
-class LoginOptionsFragment : BaseFragment(), LoginOptionsView {
+class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
 
     @Inject
-    lateinit var presenter: LoginOptionsPresenter
+    lateinit var presenter: LoginStudentSelectPresenter
 
     @Inject
     lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     companion object {
-        fun newInstance() = LoginOptionsFragment()
+        const val SAVED_STUDENTS = "STUDENTS"
+
+        fun newInstance() = LoginStudentSelectFragment()
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_options, container, false)
+        return inflater.inflate(R.layout.fragment_login_student_select, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        presenter.onAttachView(this)
+        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_STUDENTS))
     }
 
     override fun initView() {
         loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
 
-        loginOptionsRecycler.apply {
+        loginStudentSelectRecycler.apply {
             adapter = loginAdapter
             layoutManager = SmoothScrollLinearLayoutManager(context)
         }
     }
 
-    fun onParentLoadData() {
-        presenter.onParentViewLoadData()
-    }
-
-    override fun updateData(data: List<LoginOptionsItem>) {
+    override fun updateData(data: List<LoginStudentSelectItem>) {
         loginAdapter.updateDataSet(data, true)
     }
 
@@ -65,17 +65,26 @@ class LoginOptionsFragment : BaseFragment(), LoginOptionsView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginOptionsProgressContainer.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginOptionsRecycler.visibility = if (show) VISIBLE else GONE
+        loginStudentSelectRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showActionBar(show: Boolean) {
         (activity as? AppCompatActivity)?.supportActionBar?.run { if (show) show() else hide() }
     }
 
+    fun onParentInitStudentSelectFragment(students: List<Student>) {
+        presenter.onParentInitStudentSelectView(students)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putSerializable(SAVED_STUDENTS, presenter.students as Serializable)
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
similarity index 80%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
index 2d4de475..c206a499 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.login.options
+package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -8,11 +8,11 @@ import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_login_options.view.*
+import kotlinx.android.synthetic.main.item_login_student_select.view.*
 
-class LoginOptionsItem(val student: Student) : AbstractFlexibleItem<LoginOptionsItem.ItemViewHolder>() {
+class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
 
-    override fun getLayoutRes(): Int = R.layout.item_login_options
+    override fun getLayoutRes(): Int = R.layout.item_login_student_select
 
     override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ItemViewHolder {
         return ItemViewHolder(view, adapter)
@@ -27,7 +27,7 @@ class LoginOptionsItem(val student: Student) : AbstractFlexibleItem<LoginOptions
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as LoginOptionsItem
+        other as LoginStudentSelectItem
 
         if (student != other.student) return false
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
similarity index 53%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index af9ae692..6c2acb3b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -1,53 +1,62 @@
-package io.github.wulkanowy.ui.modules.login.options
+package io.github.wulkanowy.ui.modules.login.studentselect
 
-import com.google.firebase.analytics.FirebaseAnalytics.Event.SIGN_UP
-import com.google.firebase.analytics.FirebaseAnalytics.Param.GROUP_ID
 import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Single
+import timber.log.Timber
+import java.io.Serializable
 import javax.inject.Inject
 
-class LoginOptionsPresenter @Inject constructor(
+class LoginStudentSelectPresenter @Inject constructor(
     private val errorHandler: LoginErrorHandler,
     private val studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
     private val schedulers: SchedulersProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginOptionsView>(errorHandler) {
+) : BasePresenter<LoginStudentSelectView>(errorHandler) {
 
-    override fun onAttachView(view: LoginOptionsView) {
+    var students = emptyList<Student>()
+
+    fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
         super.onAttachView(view)
         view.run {
             initView()
-            errorHandler.onStudentDuplicate = { showMessage(it) }
+            errorHandler.onStudentDuplicate = {
+                showMessage(it)
+                Timber.i("The student already registered in the app was selected")
+            }
+        }
+
+        if (students is List<*> && students.isNotEmpty()) {
+            loadData(students.filterIsInstance<Student>())
         }
     }
 
-    fun onParentViewLoadData() {
-        disposable.add(studentRepository.cachedStudents
-            .observeOn(schedulers.mainThread)
-            .subscribeOn(schedulers.backgroundThread)
-            .doOnSubscribe { view?.showActionBar(true) }
-            .subscribe({ view?.updateData(it.map { student -> LoginOptionsItem(student) }) }, { errorHandler.dispatch(it) }))
+    fun onParentInitStudentSelectView(students: List<Student>) {
+        loadData(students)
     }
 
     fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is LoginOptionsItem) {
+        if (item is LoginStudentSelectItem) {
             registerStudent(item.student)
         }
     }
 
+    private fun loadData(students: List<Student>) {
+        this.students = students
+        view?.apply {
+            updateData(students.map { LoginStudentSelectItem(it) })
+        }
+    }
+
     private fun registerStudent(student: Student) {
         disposable.add(studentRepository.saveStudent(student)
             .map { student.apply { id = it } }
-            .flatMap { semesterRepository.getSemesters(student, true) }
             .onErrorResumeNext { studentRepository.logoutStudent(student).andThen(Single.error(it)) }
             .flatMapCompletable { studentRepository.switchStudent(student) }
             .subscribeOn(schedulers.backgroundThread)
@@ -58,11 +67,15 @@ class LoginOptionsPresenter @Inject constructor(
                     showContent(false)
                     showActionBar(false)
                 }
+                Timber.i("Registration started")
             }
             .subscribe({
-                analytics.logEvent(SIGN_UP, mapOf(SUCCESS to true, "students" to 1, "endpoint" to student.endpoint, GROUP_ID to student.symbol))
+                analytics.logEvent("registration_student_select", SUCCESS to true, "endpoint" to student.endpoint, "symbol" to student.symbol, "error" to "No error")
+                Timber.i("Registration result: Success")
                 view?.openMainView()
             }, {
+                analytics.logEvent("registration_student_select", SUCCESS to false, "endpoint" to student.endpoint, "symbol" to student.symbol, "error" to it.localizedMessage)
+                Timber.i("Registration result: An exception occurred ")
                 errorHandler.dispatch(it)
                 view?.apply {
                     showProgress(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
similarity index 56%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index e20912ae..824f421f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -1,12 +1,12 @@
-package io.github.wulkanowy.ui.modules.login.options
+package io.github.wulkanowy.ui.modules.login.studentselect
 
 import io.github.wulkanowy.ui.base.BaseView
 
-interface LoginOptionsView : BaseView {
+interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<LoginOptionsItem>)
+    fun updateData(data: List<LoginStudentSelectItem>)
 
     fun openMainView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
new file mode 100644
index 00000000..87de0a81
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -0,0 +1,116 @@
+package io.github.wulkanowy.ui.modules.login.symbol
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+import android.view.inputmethod.EditorInfo.IME_NULL
+import android.widget.ArrayAdapter
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.setOnTextChangedListener
+import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.fragment_login_symbol.*
+import javax.inject.Inject
+
+class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
+
+    @Inject
+    lateinit var presenter: LoginSymbolPresenter
+
+    companion object {
+        private const val SAVED_LOGIN_DATA = "LOGIN_DATA"
+
+        fun newInstance() = LoginSymbolFragment()
+    }
+
+    override val symbolNameError: CharSequence?
+        get() = loginSymbolNameLayout.error
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_login_symbol, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_LOGIN_DATA))
+    }
+
+    override fun initView() {
+        loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+
+        loginSymbolName.setOnTextChangedListener { presenter.onSymbolTextChanged() }
+
+        loginSymbolName.apply {
+            setOnEditorActionListener { _, id, _ ->
+                if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
+            }
+            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
+        }
+    }
+
+    fun onParentInitSymbolFragment(loginData: Triple<String, String, String>) {
+        presenter.onParentInitSymbolView(loginData)
+    }
+
+    override fun setErrorSymbolIncorrect() {
+        loginSymbolNameLayout.apply {
+            requestFocus()
+            error = getString(R.string.login_incorrect_symbol)
+        }
+    }
+
+    override fun setErrorSymbolRequire() {
+        loginSymbolNameLayout.apply {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun clearSymbolError() {
+        loginSymbolNameLayout.error = null
+    }
+
+    override fun clearAndFocusSymbol() {
+        loginSymbolNameLayout.apply {
+            editText?.text = null
+            requestFocus()
+        }
+    }
+
+    override fun showSoftKeyboard() {
+        activity?.showSoftInput()
+    }
+
+    override fun hideSoftKeyboard() {
+        activity?.hideSoftInput()
+    }
+
+    override fun showProgress(show: Boolean) {
+        loginSymbolProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        loginSymbolContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(students)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putSerializable(SAVED_LOGIN_DATA, presenter.loginData)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        presenter.onDetachView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
new file mode 100644
index 00000000..0adb9e16
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -0,0 +1,86 @@
+package io.github.wulkanowy.ui.modules.login.symbol
+
+import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
+import timber.log.Timber
+import java.io.Serializable
+import javax.inject.Inject
+
+class LoginSymbolPresenter @Inject constructor(
+    private val studentRepository: StudentRepository,
+    private val errorHandler: LoginErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginSymbolView>(errorHandler) {
+
+    var loginData: Triple<String, String, String>? = null
+
+    @Suppress("UNCHECKED_CAST")
+    fun onAttachView(view: LoginSymbolView, savedLoginData: Serializable?) {
+        super.onAttachView(view)
+        view.initView()
+        if (savedLoginData is Triple<*, *, *>) {
+            loginData = savedLoginData as Triple<String, String, String>
+        }
+    }
+
+    fun onSymbolTextChanged() {
+        view?.apply { if (symbolNameError != null) clearSymbolError() }
+    }
+
+    fun attemptLogin(symbol: String) {
+        if (symbol.isBlank()) {
+            view?.setErrorSymbolRequire()
+            return
+        }
+
+        disposable.add(
+            Single.fromCallable { if (loginData == null) throw IllegalArgumentException("Login data is null") else loginData }
+                .flatMap { studentRepository.getStudents(it.first, it.second, it.third, symbol) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        hideSoftKeyboard()
+                        showProgress(true)
+                        showContent(false)
+                    }
+                    Timber.i("Login with symbol started")
+                }
+                .doFinally {
+                    view?.apply {
+                        showProgress(false)
+                        showContent(true)
+                    }
+                }
+                .subscribe({
+                    analytics.logEvent("registration_symbol", SUCCESS to true, "students" to it.size, "endpoint" to loginData?.third, "symbol" to symbol, "error" to "No error")
+                    view?.apply {
+                        if (it.isEmpty()) {
+                            Timber.i("Login with symbol result: Empty student list")
+                            setErrorSymbolIncorrect()
+                        } else {
+                            Timber.i("Login with symbol result: Success")
+                            notifyParentAccountLogged(it)
+                        }
+                    }
+                }, {
+                    Timber.i("Login with symbol result: An exception occurred")
+                    analytics.logEvent("registration_symbol", SUCCESS to false, "students" to -1, "endpoint" to loginData?.third, "symbol" to symbol, "error" to it.localizedMessage)
+                    errorHandler.dispatch(it)
+                }))
+    }
+
+    fun onParentInitSymbolView(loginData: Triple<String, String, String>) {
+        this.loginData = loginData
+        view?.apply {
+            clearAndFocusSymbol()
+            showSoftKeyboard()
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
new file mode 100644
index 00000000..2e5143ef
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.ui.modules.login.symbol
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LoginSymbolView : BaseView {
+
+    val symbolNameError: CharSequence?
+
+    fun initView()
+
+    fun setErrorSymbolIncorrect()
+
+    fun setErrorSymbolRequire()
+
+    fun clearSymbolError()
+
+    fun clearAndFocusSymbol()
+
+    fun showSoftKeyboard()
+
+    fun hideSoftKeyboard()
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun notifyParentAccountLogged(students: List<Student>)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
new file mode 100644
index 00000000..cff6175c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -0,0 +1,71 @@
+package io.github.wulkanowy.ui.modules.luckynumber
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import kotlinx.android.synthetic.main.fragment_lucky_number.*
+import javax.inject.Inject
+
+class LuckyNumberFragment : BaseSessionFragment(), LuckyNumberView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LuckyNumberPresenter
+
+    companion object {
+        fun newInstance() = LuckyNumberFragment()
+    }
+
+    override val titleStringId: Int
+        get() = R.string.lucky_number_title
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_lucky_number, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+    }
+
+    override fun updateData(data: LuckyNumber) {
+        luckyNumberText.text = data.luckyNumber.toString()
+    }
+
+    override fun hideRefresh() {
+        luckyNumberSwipe.isRefreshing = false
+    }
+
+    override fun showEmpty(show: Boolean) {
+        luckyNumberEmpty.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showProgress(show: Boolean) {
+        luckyNumberProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        luckyNumberSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        luckyNumberContent.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun isViewEmpty(): Boolean {
+        return luckyNumberText.text.isBlank()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        presenter.onDetachView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
new file mode 100644
index 00000000..92ee4e25
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -0,0 +1,78 @@
+package io.github.wulkanowy.ui.modules.luckynumber
+
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
+import javax.inject.Inject
+
+class LuckyNumberPresenter @Inject constructor(
+    private val errorHandler: SessionErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val luckyNumberRepository: LuckyNumberRepository,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LuckyNumberView>(errorHandler) {
+
+    override fun onAttachView(view: LuckyNumberView) {
+        super.onAttachView(view)
+        Timber.i("Lucky number view is attached")
+        view.initView()
+        loadData()
+    }
+
+    private fun loadData(forceRefresh: Boolean = false) {
+        Timber.i("Loading lucky number started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showContent(false)
+                        enableSwipe(false)
+                    }
+                }
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
+                    Timber.i("Loading lucky number result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showContent(true)
+                        showEmpty(false)
+                    }
+                    analytics.logEvent("load_lucky_number", "lucky_number" to it.luckyNumber, "force_refresh" to forceRefresh)
+                }, {
+                    Timber.i("Loading lucky number result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty()) }
+                    errorHandler.dispatch(it)
+                }, {
+                    Timber.i("Loading lucky number result: No lucky number found")
+                    view?.run {
+                        showContent(false)
+                        showEmpty(true)
+                    }
+                })
+            )
+        }
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the lucky number")
+        loadData(true)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
new file mode 100644
index 00000000..5c19142c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.ui.modules.luckynumber
+
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.ui.base.session.BaseSessionView
+
+interface LuckyNumberView : BaseSessionView {
+
+    fun initView()
+
+    fun updateData(data: LuckyNumber)
+
+    fun hideRefresh()
+
+    fun showEmpty(show: Boolean)
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun isViewEmpty(): Boolean
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 58c2f7c9..5e0ed2b2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -7,13 +7,13 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
 import io.github.wulkanowy.R
-import io.github.wulkanowy.services.notification.GradeNotification
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
@@ -70,7 +70,7 @@ class MainActivity : BaseActivity(), MainView {
 
     override fun onStart() {
         super.onStart()
-        presenter.onViewStart()
+        presenter.onViewChange()
     }
 
     override fun initView() {
@@ -97,7 +97,7 @@ class MainActivity : BaseActivity(), MainView {
         }
 
         navController.run {
-            setOnViewChangeListener { presenter.onViewStart() }
+            setOnViewChangeListener { presenter.onViewChange() }
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
                 GradeFragment.newInstance(),
@@ -147,6 +147,10 @@ class MainActivity : BaseActivity(), MainView {
         (navController.currentStack?.get(0) as? MainView.MainChildView)?.onFragmentReselected()
     }
 
+    fun showDialogFragment(dialog: DialogFragment) {
+        navController.showDialogFragment(dialog)
+    }
+
     fun pushView(fragment: Fragment) {
         navController.pushFragment(fragment)
     }
@@ -159,10 +163,6 @@ class MainActivity : BaseActivity(), MainView {
         presenter.onBackPressed { super.onBackPressed() }
     }
 
-    override fun cancelNotifications() {
-        GradeNotification(applicationContext).cancelAll()
-    }
-
     override fun openLoginView() {
         startActivity(LoginActivity.getStartIntent(this)
             .apply { addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) })
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
index 9d1c44c0..d1afd9c0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -16,6 +16,7 @@ import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeModule
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.MessageModule
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
@@ -23,6 +24,7 @@ import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 
 @Module
 abstract class MainModule {
@@ -88,5 +90,13 @@ abstract class MainModule {
 
     @PerFragment
     @ContributesAndroidInjector
-    abstract fun bindsAccountDialog(): AccountDialog
+    abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindCompletedLessonsFragment(): CompletedLessonsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAccountDialog(): AccountDialog
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index f18bd9eb..a2a973c6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -2,43 +2,45 @@ package io.github.wulkanowy.ui.modules.main
 
 import com.google.firebase.analytics.FirebaseAnalytics.Event.APP_OPEN
 import com.google.firebase.analytics.FirebaseAnalytics.Param.DESTINATION
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.job.ServiceHelper
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Completable
+import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
     private val errorHandler: ErrorHandler,
     private val studentRepository: StudentRepository,
     private val prefRepository: PreferencesRepository,
+    private val syncManager: SyncManager,
     private val schedulers: SchedulersProvider,
-    private val serviceHelper: ServiceHelper,
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MainView>(errorHandler) {
 
     fun onAttachView(view: MainView, initMenuIndex: Int) {
         super.onAttachView(view)
+        Timber.i("Main view is attached with $initMenuIndex menu index")
         view.run {
-            cancelNotifications()
             startMenuIndex = if (initMenuIndex != -1) initMenuIndex else prefRepository.startMenuIndex
             initView()
         }
-        serviceHelper.startFullSyncService()
 
-        analytics.logEvent(APP_OPEN, mapOf(DESTINATION to when (initMenuIndex) {
+        syncManager.startSyncWorker()
+
+        analytics.logEvent(APP_OPEN, DESTINATION to when (initMenuIndex) {
             1 -> "Grades"
             3 -> "Timetable"
             4 -> "More"
             else -> "User action"
-        }))
+        })
     }
 
-    fun onViewStart() {
+    fun onViewChange() {
         view?.apply {
             currentViewTitle?.let { setViewTitle(it) }
             currentStackSize?.let {
@@ -49,16 +51,19 @@ class MainPresenter @Inject constructor(
     }
 
     fun onAccountManagerSelected(): Boolean {
+        Timber.i("Select account manager")
         view?.showAccountPicker()
         return true
     }
 
     fun onUpNavigate(): Boolean {
+        Timber.i("Up navigate pressed")
         view?.popView()
         return true
     }
 
     fun onBackPressed(default: () -> Unit) {
+        Timber.i("Back pressed in main view")
         view?.run {
             if (isRootView) default()
             else popView()
@@ -67,6 +72,7 @@ class MainPresenter @Inject constructor(
 
     fun onTabSelected(index: Int, wasSelected: Boolean): Boolean {
         return view?.run {
+            Timber.i("Switch main tab index: $index, reselected: $wasSelected")
             if (wasSelected) {
                 notifyMenuViewReselected()
                 false
@@ -78,15 +84,24 @@ class MainPresenter @Inject constructor(
     }
 
     fun onLoginSelected() {
+        Timber.i("Attempt to switch the student after the session expires")
         disposable.add(studentRepository.getCurrentStudent(false)
             .flatMapCompletable { studentRepository.logoutStudent(it) }
             .andThen(studentRepository.getSavedStudents(false))
             .flatMapCompletable {
-                if (it.isNotEmpty()) studentRepository.switchStudent(it[0])
-                else Completable.complete()
+                if (it.isNotEmpty()) {
+                    Timber.i("Switching current student")
+                    studentRepository.switchStudent(it[0])
+                } else Completable.complete()
             }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({ view?.openLoginView() }, { errorHandler.dispatch(it) }))
+            .subscribe({
+                Timber.i("Switch student result: Open login view")
+                view?.openLoginView()
+            }, {
+                Timber.i("Switch student result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 112f3f4e..d3d7e342 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -26,8 +26,6 @@ interface MainView : BaseView {
 
     fun popView()
 
-    fun cancelNotifications()
-
     fun openLoginView()
 
     interface MainChildView {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index f75c6131..d8a6bc84 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -7,12 +7,13 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.SENT
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.TRASHED
+import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
+import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_message.*
@@ -24,7 +25,7 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     lateinit var presenter: MessagePresenter
 
     @Inject
-    lateinit var pagerAdapter: BasePagerAdapter
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = MessageFragment()
@@ -46,17 +47,23 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     }
 
     override fun initView() {
-        pagerAdapter.fragments.putAll(mapOf(
-            getString(R.string.message_inbox) to MessageTabFragment.newInstance(RECEIVED),
-            getString(R.string.message_sent) to MessageTabFragment.newInstance(SENT),
-            getString(R.string.message_trash) to MessageTabFragment.newInstance(TRASHED)
-        ))
+        pagerAdapter.apply {
+            containerId = messageViewPager.id
+            addFragmentsWithTitle(mapOf(
+                MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
+                MessageTabFragment.newInstance(SENT) to getString(R.string.message_sent),
+                MessageTabFragment.newInstance(TRASHED) to getString(R.string.message_trash)
+            ))
+        }
+
         messageViewPager.run {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener { presenter.onPageSelected(it) }
         }
         messageTabLayout.setupWithViewPager(messageViewPager)
+
+        openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
 
     override fun showContent(show: Boolean) {
@@ -73,7 +80,11 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     }
 
     override fun notifyChildLoadData(index: Int, forceRefresh: Boolean) {
-        (childFragmentManager.fragments[index] as MessageView.MessageChildView).onParentLoadData(forceRefresh)
+        (pagerAdapter.getFragmentInstance(index) as? MessageView.MessageChildView)?.onParentLoadData(forceRefresh)
+    }
+
+    override fun openSendMessage() {
+        context?.let { it.startActivity(SendMessageActivity.getStartIntent(it)) }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
index e9aa242d..ec725a38 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
@@ -27,10 +27,10 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
         position: Int, payloads: MutableList<Any>?
     ) {
         holder.apply {
-            val style = if (message.unread == true) BOLD else NORMAL
+            val style = if (message.unread) BOLD else NORMAL
 
             messageItemAuthor.run {
-                text = if (message.recipient?.isNotBlank() == true) message.recipient else message.sender
+                text = if (message.recipient.isNotBlank()) message.recipient else message.sender
                 setTypeface(null, style)
             }
             messageItemSubject.run {
@@ -38,7 +38,7 @@ class MessageItem(val message: Message, private val noSubjectString: String) :
                 setTypeface(null, style)
             }
             messageItemDate.run {
-                text = message.date?.toFormattedString()
+                text = message.date.toFormattedString()
                 setTypeface(null, style)
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
index dd7a22ae..e4c202d9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -5,7 +5,7 @@ import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerChildFragment
 import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BasePagerAdapter
+import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
 @Module
@@ -17,7 +17,7 @@ abstract class MessageModule {
         @JvmStatic
         @PerFragment
         @Provides
-        fun provideGradePagerAdapter(fragment: MessageFragment) = BasePagerAdapter(fragment.childFragmentManager)
+        fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
     }
 
     @PerChildFragment
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 360b9bfc..332d5b74 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Completable
+import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
@@ -14,6 +15,7 @@ class MessagePresenter @Inject constructor(
 
     override fun onAttachView(view: MessageView) {
         super.onAttachView(view)
+        Timber.i("Message view is attached")
         disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
             .subscribe {
                 view.initView()
@@ -30,6 +32,7 @@ class MessagePresenter @Inject constructor(
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
+        Timber.i("Load message child view index: $index")
         view?.notifyChildLoadData(index, forceRefresh)
     }
 
@@ -39,4 +42,8 @@ class MessagePresenter @Inject constructor(
             showProgress(false)
         }
     }
+
+    fun onSendMessageButtonClicked() {
+        view?.openSendMessage()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
index b0bb8aa7..41257ecc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
@@ -14,6 +14,8 @@ interface MessageView : BaseView {
 
     fun notifyChildLoadData(index: Int, forceRefresh: Boolean)
 
+    fun openSendMessage()
+
     interface MessageChildView {
 
         fun onParentLoadData(forceRefresh: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index f104d87a..102567ed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -1,20 +1,31 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import kotlinx.android.synthetic.main.fragment_message_preview.*
 import javax.inject.Inject
 
+@SuppressLint("SetTextI18n")
 class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePreviewPresenter
 
+    private var menuReplyButton: MenuItem? = null
+
     override val titleStringId: Int
         get() = R.string.message_title
 
@@ -31,42 +42,66 @@ class MessagePreviewFragment : BaseSessionFragment(), MessagePreviewView, MainVi
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_message_preview, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        messageContainer = message
+        messageContainer = messagePreviewContainer
         presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getInt(MESSAGE_ID_KEY) ?: 0)
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+        inflater?.inflate(R.menu.action_menu_message_preview, menu)
+        menuReplyButton = menu?.findItem(R.id.messagePreviewMenuReply)
+        presenter.onCreateOptionsMenu()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return if (item?.itemId == R.id.messagePreviewMenuReply) presenter.onReply()
+        else false
+    }
+
     override fun setSubject(subject: String) {
-        messageSubject.text = subject
+        messagePreviewSubject.text = subject
     }
 
-    override fun setRecipient(recipient: String?) {
-        messageAuthor.text = getString(R.string.message_to, recipient)
+    override fun setRecipient(recipient: String) {
+        messagePreviewAuthor.text = "${getString(R.string.message_to)} $recipient"
     }
 
-    override fun setSender(sender: String?) {
-        messageAuthor.text = getString(R.string.message_from, sender)
+    override fun setSender(sender: String) {
+        messagePreviewAuthor.text = "${getString(R.string.message_from)} $sender"
     }
 
-    override fun setDate(date: String?) {
-        messageDate.text = getString(R.string.message_date, date)
+    override fun setDate(date: String) {
+        messagePreviewDate.text = getString(R.string.message_date, date)
     }
 
-    override fun setContent(content: String?) {
-        messageContent.text = content
+    override fun setContent(content: String) {
+        messagePreviewContent.text = content
     }
 
     override fun showProgress(show: Boolean) {
-        messageProgress.visibility = if (show) View.VISIBLE else View.GONE
+        messagePreviewProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showReplyButton(show: Boolean) {
+        menuReplyButton?.isVisible = show
     }
 
     override fun showMessageError() {
-        messageError.visibility = View.VISIBLE
+        messagePreviewError.visibility = VISIBLE
+    }
+
+    override fun openMessageReply(message: Message?) {
+        context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message)) }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index 3197e991..a5ed9f28 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -1,55 +1,75 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
+import timber.log.Timber
 import javax.inject.Inject
 
 class MessagePreviewPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val schedulers: SchedulersProvider,
-    private val messagesRepository: MessagesRepository,
+    private val messageRepository: MessageRepository,
     private val studentRepository: StudentRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BaseSessionPresenter<MessagePreviewView>(errorHandler) {
 
     var messageId: Int = 0
 
+    private var replyMessage: Message? = null
+
     fun onAttachView(view: MessagePreviewView, id: Int) {
         super.onAttachView(view)
         loadData(id)
     }
 
     private fun loadData(id: Int) {
+        Timber.i("Loading message $id preview started")
         messageId = id
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { messagesRepository.getMessage(it.studentId, messageId, true) }
+                .flatMap { messageRepository.getMessage(it, messageId, true) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
                 .doFinally { view?.showProgress(false) }
                 .subscribe({ message ->
+                    Timber.i("Loading message $id preview result: Success ")
+                    replyMessage = message
                     view?.run {
                         message.let {
                             setSubject(if (it.subject.isNotBlank()) it.subject else noSubjectString)
-                            setDate(it.date?.toFormattedString("yyyy-MM-dd HH:mm:ss"))
-                            setContent(it.content)
+                            setDate(it.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
+                            setContent(it.content.orEmpty())
+                            showReplyButton(true)
 
-                            if (it.recipient?.isNotBlank() == true) setRecipient(it.recipient)
+                            if (it.recipient.isNotBlank()) setRecipient(it.recipient)
                             else setSender(it.sender)
                         }
                     }
-                    analytics.logEvent("load_attendance", mapOf(START_DATE to message.date?.toFormattedString("yyyy.MM.dd"), "lenght" to message.content?.length))
+                    analytics.logEvent("load_message_preview", START_DATE to message.date.toFormattedString("yyyy.MM.dd"), "length" to message.content?.length)
                 }) {
+                    Timber.i("Loading message $id preview result: An exception occurred ")
                     view?.showMessageError()
                     errorHandler.dispatch(it)
                 })
         }
     }
+
+    fun onReply(): Boolean {
+        return if (replyMessage != null) {
+            view?.openMessageReply(replyMessage)
+            true
+        } else false
+    }
+
+    fun onCreateOptionsMenu() {
+        view?.showReplyButton(replyMessage != null)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index d8dd8965..464ea168 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.session.BaseSessionView
 
 interface MessagePreviewView : BaseSessionView {
@@ -8,15 +9,19 @@ interface MessagePreviewView : BaseSessionView {
 
     fun setSubject(subject: String)
 
-    fun setRecipient(recipient: String?)
+    fun setRecipient(recipient: String)
 
-    fun setSender(sender: String?)
+    fun setSender(sender: String)
 
-    fun setDate(date: String?)
+    fun setDate(date: String)
 
-    fun setContent(content: String?)
+    fun setContent(content: String)
 
     fun showProgress(show: Boolean)
 
+    fun showReplyButton(show: Boolean)
+
     fun showMessageError()
+
+    fun openMessageReply(message: Message?)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
new file mode 100644
index 00000000..be433b00
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import com.pchmn.materialchips.model.ChipInterface
+import io.github.wulkanowy.data.db.entities.Recipient
+
+class RecipientChip(var recipient: Recipient) : ChipInterface {
+
+    override fun getAvatarDrawable(): Drawable? = null
+
+    override fun getAvatarUri(): Uri? = null
+
+    override fun getId(): Any = recipient.id
+
+    override fun getLabel(): String = recipient.name
+
+    override fun getInfo(): String {
+        return recipient.realName.run {
+            substringBeforeLast("-").let { sub ->
+                when {
+                    (sub == this) -> this
+                    (sub.indexOf('(') != -1) -> indexOf("(").let { substring(if (it != -1) it else 0) }
+                    (sub.indexOf('[') != -1) -> indexOf("[").let { substring(if (it != -1) it else 0) }
+                    else -> substringAfter('-')
+                }
+            }.trim()
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
new file mode 100644
index 00000000..edf14dd6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -0,0 +1,131 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.Toast
+import android.widget.Toast.LENGTH_LONG
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.showSoftInput
+import kotlinx.android.synthetic.main.activity_send_message.*
+import javax.inject.Inject
+
+class SendMessageActivity : BaseActivity(), SendMessageView {
+
+    @Inject
+    lateinit var presenter: SendMessagePresenter
+
+    companion object {
+        private const val EXTRA_MESSAGE = "EXTRA_MESSAGE"
+
+        fun getStartIntent(context: Context) = Intent(context, SendMessageActivity::class.java)
+
+        fun getStartIntent(context: Context, message: Message?): Intent {
+            return getStartIntent(context).putExtra(EXTRA_MESSAGE, message)
+        }
+    }
+
+    override val formRecipientsData: List<Recipient>
+        get() = (sendMessageRecipientsInput.selectedChipList).map { (it as RecipientChip).recipient }
+
+    override val formSubjectValue: String
+        get() = sendMessageSubjectInput.text.toString()
+
+    override val formContentValue: String
+        get() = sendMessageContentInput.text.toString()
+
+    override val messageRequiredRecipients: String
+        get() = getString(R.string.message_required_recipients)
+
+    override val messageContentMinLength: String
+        get() = getString(R.string.message_content_min_length)
+
+    override val messageSuccess: String
+        get() = getString(R.string.message_send_successful)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_send_message)
+        setSupportActionBar(sendMessageToolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        messageContainer = sendMessageContainer
+
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.action_menu_send_message, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return if (item?.itemId == R.id.sendMessageMenuSend) presenter.onSend()
+        else false
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        return presenter.onUpNavigate()
+    }
+
+    override fun setReportingUnit(unit: ReportingUnit) {
+        sendMessageFromTextView.setText(unit.senderName)
+    }
+
+    override fun setRecipients(recipients: List<Recipient>) {
+        sendMessageRecipientsInput.filterableList = recipients.map { RecipientChip(it) }
+    }
+
+    override fun setSelectedRecipients(recipients: List<Recipient>) {
+        recipients.map { sendMessageRecipientsInput.addChip(RecipientChip(it)) }
+    }
+
+    override fun showProgress(show: Boolean) {
+        sendMessageProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        sendMessageContent.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showEmpty(show: Boolean) {
+        sendMessageEmpty.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showActionBar(show: Boolean) {
+        supportActionBar?.apply { if (show) show() else hide() }
+    }
+
+    override fun setSubject(subject: String) {
+        sendMessageSubjectInput.setText(subject)
+    }
+
+    override fun setContent(content: String) {
+        sendMessageContentInput.setText(content)
+    }
+
+    override fun showMessage(text: String) {
+        Toast.makeText(this, text, LENGTH_LONG).show()
+    }
+
+    override fun showSoftInput(show: Boolean) {
+        if (show) showSoftInput() else hideSoftInput()
+    }
+
+    override fun popView() {
+        onBackPressed()
+    }
+
+    override fun onDestroy() {
+        presenter.onDetachView()
+        super.onDestroy()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
new file mode 100644
index 00000000..a3715aaa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -0,0 +1,158 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.repositories.message.MessageRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
+import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.toFormattedString
+import io.reactivex.Completable
+import timber.log.Timber
+import javax.inject.Inject
+
+class SendMessagePresenter @Inject constructor(
+    private val errorHandler: ErrorHandler,
+    private val schedulers: SchedulersProvider,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val messageRepository: MessageRepository,
+    private val reportingUnitRepository: ReportingUnitRepository,
+    private val recipientRepository: RecipientRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<SendMessageView>(errorHandler) {
+
+    fun onAttachView(view: SendMessageView, message: Message?) {
+        super.onAttachView(view)
+        Timber.i("Send message view is attached")
+        loadData(message)
+        view.apply {
+            message?.let {
+                setSubject("RE: ${message.subject}")
+                if (preferencesRepository.fillMessageContent) {
+                    setContent(when (message.sender.isNotEmpty()) {
+                        true -> "\n\nOd: ${message.sender}\n"
+                        false -> "\n\nDo: ${message.recipient}\n"
+                    } + "Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${message.content}")
+                }
+            }
+        }
+    }
+
+    fun onUpNavigate(): Boolean {
+        view?.popView()
+        return true
+    }
+
+    private fun loadData(message: Message?) {
+        var reportingUnit: ReportingUnit? = null
+        var recipients: List<Recipient> = emptyList()
+        var selectedRecipient: List<Recipient> = emptyList()
+
+        Timber.i("Loading recipients started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> it to semester } }
+            .flatMapCompletable { (student, semester) ->
+                reportingUnitRepository.getReportingUnit(student, semester.unitId)
+                    .doOnSuccess { reportingUnit = it }
+                    .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
+                    .doOnSuccess {
+                        Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
+                        recipients = it
+                    }
+                    .flatMapCompletable {
+                        if (message == null) Completable.complete()
+                        else recipientRepository.getMessageRecipients(student, message)
+                            .doOnSuccess {
+                                Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
+                                selectedRecipient = it
+                            }
+                            .ignoreElement()
+                    }
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
+                    showProgress(true)
+                    showContent(false)
+                }
+            }
+            .doFinally { view?.run { showProgress(false) } }
+            .subscribe({
+                view?.apply {
+                    if (reportingUnit !== null) {
+                        reportingUnit?.let { setReportingUnit(it) }
+                        setRecipients(recipients)
+                        if (selectedRecipient.isNotEmpty()) setSelectedRecipients(selectedRecipient)
+                        showContent(true)
+                    } else {
+                        Timber.e("Loading recipients result: Can't find the reporting unit")
+                        view?.showEmpty(true)
+                    }
+                }
+            }, {
+                Timber.e("Loading recipients result: An exception occurred")
+                view?.showContent(true)
+                errorHandler.dispatch(it)
+            }))
+    }
+
+    private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
+        Timber.i("Sending message started")
+        disposable.add(messageRepository.sendMessage(subject, content, recipients)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
+                    showSoftInput(false)
+                    showContent(false)
+                    showProgress(true)
+                    showActionBar(false)
+                }
+            }
+            .subscribe({
+                Timber.i("Sending message result: Success")
+                analytics.logEvent("send_message", "recipients" to recipients.size)
+                view?.run {
+                    showMessage(messageSuccess)
+                    popView()
+                }
+            }, {
+                Timber.i("Sending message result: An exception occurred")
+                view?.run {
+                    showContent(true)
+                    showProgress(false)
+                    showActionBar(true)
+                }
+                errorHandler.dispatch(it)
+            })
+        )
+    }
+
+    fun onSend(): Boolean {
+        view?.run {
+            when {
+                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
+                formContentValue.length < 3 -> showMessage(messageContentMinLength)
+                else -> {
+                    sendMessage(
+                        subject = formSubjectValue,
+                        content = formContentValue,
+                        recipients = formRecipientsData
+                    )
+                    return true
+                }
+            }
+        }
+        return false
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
new file mode 100644
index 00000000..8a2cb4f6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.ui.base.BaseView
+
+interface SendMessageView : BaseView {
+
+    val formRecipientsData: List<Recipient>
+
+    val formSubjectValue: String
+
+    val formContentValue: String
+
+    val messageRequiredRecipients: String
+
+    val messageContentMinLength: String
+
+    val messageSuccess: String
+
+    fun setReportingUnit(unit: ReportingUnit)
+
+    fun setRecipients(recipients: List<Recipient>)
+
+    fun setSelectedRecipients(recipients: List<Recipient>)
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showEmpty(show: Boolean)
+
+    fun showActionBar(show: Boolean)
+
+    fun setSubject(subject: String)
+
+    fun setContent(content: String)
+
+    fun showSoftInput(show: Boolean)
+
+    fun popView()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index d3e2f471..047f2a34 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -8,10 +8,11 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.MessagesRepository
+import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
@@ -33,7 +34,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
     companion object {
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
 
-        fun newInstance(folder: MessagesRepository.MessageFolder): MessageTabFragment {
+        fun newInstance(folder: MessageFolder): MessageTabFragment {
             return MessageTabFragment().apply {
                 arguments = Bundle().apply {
                     putString(MESSAGE_TAB_FOLDER_ID, folder.name)
@@ -55,8 +56,8 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         messageContainer = messageTabRecycler
-        presenter.onAttachView(this, MessagesRepository.MessageFolder.valueOf(
-            (savedInstanceState ?: arguments)?.getString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID) ?: ""
+        presenter.onAttachView(this, MessageFolder.valueOf(
+            (savedInstanceState ?: arguments)?.getString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID).orEmpty()
         ))
     }
 
@@ -66,6 +67,10 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
         messageTabRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = tabAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
@@ -86,6 +91,10 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me
         messageTabProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        messageTabSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 0e1a9d84..7d9fda0d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -2,8 +2,9 @@ package io.github.wulkanowy.ui.modules.message.tab
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.MessagesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.data.repositories.message.MessageRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.ui.modules.message.MessageItem
@@ -15,28 +16,30 @@ import javax.inject.Inject
 class MessageTabPresenter @Inject constructor(
     private val errorHandler: SessionErrorHandler,
     private val schedulers: SchedulersProvider,
-    private val messagesRepository: MessagesRepository,
+    private val messageRepository: MessageRepository,
     private val studentRepository: StudentRepository,
     private val analytics: FirebaseAnalyticsHelper
 ) : BaseSessionPresenter<MessageTabView>(errorHandler) {
 
-    lateinit var folder: MessagesRepository.MessageFolder
+    lateinit var folder: MessageFolder
 
-    fun onAttachView(view: MessageTabView, folder: MessagesRepository.MessageFolder) {
+    fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
         this.folder = folder
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the $folder message")
         onParentViewLoadData(true)
     }
 
     fun onParentViewLoadData(forceRefresh: Boolean) {
+        Timber.i("Loading $folder message data started")
         disposable.apply {
             clear()
             add(studentRepository.getCurrentStudent()
-                .flatMap { messagesRepository.getMessages(it.studentId, folder, forceRefresh) }
+                .flatMap { messageRepository.getMessages(it, folder, forceRefresh) }
                 .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -44,17 +47,20 @@ class MessageTabPresenter @Inject constructor(
                     view?.run {
                         showRefresh(false)
                         showProgress(false)
+                        enableSwipe(true)
                         notifyParentDataLoaded()
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading $folder message result: Success")
                     view?.run {
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                         updateData(it)
                     }
-                    analytics.logEvent("load_messages", mapOf("items" to it.size, "folder" to folder.name))
+                    analytics.logEvent("load_messages", "items" to it.size, "folder" to folder.name)
                 }) {
+                    Timber.i("Loading $folder message result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
@@ -63,9 +69,10 @@ class MessageTabPresenter @Inject constructor(
 
     fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
         if (item is MessageItem) {
+            Timber.i("Select message ${item.message.realId} item")
             view?.run {
                 openMessage(item.message.realId)
-                if (item.message.unread == true) {
+                if (item.message.unread) {
                     item.message.unread = false
                     updateItem(item)
                     updateMessage(item.message)
@@ -75,12 +82,14 @@ class MessageTabPresenter @Inject constructor(
     }
 
     private fun updateMessage(message: Message) {
-        disposable.add(messagesRepository.updateMessage(message)
+        Timber.i("Attempt to update message ${message.realId}")
+        disposable.add(messageRepository.updateMessage(message)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.d("Message ${message.realId} updated")
-            }) { error -> errorHandler.dispatch(error) }
-        )
+            .subscribe({ Timber.d("Update message ${message.realId} result: Success") })
+            { error ->
+                Timber.i("Update message ${message.realId} result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index 309e2766..bcda52b5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -20,6 +20,8 @@ interface MessageTabView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showEmpty(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index 226fccd6..5bbf6247 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -13,6 +13,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
+import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
@@ -60,6 +61,14 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
             }
         }
 
+    override val luckyNumberRes: Pair<String, Drawable?>?
+        get() {
+            return context?.run {
+                getString(R.string.lucky_number_title) to
+                    ContextCompat.getDrawable(this, R.drawable.ic_more_lucky_number_24dp)
+            }
+        }
+
     override val settingsRes: Pair<String, Drawable?>?
         get() {
             return context?.run {
@@ -114,6 +123,10 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         (activity as? MainActivity)?.pushView(NoteFragment.newInstance())
     }
 
+    override fun openLuckyNumberView() {
+        (activity as? MainActivity)?.pushView(LuckyNumberFragment.newInstance())
+    }
+
     override fun openSettingsView() {
         (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 61b187f1..5fea241c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -3,23 +3,27 @@ package io.github.wulkanowy.ui.modules.more
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import timber.log.Timber
 import javax.inject.Inject
 
 class MorePresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresenter<MoreView>(errorHandler) {
 
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
+        Timber.i("More view is attached")
         view.initView()
         loadData()
     }
 
     fun onItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is MoreItem) {
+            Timber.i("Select more item \"${item.title}\"")
             view?.run {
                 when (item.title) {
                     messagesRes?.first -> openMessagesView()
                     homeworkRes?.first -> openHomeworkView()
                     noteRes?.first -> openNoteView()
+                    luckyNumberRes?.first -> openLuckyNumberView()
                     settingsRes?.first -> openSettingsView()
                     aboutRes?.first -> openAboutView()
                 }
@@ -28,15 +32,18 @@ class MorePresenter @Inject constructor(errorHandler: ErrorHandler) : BasePresen
     }
 
     fun onViewReselected() {
+        Timber.i("More view is reselected")
         view?.popView()
     }
 
     private fun loadData() {
+        Timber.i("Load items for more view")
         view?.run {
             updateData(listOfNotNull(
                 messagesRes?.let { MoreItem(it.first, it.second) },
                 homeworkRes?.let { MoreItem(it.first, it.second) },
                 noteRes?.let { MoreItem(it.first, it.second) },
+                luckyNumberRes?.let { MoreItem(it.first, it.second) },
                 settingsRes?.let { MoreItem(it.first, it.second) },
                 aboutRes?.let { MoreItem(it.first, it.second) })
             )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index 08ff82ad..333edc5d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -11,6 +11,8 @@ interface MoreView : BaseView {
 
     val noteRes: Pair<String, Drawable?>?
 
+    val luckyNumberRes: Pair<String, Drawable?>?
+
     val settingsRes: Pair<String, Drawable?>?
 
     val aboutRes: Pair<String, Drawable?>?
@@ -30,4 +32,6 @@ interface MoreView : BaseView {
     fun openHomeworkView()
 
     fun openNoteView()
+
+    fun openLuckyNumberView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index 243f2575..fc773e10 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -7,11 +7,13 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_note.*
@@ -52,12 +54,16 @@ class NoteFragment : BaseSessionFragment(), NoteView, MainView.TitledView {
         noteRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = noteAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
     }
 
     override fun showNoteDialog(note: Note) {
-        NoteDialog.newInstance(note).show(fragmentManager, note.toString())
+        (activity as? MainActivity)?.showDialogFragment(NoteDialog.newInstance(note))
     }
 
     override fun updateData(data: List<NoteItem>) {
@@ -80,6 +86,10 @@ class NoteFragment : BaseSessionFragment(), NoteView, MainView.TitledView {
         noteProgress.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        noteSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         noteRecycler.visibility = if (show) VISIBLE else GONE
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
index 97635a2c..71562fc4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
@@ -46,11 +46,14 @@ class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
         other as NoteItem
 
         if (note != other.note) return false
+        if (note.id != other.note.id) return false
         return true
     }
 
     override fun hashCode(): Int {
-        return note.hashCode()
+        var result = note.hashCode()
+        result = 31 * result + note.id.toInt()
+        return result
     }
 
     class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index c388a3f7..32e2a4ad 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.note
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.repositories.NoteRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.note.NoteRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -23,18 +23,21 @@ class NotePresenter @Inject constructor(
 
     override fun onAttachView(view: NoteView) {
         super.onAttachView(view)
+        Timber.i("Note view is attached")
         view.initView()
         loadData()
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the note")
         loadData(true)
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
+        Timber.i("Loading note data started")
         disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { noteRepository.getNotes(it, forceRefresh) }
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
+            .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
             .map { items -> items.map { NoteItem(it) } }
             .map { items -> items.sortedByDescending { it.note.date } }
             .subscribeOn(schedulers.backgroundThread)
@@ -43,15 +46,18 @@ class NotePresenter @Inject constructor(
                 view?.run {
                     hideRefresh()
                     showProgress(false)
+                    enableSwipe(true)
                 }
             }.subscribe({
+                Timber.i("Loading note result: Success")
                 view?.apply {
                     updateData(it)
                     showEmpty(it.isEmpty())
                     showContent(it.isNotEmpty())
                 }
-                analytics.logEvent("load_note", mapOf("items" to it.size, "force_refresh" to forceRefresh))
+                analytics.logEvent("load_note", "items" to it.size, "force_refresh" to forceRefresh)
             }, {
+                Timber.i("Loading note result: An exception occurred")
                 view?.run { showEmpty(isViewEmpty) }
                 errorHandler.dispatch(it)
             })
@@ -60,6 +66,7 @@ class NotePresenter @Inject constructor(
 
     fun onNoteItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is NoteItem) {
+            Timber.i("Select note item ${item.note.id}")
             view?.run {
                 showNoteDialog(item.note)
                 if (!item.note.isRead) {
@@ -72,12 +79,14 @@ class NotePresenter @Inject constructor(
     }
 
     private fun updateNote(note: Note) {
+        Timber.i("Attempt to update note ${note.id}")
         disposable.add(noteRepository.updateNote(note)
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.d("Note ${note.id} updated")
-            }) { error -> errorHandler.dispatch(error) }
-        )
+            .subscribe({ Timber.i("Update note result: Success") })
+            { error ->
+                Timber.i("Update note result: An exception occurred")
+                errorHandler.dispatch(error)
+            })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
index c060c8ed..38e6c94f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
@@ -20,6 +20,8 @@ interface NoteView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun hideRefresh()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 7273e8e9..d82eaba7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
 import com.takisoft.preferencex.PreferenceFragmentCompat
 import dagger.android.support.AndroidSupportInjection
+import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -36,6 +37,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
 
     override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.scheme_preferences)
+        findPreference(getString(R.string.pref_key_notification_debug)).isVisible = DEBUG
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 40368913..65e871ea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -1,44 +1,40 @@
 package io.github.wulkanowy.ui.modules.settings
 
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.services.job.ServiceHelper
+import com.readystatesoftware.chuck.api.ChuckCollector
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.isHolidays
 import org.threeten.bp.LocalDate.now
+import timber.log.Timber
 import javax.inject.Inject
 
 class SettingsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     private val preferencesRepository: PreferencesRepository,
-    private val serviceHelper: ServiceHelper,
-    private val analytics: FirebaseAnalyticsHelper
+    private val analytics: FirebaseAnalyticsHelper,
+    private val syncManager: SyncManager,
+    private val chuckCollector: ChuckCollector
 ) : BasePresenter<SettingsView>(errorHandler) {
 
     override fun onAttachView(view: SettingsView) {
         super.onAttachView(view)
-
-        view.run {
-            setServicesSuspended(preferencesRepository.serviceEnablesKey, now().isHolidays)
-        }
+        Timber.i("Settings view is attached")
+        view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
     }
 
     fun onSharedPreferenceChanged(key: String) {
-        when (key) {
-            preferencesRepository.serviceEnablesKey -> {
-                if (preferencesRepository.isServiceEnabled) serviceHelper.startFullSyncService()
-                else serviceHelper.stopFullSyncService()
-            }
-            preferencesRepository.servicesIntervalKey,
-            preferencesRepository.servicesOnlyWifiKey -> {
-                serviceHelper.reloadFullSyncService()
-            }
-            preferencesRepository.currentThemeKey -> {
-                view?.setTheme(preferencesRepository.currentTheme)
+        Timber.i("Change settings $key")
+        preferencesRepository.apply {
+            when (key) {
+                serviceEnableKey -> syncManager.run { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
+                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
+                currentThemeKey -> view?.setTheme(currentTheme)
+                isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
             }
         }
-
-        analytics.logEvent("setting_changed", mapOf("name" to key))
+        analytics.logEvent("setting_changed", "name" to key)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 223d7abe..2bd62533 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.ui.modules.splash
 
 import android.os.Bundle
+import android.widget.Toast
+import android.widget.Toast.LENGTH_LONG
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -26,6 +28,10 @@ class SplashActivity : BaseActivity(), SplashView {
         finish()
     }
 
+    override fun showError(text: String, error: Throwable) {
+        Toast.makeText(this, text, LENGTH_LONG).show()
+    }
+
     override fun onDestroy() {
         presenter.onDetachView()
         super.onDestroy()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index 5f8ba16e..b6bf0e2a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -1,20 +1,27 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
     private val studentRepository: StudentRepository,
-    errorHandler: ErrorHandler
+    private val errorHandler: ErrorHandler,
+    private val schedulers: SchedulersProvider
 ) : BasePresenter<SplashView>(errorHandler) {
 
     override fun onAttachView(view: SplashView) {
         super.onAttachView(view)
-        view.run {
-            if (studentRepository.isStudentSaved) openMainView()
-            else openLoginView()
-        }
+        disposable.add(studentRepository.isStudentSaved()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view.apply {
+                    if (it) openMainView()
+                    else openLoginView()
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 743f37e5..7e286c92 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -1,16 +1,19 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
+import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.android.synthetic.main.dialog_timetable.*
+import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
@@ -38,41 +41,110 @@ class TimetableDialog : DialogFragment() {
         return inflater.inflate(R.layout.dialog_timetable, container, false)
     }
 
-    @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        timetableDialogSubject.text = lesson.subject
-        timetableDialogTime.text = "${lesson.start.toFormattedString("HH:mm")} - ${lesson.end.toFormattedString("HH:mm")}"
-
-        lesson.group.let {
-            if (it.isBlank()) {
-                timetableDialogGroupTitle.visibility = GONE
-                timetableDialogGroup.visibility = GONE
-            } else timetableDialogGroup.text = it
-        }
-
-        lesson.room.let {
-            if (it.isBlank()) {
-                timetableDialogRoomTitle.visibility = GONE
-                timetableDialogRoom.visibility = GONE
-            } else timetableDialogRoom.text = it
-        }
-
-        lesson.teacher.let {
-            if (it.isBlank()) {
-                timetableDialogTeacherTitle.visibility = GONE
-                timetableDialogTeacher.visibility = GONE
-            } else timetableDialogTeacher.text = it
-        }
-
-        lesson.info.let {
-            if (it.isBlank()) {
-                timetableDialogChangesTitle.visibility = GONE
-                timetableDialogChanges.visibility = GONE
-            } else timetableDialogChanges.text = it
+        lesson.run {
+            setInfo(info, teacher, canceled, changes)
+            setSubject(subject, subjectOld)
+            setTeacher(teacher, teacherOld)
+            setGroup(group)
+            setRoom(room, roomOld)
+            setTime(start, end)
         }
 
         timetableDialogClose.setOnClickListener { dismiss() }
     }
+
+    private fun setSubject(subject: String, subjectOld: String) {
+        timetableDialogSubject.text = subject
+        if (subjectOld.isNotBlank() && subjectOld != subject) {
+            timetableDialogSubject.run {
+                paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                text = subjectOld
+            }
+            timetableDialogSubjectNew.run {
+                visibility = VISIBLE
+                text = subject
+            }
+        }
+    }
+
+    private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
+        when {
+            info.isNotBlank() -> timetableDialogChanges.text = when {
+                canceled && !changes -> "Lekcja odwołana: $info"
+                changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                else -> info.capitalize()
+            }
+            else -> {
+                timetableDialogChangesTitle.visibility = GONE
+                timetableDialogChanges.visibility = GONE
+            }
+        }
+    }
+
+    private fun setTeacher(teacher: String, teacherOld: String) {
+        when {
+            teacherOld.isNotBlank() && teacherOld != teacher -> {
+                timetableDialogTeacher.run {
+                    visibility = VISIBLE
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = teacherOld
+                }
+                if (teacher.isNotBlank()) {
+                    timetableDialogTeacherNew.run {
+                        visibility = VISIBLE
+                        text = teacher
+                    }
+                }
+            }
+            teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+            else -> {
+                timetableDialogTeacherTitle.visibility = GONE
+                timetableDialogTeacher.visibility = GONE
+            }
+        }
+    }
+
+    private fun setGroup(group: String) {
+        group.let {
+            when {
+                it.isNotBlank() -> timetableDialogGroup.text = it
+                else -> {
+                    timetableDialogGroupTitle.visibility = GONE
+                    timetableDialogGroup.visibility = GONE
+                }
+            }
+        }
+    }
+
+    private fun setRoom(room: String, roomOld: String) {
+        when {
+            roomOld.isNotBlank() && roomOld != room -> {
+                timetableDialogRoom.run {
+                    visibility = VISIBLE
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = roomOld
+                }
+                if (room.isNotBlank()) {
+                    timetableDialogRoomNew.run {
+                        visibility = VISIBLE
+                        text = room
+                    }
+                }
+            }
+            room.isNotBlank() -> timetableDialogRoom.text = room
+            else -> {
+                timetableDialogRoomTitle.visibility = GONE
+                timetableDialogRoom.visibility = GONE
+            }
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun setTime(start: LocalDateTime, end: LocalDateTime) {
+        timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index faf17665..3b1259f7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -2,15 +2,21 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable.*
 import javax.inject.Inject
@@ -38,6 +44,14 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
     override val isViewEmpty: Boolean
         get() = timetableAdapter.isEmpty
 
+    override val currentStackSize: Int?
+        get() = (activity as? MainActivity)?.currentStackSize
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_timetable, container, false)
     }
@@ -56,12 +70,25 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
         timetableRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = timetableAdapter
+            addItemDecoration(FlexibleItemDecoration(context)
+                .withDefaultDivider()
+                .withDrawDividerOnLastItem(false)
+            )
         }
         timetableSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
         timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         timetableNextButton.setOnClickListener { presenter.onNextDay() }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+        inflater?.inflate(R.menu.action_menu_timetable, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return if (item?.itemId == R.id.timetableMenuCompletedLessons) presenter.onCompletedLessonsSwitchSelected()
+        else false
+    }
+
     override fun updateData(data: List<TimetableItem>) {
         timetableAdapter.updateDataSet(data, true)
     }
@@ -86,6 +113,10 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
         presenter.onViewReselected()
     }
 
+    override fun popView() {
+        (activity as? MainActivity)?.popView()
+    }
+
     override fun showEmpty(show: Boolean) {
         timetableEmpty.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -94,6 +125,10 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
         timetableProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
+    override fun enableSwipe(enable: Boolean) {
+        timetableSwipe.isEnabled = enable
+    }
+
     override fun showContent(show: Boolean) {
         timetableRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
@@ -107,7 +142,11 @@ class TimetableFragment : BaseSessionFragment(), TimetableView, MainView.MainChi
     }
 
     override fun showTimetableDialog(lesson: Timetable) {
-        TimetableDialog.newInstance(lesson).show(fragmentManager, lesson.toString())
+        (activity as? MainActivity)?.showDialogFragment(TimetableDialog.newInstance(lesson))
+    }
+
+    override fun openCompletedLessonsView() {
+        (activity as? MainActivity)?.pushView(CompletedLessonsFragment.newInstance())
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 27a9db99..3786a362 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
 import io.github.wulkanowy.ui.base.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
@@ -17,6 +17,7 @@ import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
+import timber.log.Timber
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
@@ -34,6 +35,7 @@ class TimetablePresenter @Inject constructor(
 
     fun onAttachView(view: TimetableView, date: Long?) {
         super.onAttachView(view)
+        Timber.i("Timetable is attached")
         view.initView()
         loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
         reloadView()
@@ -50,23 +52,38 @@ class TimetablePresenter @Inject constructor(
     }
 
     fun onSwipeRefresh() {
+        Timber.i("Force refreshing the timetable")
         loadData(currentDate, true)
     }
 
     fun onViewReselected() {
-        now().nextOrSameSchoolDay.also {
-            if (currentDate != it) {
-                loadData(it)
-                reloadView()
-            } else if (view?.isViewEmpty == false) view?.resetView()
+        Timber.i("Timetable view is reselected")
+        view?.also { view ->
+            if (view.currentStackSize == 1) {
+                now().nextOrSameSchoolDay.also {
+                    if (currentDate != it) {
+                        loadData(it)
+                        reloadView()
+                    } else if (!view.isViewEmpty) view.resetView()
+                }
+            } else view.popView()
         }
     }
 
     fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is TimetableItem) view?.showTimetableDialog(item.lesson)
+        if (item is TimetableItem) {
+            Timber.i("Select exam item ${item.lesson.id}")
+            view?.showTimetableDialog(item.lesson)
+        }
+    }
+
+    fun onCompletedLessonsSwitchSelected(): Boolean {
+        view?.openCompletedLessonsView()
+        return true
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading timetable data started")
         currentDate = date
         disposable.apply {
             clear()
@@ -82,16 +99,19 @@ class TimetablePresenter @Inject constructor(
                     view?.run {
                         hideRefresh()
                         showProgress(false)
+                        enableSwipe(true)
                     }
                 }
                 .subscribe({
+                    Timber.i("Loading timetable result: Success")
                     view?.apply {
                         updateData(it)
                         showEmpty(it.isEmpty())
                         showContent(it.isNotEmpty())
                     }
-                    analytics.logEvent("load_attendance", mapOf("items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd")))
+                    analytics.logEvent("load_timetable", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
                 }) {
+                    Timber.i("Loading timetable result: An exception occurred")
                     view?.run { showEmpty(isViewEmpty) }
                     errorHandler.dispatch(it)
                 })
@@ -99,8 +119,10 @@ class TimetablePresenter @Inject constructor(
     }
 
     private fun reloadView() {
+        Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
+            enableSwipe(false)
             showContent(false)
             showEmpty(false)
             clearData()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index 0ad0eaeb..c08961c3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -9,6 +9,8 @@ interface TimetableView : BaseSessionView {
 
     val isViewEmpty: Boolean
 
+    val currentStackSize: Int?
+
     fun initView()
 
     fun updateData(data: List<TimetableItem>)
@@ -25,6 +27,8 @@ interface TimetableView : BaseSessionView {
 
     fun showProgress(show: Boolean)
 
+    fun enableSwipe(enable: Boolean)
+
     fun showContent(show: Boolean)
 
     fun showPreButton(show: Boolean)
@@ -32,4 +36,8 @@ interface TimetableView : BaseSessionView {
     fun showNextButton(show: Boolean)
 
     fun showTimetableDialog(lesson: Timetable)
+
+    fun popView()
+
+    fun openCompletedLessonsView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
new file mode 100644
index 00000000..8f7b1ec5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -0,0 +1,73 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import kotlinx.android.synthetic.main.dialog_lesson_completed.*
+
+class CompletedLessonDialog : DialogFragment() {
+
+    private lateinit var completedLesson: CompletedLesson
+
+    companion object {
+        private const val ARGUMENT_KEY = "Item"
+
+        fun newInstance(exam: CompletedLesson): CompletedLessonDialog {
+            return CompletedLessonDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+        arguments?.run {
+            completedLesson = getSerializable(CompletedLessonDialog.ARGUMENT_KEY) as CompletedLesson
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.dialog_lesson_completed, container, false)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        completedLessonDialogSubject.text = completedLesson.subject
+        completedLessonDialogTopic.text = completedLesson.topic
+        completedLessonDialogTeacher.text = completedLesson.teacher
+        completedLessonDialogAbsence.text = completedLesson.absence
+        completedLessonDialogChanges.text = completedLesson.substitution
+        completedLessonDialogResources.text = completedLesson.resources
+
+        completedLesson.substitution.let {
+            if (it.isBlank()) {
+                completedLessonDialogChangesTitle.visibility = View.GONE
+                completedLessonDialogChanges.visibility = View.GONE
+            } else completedLessonDialogChanges.text = it
+        }
+
+        completedLesson.absence.let {
+            if (it.isBlank()) {
+                completedLessonDialogAbsenceTitle.visibility = View.GONE
+                completedLessonDialogAbsence.visibility = View.GONE
+            } else completedLessonDialogAbsence.text = it
+        }
+
+        completedLesson.resources.let {
+            if (it.isBlank()) {
+                completedLessonDialogResourcesTitle.visibility = View.GONE
+                completedLessonDialogResources.visibility = View.GONE
+            } else completedLessonDialogResources.text = it
+        }
+
+        completedLessonDialogClose.setOnClickListener { dismiss() }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
new file mode 100644
index 00000000..716903f5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_completed_lesson.*
+
+class CompletedLessonItem(val completedLesson: CompletedLesson) : AbstractFlexibleItem<CompletedLessonItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_completed_lesson
+
+    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): CompletedLessonItem.ViewHolder {
+        return CompletedLessonItem.ViewHolder(view, adapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: CompletedLessonItem.ViewHolder?, position: Int, payloads: MutableList<Any>?) {
+        holder?.apply {
+            completedLessonItemNumber.text = completedLesson.number.toString()
+            completedLessonItemSubject.text = completedLesson.subject
+            completedLessonItemTopic.text = completedLesson.topic
+            completedLessonItemAlert.visibility = if (completedLesson.substitution.isNotEmpty()) VISIBLE else GONE
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as CompletedLessonItem
+
+        if (completedLesson != other.completedLesson) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return completedLesson.hashCode()
+    }
+
+    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View?
+            get() = contentView
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
new file mode 100644
index 00000000..50d55685
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.content.res.Resources
+import com.readystatesoftware.chuck.api.ChuckCollector
+import io.github.wulkanowy.api.interceptor.FeatureDisabledException
+import io.github.wulkanowy.ui.base.session.SessionErrorHandler
+import javax.inject.Inject
+
+class CompletedLessonsErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckCollector: ChuckCollector
+) : SessionErrorHandler(resources, chuckCollector) {
+
+    var onFeatureDisabled: () -> Unit = {}
+
+    override fun proceed(error: Throwable) {
+        when (error) {
+            is FeatureDisabledException -> onFeatureDisabled()
+            else -> super.proceed(error)
+        }
+    }
+
+    override fun clear() {
+        super.clear()
+        onFeatureDisabled = {}
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
new file mode 100644
index 00000000..bb328c41
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -0,0 +1,124 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.ui.base.session.BaseSessionFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_timetable_completed.*
+import javax.inject.Inject
+
+class CompletedLessonsFragment : BaseSessionFragment(), CompletedLessonsView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: CompletedLessonsPresenter
+
+    @Inject
+    lateinit var completedLessonsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    companion object {
+        private const val SAVED_DATE_KEY = "CURRENT_DATE"
+
+        fun newInstance() = CompletedLessonsFragment()
+    }
+
+    override val titleStringId: Int
+        get() = R.string.completed_lessons_title
+
+    override val isViewEmpty
+        get() = completedLessonsAdapter.isEmpty
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        messageContainer = completedLessonsRecycler
+        presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
+    }
+
+    override fun initView() {
+        completedLessonsAdapter.run {
+            setOnItemClickListener { presenter.onCompletedLessonsItemSelected(it) }
+        }
+
+        completedLessonsRecycler.run {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = completedLessonsAdapter
+        }
+        completedLessonsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+        completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+    }
+
+    override fun updateData(data: List<CompletedLessonItem>) {
+        completedLessonsAdapter.updateDataSet(data, true)
+    }
+
+    override fun clearData() {
+        completedLessonsAdapter.clear()
+    }
+
+    override fun updateNavigationDay(date: String) {
+        completedLessonsNavDate.text = date
+    }
+
+    override fun hideRefresh() {
+        completedLessonsSwipe.isRefreshing = false
+    }
+
+    override fun showEmpty(show: Boolean) {
+        completedLessonsEmpty.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showFeatureDisabled() {
+        context?.let {
+            completedLessonsInfo.text = getString(R.string.error_feature_disabled)
+            completedLessonsInfoImage.setImageDrawable(ContextCompat.getDrawable(it, R.drawable.ic_all_close_circle_24dp))
+        }
+    }
+
+    override fun showProgress(show: Boolean) {
+        completedLessonsProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        completedLessonsSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        completedLessonsRecycler.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showPreButton(show: Boolean) {
+        completedLessonsPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showNextButton(show: Boolean) {
+        completedLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+    }
+
+    override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
+        (activity as? MainActivity)?.showDialogFragment(CompletedLessonDialog.newInstance(completedLesson))
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putLong(CompletedLessonsFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
new file mode 100644
index 00000000..ddc81818
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -0,0 +1,118 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.session.BaseSessionPresenter
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class CompletedLessonsPresenter @Inject constructor(
+    private val schedulers: SchedulersProvider,
+    private val errorHandler: CompletedLessonsErrorHandler,
+    private val studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
+    private val completedLessonsRepository: CompletedLessonsRepository,
+    private val analytics: FirebaseAnalyticsHelper
+) : BaseSessionPresenter<CompletedLessonsView>(errorHandler) {
+
+    lateinit var currentDate: LocalDate
+        private set
+
+    fun onAttachView(view: CompletedLessonsView, date: Long?) {
+        super.onAttachView(view)
+        Timber.i("Completed lessons is attached")
+        view.initView()
+        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        reloadView()
+        errorHandler.onFeatureDisabled = {
+            this.view?.showFeatureDisabled()
+            Timber.i("Completed lessons feature disabled by school")
+        }
+    }
+
+    fun onPreviousDay() {
+        loadData(currentDate.previousSchoolDay)
+        reloadView()
+    }
+
+    fun onNextDay() {
+        loadData(currentDate.nextSchoolDay)
+        reloadView()
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the completed lessons")
+        loadData(currentDate, true)
+    }
+
+    fun onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
+        if (item is CompletedLessonItem) {
+            Timber.i("Select completed lessons item ${item.completedLesson.id}")
+            view?.showCompletedLessonDialog(item.completedLesson)
+        }
+    }
+
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading completed lessons data started")
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { semesterRepository.getCurrentSemester(it) }
+                .delay(200, TimeUnit.MILLISECONDS)
+                .flatMap { completedLessonsRepository.getCompletedLessons(it, currentDate, currentDate, forceRefresh) }
+                .map { items -> items.map { CompletedLessonItem(it) } }
+                .map { items -> items.sortedBy { it.completedLesson.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
+                    Timber.i("Loading completed lessons lessons result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                    }
+                    analytics.logEvent("load_completed_lessons", "items" to it.size, "force_refresh" to forceRefresh, START_DATE to currentDate.toFormattedString("yyyy-MM-dd"))
+                }) {
+                    Timber.i("Loading completed lessons result: An exception occurred")
+                    view?.run { showEmpty(isViewEmpty) }
+                    errorHandler.dispatch(it)
+                })
+        }
+    }
+
+    private fun reloadView() {
+        Timber.i("Reload completed lessons view with the date ${currentDate.toFormattedString()}")
+        view?.apply {
+            showProgress(true)
+            enableSwipe(false)
+            showContent(false)
+            showEmpty(false)
+            clearData()
+            showNextButton(!currentDate.plusDays(1).isHolidays)
+            showPreButton(!currentDate.minusDays(1).isHolidays)
+            updateNavigationDay(currentDate.toFormattedString("EEEE \n dd.MM.YYYY").capitalize())
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
new file mode 100644
index 00000000..9607cc47
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.ui.base.session.BaseSessionView
+
+interface CompletedLessonsView : BaseSessionView {
+
+    val isViewEmpty: Boolean
+
+    fun initView()
+
+    fun updateData(data: List<CompletedLessonItem>)
+
+    fun clearData()
+
+    fun updateNavigationDay(date: String)
+
+    fun hideRefresh()
+
+    fun showEmpty(show: Boolean)
+
+    fun showFeatureDisabled()
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showPreButton(show: Boolean)
+
+    fun showNextButton(show: Boolean)
+
+    fun showCompletedLessonDialog(completedLesson: CompletedLesson)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
index fecdc42e..63560807 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
@@ -12,11 +12,11 @@ import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.disposables.CompositeDisposable
 import org.threeten.bp.LocalDate
 import timber.log.Timber
 
@@ -25,12 +25,11 @@ class TimetableWidgetFactory(
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val sharedPref: SharedPrefHelper,
+    private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
 ) : RemoteViewsService.RemoteViewsFactory {
 
-    private val disposable: CompositeDisposable = CompositeDisposable()
-
     private var lessons = emptyList<Timetable>()
 
     override fun getLoadingView() = null
@@ -45,22 +44,27 @@ class TimetableWidgetFactory(
 
     override fun onCreate() {}
 
+    override fun onDestroy() {}
+
     override fun onDataSetChanged() {
         intent?.action?.let { LocalDate.ofEpochDay(sharedPref.getLong(it, 0)) }
             ?.let { date ->
-                if (studentRepository.isStudentSaved) {
-                    disposable.add(studentRepository.getCurrentStudent()
+                try {
+                    lessons = studentRepository.isStudentSaved()
+                        .flatMap { studentRepository.getCurrentStudent() }
                         .flatMap { semesterRepository.getCurrentSemester(it) }
                         .flatMap { timetableRepository.getTimetable(it, date, date) }
                         .map { item -> item.sortedBy { it.number } }
-                        .subscribe({ lessons = it })
-                        { Timber.e(it, "An error has occurred while downloading data for the widget") })
+                        .subscribeOn(schedulers.backgroundThread)
+                        .blockingGet()
+                } catch (e: Exception) {
+                    Timber.e(e, "An error has occurred while downloading data for the widget")
                 }
             }
     }
 
     override fun getViewAt(position: Int): RemoteViews? {
-        if (position == INVALID_POSITION) return null
+        if (position == INVALID_POSITION || lessons.getOrNull(position) === null) return null
 
         return RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
             lessons[position].let {
@@ -75,7 +79,14 @@ class TimetableWidgetFactory(
 
                 if (it.info.isNotBlank()) {
                     setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
-                    setTextViewText(R.id.timetableWidgetItemDescription, it.info.capitalize())
+                    setTextViewText(R.id.timetableWidgetItemDescription, it.run {
+                        when (true) {
+                            canceled && !changes -> "Lekcja odwołana: $info"
+                            changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                            changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                            else -> it.info.capitalize()
+                        }
+                    })
                 } else setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
 
                 if (it.canceled) {
@@ -88,8 +99,4 @@ class TimetableWidgetFactory(
             setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
         }
     }
-
-    override fun onDestroy() {
-        disposable.clear()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
index a8ead8fb..290007e4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
@@ -3,9 +3,11 @@ package io.github.wulkanowy.ui.widgets.timetable
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
 import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
-import android.appwidget.AppWidgetProvider
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.widget.RemoteViews
@@ -22,9 +24,13 @@ import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.weekDayName
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
-class TimetableWidgetProvider : AppWidgetProvider() {
+class TimetableWidgetProvider : BroadcastReceiver() {
+
+    @Inject
+    lateinit var appWidgetManager: AppWidgetManager
 
     @Inject
     lateinit var sharedPref: SharedPrefHelper
@@ -42,89 +48,76 @@ class TimetableWidgetProvider : AppWidgetProvider() {
         const val BUTTON_PREV = "buttonPrev"
 
         const val BUTTON_RESET = "buttonReset"
+
+        fun createWidgetKey(appWidgetId: Int) = "timetable_widget_$appWidgetId"
     }
 
-    override fun onUpdate(context: Context?, appWidgetManager: AppWidgetManager?, appWidgetIds: IntArray?) {
-        appWidgetIds?.forEach {
-            val widgetKey = "timetable_widget_$it"
-            checkSavedWidgetDate(widgetKey)
-
-            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0))
-            context?.run {
-                RemoteViews(packageName, R.layout.widget_timetable).apply {
-                    setTextViewText(R.id.timetableWidgetDay, savedDate.weekDayName.capitalize())
-                    setTextViewText(R.id.timetableWidgetDate, savedDate.toFormattedString())
-                    setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-                    setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
-                        .apply { action = widgetKey })
-                    setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, it, it, appWidgetIds, BUTTON_NEXT))
-                    setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -it, it, appWidgetIds, BUTTON_PREV))
-                    createNavIntent(context, Int.MAX_VALUE, it, appWidgetIds, BUTTON_RESET).let { intent ->
-                        setOnClickPendingIntent(R.id.timetableWidgetDate, intent)
-                        setOnClickPendingIntent(R.id.timetableWidgetDay, intent)
-                    }
-                    setPendingIntentTemplate(R.id.timetableWidgetList,
-                        PendingIntent.getActivity(context, 1, MainActivity.getStartIntent(context).apply {
-                            putExtra(EXTRA_START_MENU_INDEX, 3)
-                        }, FLAG_UPDATE_CURRENT))
-
-                }.also { view ->
-                    appWidgetManager?.apply {
-                        notifyAppWidgetViewDataChanged(it, R.id.timetableWidgetList)
-                        updateAppWidget(it, view)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onReceive(context: Context?, intent: Intent?) {
+    override fun onReceive(context: Context, intent: Intent) {
         AndroidInjection.inject(this, context)
-        intent?.let {
-            val widgetKey = "timetable_widget_${it.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)}"
-            it.getStringExtra(EXTRA_BUTTON_TYPE).let { button ->
-                when (button) {
-                    BUTTON_NEXT -> {
-                        LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0)).nextSchoolDay
-                            .let { date -> sharedPref.putLong(widgetKey, date.toEpochDay(), true) }
-                    }
-                    BUTTON_PREV -> {
-                        LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0)).previousSchoolDay
-                            .let { date -> sharedPref.putLong(widgetKey, date.toEpochDay(), true) }
-                    }
-                    BUTTON_RESET -> sharedPref.putLong(widgetKey, LocalDate.now().nextOrSameSchoolDay.toEpochDay(), true)
-                }
-                button?.also { btn ->
-                    if (btn.isNotBlank()) {
-                        analytics.logEvent("changed_timetable_widget_day", mapOf("button" to button))
-                    }
-                }
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
+        }
+    }
+
+    private fun onUpdate(context: Context, intent: Intent) {
+        if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
+            intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS).forEach { appWidgetId ->
+                updateWidget(context, appWidgetId, now().nextOrSameSchoolDay)
+            }
+        } else {
+            val buttonType = intent.getStringExtra(EXTRA_BUTTON_TYPE)
+            val toggledWidgetId = intent.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)
+            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(createWidgetKey(toggledWidgetId), 0))
+            val date = when (buttonType) {
+                BUTTON_RESET -> now().nextOrSameSchoolDay
+                BUTTON_NEXT -> savedDate.nextSchoolDay
+                BUTTON_PREV -> savedDate.previousSchoolDay
+                else -> now().nextOrSameSchoolDay
+            }
+            if (!buttonType.isNullOrBlank()) analytics.logEvent("changed_timetable_widget_day", "button" to buttonType)
+            updateWidget(context, toggledWidgetId, date)
+        }
+    }
+
+    private fun onDelete(intent: Intent) {
+        intent.getIntExtra(EXTRA_APPWIDGET_ID, 0).let {
+            if (it != 0) sharedPref.delete(createWidgetKey(it))
+        }
+    }
+
+    private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate) {
+        RemoteViews(context.packageName, R.layout.widget_timetable).apply {
+            setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
+            setTextViewText(R.id.timetableWidgetDay, date.weekDayName.capitalize())
+            setTextViewText(R.id.timetableWidgetDate, date.toFormattedString())
+            setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
+                .apply { action = createWidgetKey(appWidgetId) })
+            setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT))
+            setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV))
+            createNavIntent(context, Int.MAX_VALUE, appWidgetId, BUTTON_RESET).also {
+                setOnClickPendingIntent(R.id.timetableWidgetDate, it)
+                setOnClickPendingIntent(R.id.timetableWidgetDay, it)
+            }
+            setPendingIntentTemplate(R.id.timetableWidgetList,
+                PendingIntent.getActivity(context, 1, MainActivity.getStartIntent(context).apply {
+                    putExtra(EXTRA_START_MENU_INDEX, 3)
+                }, FLAG_UPDATE_CURRENT))
+        }.also {
+            sharedPref.putLong(createWidgetKey(appWidgetId), date.toEpochDay(), true)
+            appWidgetManager.apply {
+                notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
+                updateAppWidget(appWidgetId, it)
             }
         }
-        super.onReceive(context, intent)
     }
 
-    override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
-        appWidgetIds?.forEach {
-            sharedPref.delete("timetable_widget_$it")
-        }
-    }
-
-    private fun createNavIntent(context: Context, code: Int, widgetId: Int, widgetIds: IntArray, buttonType: String): PendingIntent {
+    private fun createNavIntent(context: Context, code: Int, appWidgetId: Int, buttonType: String): PendingIntent {
         return PendingIntent.getBroadcast(context, code,
             Intent(context, TimetableWidgetProvider::class.java).apply {
                 action = ACTION_APPWIDGET_UPDATE
-                putExtra(EXTRA_APPWIDGET_IDS, widgetIds)
                 putExtra(EXTRA_BUTTON_TYPE, buttonType)
-                putExtra(EXTRA_TOGGLED_WIDGET_ID, widgetId)
+                putExtra(EXTRA_TOGGLED_WIDGET_ID, appWidgetId)
             }, FLAG_UPDATE_CURRENT)
     }
-
-    private fun checkSavedWidgetDate(widgetKey: String) {
-        sharedPref.run {
-            if (getLong(widgetKey, -1) == -1L) {
-                putLong(widgetKey, LocalDate.now().nextOrSameSchoolDay.toEpochDay(), true)
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index e056bf7e..70368bad 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -3,13 +3,18 @@ package io.github.wulkanowy.utils
 import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
-    val array = this.obtainStyledAttributes(null, intArrayOf(colorAttr))
-    try {
-        return array.getColor(0, 0)
+    val array = obtainStyledAttributes(null, intArrayOf(colorAttr))
+    return try {
+        array.getColor(0, 0)
     } finally {
         array.recycle()
     }
 }
+
+@ColorInt
+fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
new file mode 100644
index 00000000..caa977ec
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.utils
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+
+inline fun EditText.setOnTextChangedListener(crossinline listener: () -> Unit) {
+    addTextChangedListener(object : TextWatcher {
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            listener()
+        }
+
+        override fun afterTextChanged(s: Editable?) {}
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+    })
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index 53f9197f..feb33e5d 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -7,14 +7,14 @@ import javax.inject.Singleton
 @Singleton
 class FirebaseAnalyticsHelper(private val analytics: FirebaseAnalytics) {
 
-    fun logEvent(name: String, params: Map<String, Any?>) {
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         Bundle().apply {
             params.forEach {
-                if (it.value == null) return@forEach
-                when (it.value) {
-                    is String, is String? -> putString(it.key, it.value as String)
-                    is Int, is Int? -> putInt(it.key, it.value as Int)
-                    is Boolean, is Boolean? -> putBoolean(it.key, it.value as Boolean)
+                if (it.second == null) return@forEach
+                when (it.second) {
+                    is String, is String? -> putString(it.first, it.second as String)
+                    is Int, is Int? -> putInt(it.first, it.second as Int)
+                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
                 }
             }
             analytics.logEvent(name, this)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
index 638bf364..c863b030 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -22,18 +22,36 @@ fun List<GradeSummary>.calcAverage(): Double {
     }.average().let { if (it.isNaN()) 0.0 else it }
 }
 
-inline val Grade.valueColor: Int
-    get() {
-        return when (value) {
-            6 -> R.color.grade_six
-            5 -> R.color.grade_five
-            4 -> R.color.grade_four
-            3 -> R.color.grade_three
-            2 -> R.color.grade_two
-            1 -> R.color.grade_one
-            else -> R.color.grade_default
+fun Grade.getBackgroundColor(theme: String): Int {
+    return when (theme) {
+        "grade_color" -> when (color) {
+            "000000" -> R.color.grade_black
+            "F04C4C" -> R.color.grade_red
+            "20A4F7" -> R.color.grade_blue
+            "6ECD07" -> R.color.grade_green
+            "B16CF1" -> R.color.grade_purple
+            else -> R.color.grade_material_default
+        }
+        "material" -> when (value) {
+            6 -> R.color.grade_material_six
+            5 -> R.color.grade_material_five
+            4 -> R.color.grade_material_four
+            3 -> R.color.grade_material_three
+            2 -> R.color.grade_material_two
+            1 -> R.color.grade_material_one
+            else -> R.color.grade_material_default
+        }
+        else -> when (value) {
+            6 -> R.color.grade_vulcan_six
+            5 -> R.color.grade_vulcan_five
+            4 -> R.color.grade_vulcan_four
+            3 -> R.color.grade_vulcan_three
+            2 -> R.color.grade_vulcan_two
+            1 -> R.color.grade_vulcan_one
+            else -> R.color.grade_vulcan_default
         }
     }
+}
 
 inline val Grade.colorStringId: Int
     get() {
@@ -48,13 +66,9 @@ inline val Grade.colorStringId: Int
     }
 
 fun Grade.changeModifier(plusModifier: Double, minusModifier: Double): Grade {
-    if (modifier != 0.0) {
-        if (plusModifier != 0.0 && modifier > 0) {
-            modifier = plusModifier
-        }
-        if (minusModifier != .0 && modifier < 0) {
-            modifier = -minusModifier
-        }
+    return when {
+        modifier != .0 && plusModifier != .0 && modifier > 0 -> copy(modifier = plusModifier)
+        modifier != .0 && minusModifier != .0 && modifier < 0 -> copy(modifier = -minusModifier)
+        else -> this
     }
-    return this
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
index bea2bd3d..d9e34e87 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SpinnerExtension.kt
@@ -4,11 +4,19 @@ import android.view.View
 import android.widget.AdapterView
 import android.widget.Spinner
 
+/**
+ * @see <a href="https://stackoverflow.com/a/29602298">How to keep onItemSelected from firing off on a newly instantiated Spinner?</a>
+ */
 inline fun Spinner.setOnItemSelectedListener(crossinline listener: (view: View?) -> Unit) {
     onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
         override fun onNothingSelected(parent: AdapterView<*>?) {}
         override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-            listener(view)
+            onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+                override fun onNothingSelected(parent: AdapterView<*>?) {}
+                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                    listener(view)
+                }
+            }
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 3cd38c73..886b3d4d 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.utils
 
+import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.DayOfWeek.FRIDAY
 import org.threeten.bp.DayOfWeek.MONDAY
 import org.threeten.bp.DayOfWeek.SATURDAY
@@ -36,6 +37,8 @@ fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = this.fo
 
 fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
 
+fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
+
 /**
  * https://github.com/ThreeTen/threetenbp/issues/55
  */
diff --git a/app/src/main/play/contactEmail b/app/src/main/play/contact-email.txt
similarity index 100%
rename from app/src/main/play/contactEmail
rename to app/src/main/play/contact-email.txt
diff --git a/app/src/main/play/contactPhone b/app/src/main/play/contact-phone.txt
similarity index 100%
rename from app/src/main/play/contactPhone
rename to app/src/main/play/contact-phone.txt
diff --git a/app/src/main/play/contactWebsite b/app/src/main/play/contact-website.txt
similarity index 100%
rename from app/src/main/play/contactWebsite
rename to app/src/main/play/contact-website.txt
diff --git a/app/src/main/play/defaultLanguage b/app/src/main/play/default-language.txt
similarity index 100%
rename from app/src/main/play/defaultLanguage
rename to app/src/main/play/default-language.txt
diff --git a/app/src/main/play/pl-PL/listing/fulldescription b/app/src/main/play/listings/pl-PL/full-description.txt
similarity index 80%
rename from app/src/main/play/pl-PL/listing/fulldescription
rename to app/src/main/play/listings/pl-PL/full-description.txt
index 7c1f99fd..d33cb56f 100644
--- a/app/src/main/play/pl-PL/listing/fulldescription
+++ b/app/src/main/play/listings/pl-PL/full-description.txt
@@ -1,13 +1,14 @@
 Aplikacja jest we wczesnej fazie rozwoju, ciągle pracujemy nad kolejnymi funkcjami.
 
 Wyróżnione cechy i funkcje:
-- brak reklam,
-- tryb offline,
-- powiadomienia,
 - obliczanie średniej ważonej,
 - procentowy podgląd frekwencji,
+- szczęśliwy numerek,
+- podgląd lekcji zrealizowanych,
 - ciemny motyw.
+- brak reklam,
+- tryb offline,
+- powiadomienia.
 
 GitHub: https://github.com/wulkanowy/wulkanowy
 Discord: https://discord.gg/vccAQBr
-Trello: https://trello.com/b/A97NUM1s/wulkanowy
diff --git a/app/src/main/play/pl-PL/listing/featureGraphic/feature.png b/app/src/main/play/listings/pl-PL/graphics/feature-graphic/feature.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/featureGraphic/feature.png
rename to app/src/main/play/listings/pl-PL/graphics/feature-graphic/feature.png
diff --git a/app/src/main/play/listings/pl-PL/graphics/icon/icon.png b/app/src/main/play/listings/pl-PL/graphics/icon/icon.png
new file mode 100644
index 00000000..8c33c2f9
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/icon/icon.png differ
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/account-switcher.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/account-switcher.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-dialog.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-dialog.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/attendance-statistics.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/attendance-statistics.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/grades.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/grades.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/more.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/more.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/more.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-dialog.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-dialog.png
diff --git a/app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png
similarity index 100%
rename from app/src/main/play/pl-PL/listing/phoneScreenshots/timetable-widget.png
rename to app/src/main/play/listings/pl-PL/graphics/phone-screenshots/timetable-widget.png
diff --git a/app/src/main/play/pl-PL/listing/shortdescription b/app/src/main/play/listings/pl-PL/short-description.txt
similarity index 100%
rename from app/src/main/play/pl-PL/listing/shortdescription
rename to app/src/main/play/listings/pl-PL/short-description.txt
diff --git a/app/src/main/play/pl-PL/listing/title b/app/src/main/play/listings/pl-PL/title.txt
similarity index 100%
rename from app/src/main/play/pl-PL/listing/title
rename to app/src/main/play/listings/pl-PL/title.txt
diff --git a/app/src/main/play/pl-PL/listing/icon/icon.png b/app/src/main/play/pl-PL/listing/icon/icon.png
deleted file mode 100644
index de216d36..00000000
Binary files a/app/src/main/play/pl-PL/listing/icon/icon.png and /dev/null differ
diff --git a/app/src/main/play/pl-PL/listing/video b/app/src/main/play/pl-PL/listing/video
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew
deleted file mode 100644
index e6916874..00000000
--- a/app/src/main/play/pl-PL/whatsnew
+++ /dev/null
@@ -1,16 +0,0 @@
-Wersja 0.6.0
-
-Aplikacja została całkowicie przepisana!
-Przez wielkie zmian, które w niej zaszły, wymagane jest ponowne logowanie w aplikacji
-oraz ponowne dodanie widgetu planu lekcji do ekranu głównego.
-
-Mamy nową ikonę aplikacji! 🎉
-
-Dodaliśmy nowe funkcje:
-- przeglądanie wiadomości (wysyłanie pojawi się w przyszłości)
-- zadania domowe
-- statystyki frekwencji
-- menadżer kont
-- możliwość zmiany wagi plusów i minusów
-
-Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.6.0
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
new file mode 100644
index 00000000..6f8a6b0a
--- /dev/null
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -0,0 +1,18 @@
+Dodaliśmy:
+- szczęśliwy numerek
+- lekcje zrealizowane
+- wysyłanie wiadomości
+- ucznia na tle klasy
+- opcję zmiany kolorów ocen
+
+Zmieniliśmy:
+- wygląd ekranu logowania
+- sposób wyświetlania zastępstw
+- widok zadań domowych na tygodniowy
+
+Naprawiliśmy:
+- automatyczne przełączanie widżetu na nowy dzień
+- wyświetlanie powiadomień o starych ocenach
+- znikające numery sal w planie lekcji
+
+Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases/tag/0.7.0
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
new file mode 100644
index 00000000..00538168
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_notify_lucky_number.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="26.086956"
+    android:viewportHeight="26.086956"
+    android:tint="#FFFFFF">
+    <group
+        android:translateX="1.0434783"
+        android:translateY="1.0434783">
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 00000000..b91c4ae6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 00000000..bfced4eb
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 00000000..49e502ac
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png
new file mode 100644
index 00000000..9bab1373
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_lucky_number.png differ
diff --git a/app/src/main/res/drawable/ic_all_close_circle_24dp.xml b/app/src/main/res/drawable/ic_all_close_circle_24dp.xml
new file mode 100644
index 00000000..3809c797
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_close_circle_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_login_outlined_border.xml b/app/src/main/res/drawable/ic_login_outlined_border.xml
new file mode 100644
index 00000000..ec62251e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_login_outlined_border.xml
@@ -0,0 +1,11 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dip"
+        android:color="#61000000" />
+    <corners android:radius="4dip" />
+    <padding
+        android:bottom="0dip"
+        android:left="0dip"
+        android:right="0dip"
+        android:top="0dip" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml b/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
index dbc32c27..2a03f630 100644
--- a/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
+++ b/app/src/main/res/drawable/ic_menu_grade_semester_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
+        android:pathData="M21,17V8H7V17H21M21,3A2,2 0,0 1,23 5V17A2,2 0,0 1,21 19H7C5.89,19 5,18.1 5,17V5A2,2 0,0 1,7 3H8V1H10V3H18V1H20V3H21M3,21H17V23H3C1.89,23 1,22.1 1,21V9H3V21M19,15H15V11H19V15Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml b/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml
new file mode 100644
index 00000000..13cfc8fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_main_attendance_summary_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml b/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
new file mode 100644
index 00000000..c0664c37
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_main_lessons_completed_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V5A2,2 0,0 0,19 3M16.53,11.06L15.47,10L10.59,14.88L8.47,12.76L7.41,13.82L10.59,17L16.53,11.06Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_send_message_24dp.xml b/app/src/main/res/drawable/ic_menu_send_message_24dp.xml
new file mode 100644
index 00000000..fcc5acfb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_send_message_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_message_reply_24dp.xml b/app/src/main/res/drawable/ic_message_reply_24dp.xml
new file mode 100644
index 00000000..010cb250
--- /dev/null
+++ b/app/src/main/res/drawable/ic_message_reply_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml b/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
new file mode 100644
index 00000000..f2e6152d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_lucky_number_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2,9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83,12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22,8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_send_message_24dp.xml b/app/src/main/res/drawable/ic_send_message_24dp.xml
new file mode 100644
index 00000000..0d82394b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_send_message_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
new file mode 100644
index 00000000..00b0e77c
--- /dev/null
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:id="@+id/sendMessageContainer"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/sendMessageAppBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/WulkanowyTheme.ActionBar"
+        app:elevation="0dp">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/sendMessageToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:id="@+id/sendMessageContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/sendMessageAppBarContainer"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="14dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/message_from"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="18sp" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/sendMessageFromTextView"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:background="@android:color/transparent"
+                android:enabled="false"
+                android:textColor="?android:attr/textColorPrimaryNoDisable"
+                tools:text="Jan Kowalski" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerColor" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:paddingStart="14dp"
+            android:paddingLeft="14dp"
+            tools:ignore="RtlSymmetry">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginEnd="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/message_to"
+                android:textAlignment="center"
+                android:textColor="@android:color/darker_gray"
+                android:textSize="18sp" />
+
+            <com.pchmn.materialchips.ChipsInput
+                android:id="@+id/sendMessageRecipientsInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@android:color/transparent"
+                app:horizontalScroll="true"
+                tools:layout_height="30dp">
+
+            </com.pchmn.materialchips.ChipsInput>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerColor" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/sendMessageSubjectInput"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:background="@android:color/transparent"
+            android:hint="@string/message_subject"
+            android:inputType="text"
+            android:maxLines="1"
+            android:padding="14dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dividerColor" />
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/sendMessageContentInput"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/transparent"
+            android:gravity="top|start"
+            android:hint="@string/message_content"
+            android:inputType="textMultiLine"
+            android:paddingStart="14dp"
+            android:paddingLeft="14dp"
+            android:paddingTop="18dp"
+            android:paddingEnd="14dp"
+            android:paddingRight="14dp"
+            android:singleLine="false" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/sendMessageAppBarContainer">
+
+        <LinearLayout
+            android:id="@+id/sendMessageEmpty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:minWidth="100dp"
+                android:minHeight="100dp"
+                app:srcCompat="@drawable/ic_more_messages_24dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/error_unknown"
+                android:textSize="20sp" />
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/sendMessageProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone" />
+    </FrameLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index 13224afb..7a670878 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -2,7 +2,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.grade.details.GradeDetailsDialog">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -24,11 +25,11 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_gravity="end"
-                android:background="@color/grade_default"
+                android:background="@color/grade_material_default"
                 android:gravity="center"
-                android:text="@string/app_name"
                 android:textColor="@color/grade_text"
-                android:textSize="30sp" />
+                android:textSize="30sp"
+                tools:text="6" />
 
             <TextView
                 android:id="@+id/gradeDialogSubject"
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
new file mode 100644
index 00000000..161eb4c5
--- /dev/null
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.timetable.completed.CompletedLessonDialog">
+
+    <LinearLayout
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="20dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:text="@string/all_details"
+            android:textSize="20sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/timetable_lesson"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/completed_lessons_topic"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogTopic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogTeacherTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/all_teacher"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogTeacher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogChangesTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/timetable_changes"
+            android:textColor="@color/colorPrimary"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogChanges"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogAbsenceTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/completed_lessons_absence"
+            android:textColor="@color/colorPrimary"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogAbsence"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogResourcesTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/completed_lessons_resources"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/completedLessonDialogResources"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:autoLink="web"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+        <Button
+            android:id="@+id/completedLessonDialogClose"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginTop="15dp"
+            android:text="@string/all_close"
+            android:textAllCaps="true"
+            android:textSize="15sp" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index c9c8ec06..1cb65026 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -51,6 +51,17 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/timetableDialogSubjectNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
             android:layout_width="wrap_content"
@@ -68,6 +79,17 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/timetableDialogTeacherNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
             android:layout_width="wrap_content"
@@ -102,6 +124,17 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/timetableDialogRoomNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textColor="@color/colorPrimary"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml
index a3bdeb48..5d03c2f4 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -2,22 +2,40 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.attendance.summary.AttendanceSummaryFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatSpinner
-            android:id="@+id/attendanceSummarySubjects"
+        <LinearLayout
+            android:id="@+id/attendanceSummarySubjectsContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="invisible"
             android:background="?android:attr/windowBackground"
             android:elevation="5dp"
-            android:padding="15dp"
-            android:spinnerMode="dialog" />
+            android:padding="5dp"
+            android:visibility="invisible"
+            tools:listitem="@layout/item_attendance_summary"
+            tools:targetApi="lollipop"
+            tools:visibility="visible">
+
+            <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/attendanceSummarySubjects"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="middle"
+                android:entries="@array/endpoints_keys"
+                android:paddingStart="10dp"
+                android:paddingLeft="10dp"
+                android:paddingTop="10dp"
+                android:paddingEnd="30dp"
+                android:paddingRight="30dp"
+                android:paddingBottom="10dp"
+                android:spinnerMode="dialog" />
+        </LinearLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/attendanceSummarySwipe"
@@ -27,7 +45,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/attendanceSummaryRecycler"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                tools:listitem="@layout/item_attendance_summary" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index 522312a2..bf805175 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -5,32 +5,39 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.tabs.TabLayout
+    <io.github.wulkanowy.ui.modules.grade.CustomTabLayout
         android:id="@+id/gradeTabLayout"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@color/colorPrimary"
         android:elevation="5dp"
         android:visibility="invisible"
-        app:tabGravity="fill"
         app:tabIndicatorColor="@android:color/white"
-        app:tabMaxWidth="0dp"
-        app:tabMode="fixed"
-        app:tabTextColor="@android:color/white" />
+        app:tabMode="scrollable"
+        app:tabTextColor="@android:color/white"
+        tools:visibility="visible" />
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/gradeViewPager"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/gradeSwipe"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="48dp"
-        android:visibility="invisible" />
+        android:layout_marginTop="48dp">
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/gradeViewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible"
+            tools:visibility="visible" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <ProgressBar
         android:id="@+id/gradeProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="invisible" />
 
     <LinearLayout
         android:id="@+id/gradeEmpty"
@@ -38,7 +45,8 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:visibility="visible">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index aab81075..610006e1 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -2,7 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.grade.details.GradeDetailsFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeDetailsSwipe"
@@ -20,7 +21,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/gradeDetailsEmpty"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
new file mode 100644
index 00000000..9c7f3795
--- /dev/null
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -0,0 +1,130 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.modules.grade.statistics.GradeStatisticsFragment">
+
+    <LinearLayout
+        android:id="@+id/gradeStatisticsSubjectsContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/windowBackground"
+        android:elevation="5dp"
+        android:padding="5dp"
+        android:visibility="invisible"
+        tools:listitem="@layout/item_attendance_summary"
+        tools:targetApi="lollipop"
+        tools:visibility="visible">
+
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/gradeStatisticsSubjects"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:entries="@array/endpoints_keys"
+            android:paddingStart="10dp"
+            android:paddingLeft="10dp"
+            android:paddingTop="10dp"
+            android:paddingEnd="30dp"
+            android:paddingRight="30dp"
+            android:paddingBottom="10dp"
+            android:spinnerMode="dialog" />
+    </LinearLayout>
+
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/gradeStatisticsSwipe"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RadioGroup
+                    android:id="@+id/gradeStatisticsTypeSwitch"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="5dp"
+                    android:visibility="invisible"
+                    tools:visibility="visible">
+
+                    <RadioButton
+                        android:id="@+id/gradeStatisticsTypePartial"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:tag="partial"
+                        android:text="@string/grade_statistics_partial" />
+
+                    <RadioButton
+                        android:id="@+id/gradeStatisticsTypeSemester"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:tag="annual"
+                        android:text="@string/grade_statistics_semester" />
+                </RadioGroup>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <com.github.mikephil.charting.charts.PieChart
+                        android:id="@+id/gradeStatisticsChart"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="10dp"
+                        android:background="?android:attr/windowBackground"
+                        android:minHeight="400dp"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                    <ProgressBar
+                        android:id="@+id/gradeStatisticsProgress"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:indeterminate="true"
+                        tools:visibility="gone" />
+
+                    <LinearLayout
+                        android:id="@+id/gradeStatisticsEmpty"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minWidth="100dp"
+                            android:minHeight="100dp"
+                            app:srcCompat="@drawable/ic_menu_main_grade_26dp"
+                            app:tint="?android:attr/textColorPrimary"
+                            tools:ignore="contentDescription" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:gravity="center"
+                            android:text="@string/grade_no_items"
+                            android:textSize="20sp" />
+                    </LinearLayout>
+                </FrameLayout>
+            </LinearLayout>
+        </ScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index 37b97028..92a34f71 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -2,7 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.grade.summary.GradeSummaryFragment">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeSummarySwipe"
@@ -20,7 +21,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:indeterminate="true" />
+        android:indeterminate="true"
+        tools:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/gradeSummaryEmpty"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index a2ee8647..81baf4af 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -1,147 +1,186 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/loginFormProgressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/loginFormProgressText"
-            android:layout_centerHorizontal="true"
-            android:indeterminate="true"
-            android:minWidth="220dp"
-            android:minHeight="30dp" />
-
-        <TextView
-            android:id="@+id/loginFormProgressText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="15dp"
-            android:text="@string/login_progress" />
-    </RelativeLayout>
-
-    <ScrollView
-        android:id="@+id/loginScroll"
+    <ProgressBar
+        android:id="@+id/loginFormProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fillViewport="true"
         android:scrollbars="none">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/loginFormContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginRight="16dp"
-            android:orientation="vertical">
+            android:layout_height="wrap_content">
 
             <TextView
-                android:id="@+id/loginHeader"
+                android:id="@+id/loginFormHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="24dp"
+                android:layout_marginStart="32dp"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginRight="32dp"
+                android:gravity="center_horizontal"
                 android:text="@string/login_header_default"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
 
-            <LinearLayout
-                android:id="@+id/loginMainForm"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dp"
-                    android:hint="@string/login_nickname_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/loginNicknameEdit"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textEmailAddress"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dp"
-                    android:hint="@string/login_password_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/loginPassEdit"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:imeActionLabel="@string/login_sign_in"
-                        android:imeOptions="actionDone"
-                        android:inputType="textPassword"
-                        android:maxLines="1"
-                        app:fontFamily="sans-serif" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <androidx.appcompat.widget.AppCompatSpinner
-                    android:id="@+id/loginHostEdit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_host_hint" />
-            </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginSymbolInput"
+                android:id="@+id/loginFormNameLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/login_symbol_hint"
-                android:visibility="gone">
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_nickname_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormPassLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
 
-                <AutoCompleteTextView
-                    android:id="@+id/loginSymbolEdit"
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/loginFormName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1" />
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormPassLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_password_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
+                app:passwordToggleEnabled="true">
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/loginFormPass"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
-                    android:inputType="textAutoComplete"
+                    android:inputType="textPassword"
                     android:maxLines="1"
-                    tools:ignore="LabelFor" />
+                    app:fontFamily="sans-serif" />
+
             </com.google.android.material.textfield.TextInputLayout>
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/loginSignButton"
-                style="?android:textAppearanceSmall"
+            <LinearLayout
+                android:id="@+id/loginFormHostLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="30dp"
-                android:text="@string/login_sign_in"
-                android:textColor="@android:color/white"
-                android:textStyle="bold"
-                app:backgroundTint="@color/colorPrimary" />
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:background="@drawable/ic_login_outlined_border"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/loginFormHost"
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp" />
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/loginVersion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="30dp"
-                android:text="@string/app_name"
-                android:textColor="@color/second_text"
-                android:visibility="gone" />
-        </LinearLayout>
-    </ScrollView>
-</RelativeLayout>
+                android:layout_marginStart="7dp"
+                android:layout_marginLeft="7dp"
+                android:layout_marginBottom="48dp"
+                android:background="?android:colorBackground"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:text="@string/login_host_hint"
+                android:textColor="?android:textColorHint"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@+id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="@+id/loginFormHostLayout"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="@+id/loginFormHostLayout" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormSignIn"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:layout_marginBottom="48dp"
+                android:text="@string/login_sign_in"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                app:backgroundTint="@color/colorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout"
+                app:layout_constraintVertical_bias="1.0" />
+
+            <TextView
+                android:id="@+id/loginFormVersion"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
+                android:maxLines="2"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
+                app:layout_constraintEnd_toStartOf="@+id/loginFormSignIn"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/loginFormSignIn"
+                tools:text="Version 1.0.0" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_options.xml b/app/src/main/res/layout/fragment_login_options.xml
deleted file mode 100644
index 45636ad8..00000000
--- a/app/src/main/res/layout/fragment_login_options.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/loginOptionsProgressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:visibility="gone">
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/loginOptionsProgressText"
-            android:layout_centerHorizontal="true"
-            android:indeterminate="true"
-            android:minHeight="30dp"
-            android:minWidth="220dp" />
-
-        <TextView
-            android:id="@+id/loginOptionsProgressText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="15dp"
-            android:text="@string/login_sync" />
-    </RelativeLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/loginOptionsRecycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
new file mode 100644
index 00000000..72af7293
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -0,0 +1,21 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/loginStudentSelectProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/loginStudentSelectRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:itemCount="5"
+        tools:listitem="@layout/item_login_student_select" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
new file mode 100644
index 00000000..6cdf7ef0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -0,0 +1,98 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/loginSymbolProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/loginSymbolContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/loginSymbolHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginRight="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_header_symbol"
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@+id/loginSymbolNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginSymbolNameLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_symbol_hint"
+                app:helperText="@string/login_symbol_helper"
+                app:helperTextEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginSymbolSignIn"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHeader">
+
+                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                    android:id="@+id/loginSymbolName"
+                    style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeActionLabel="@string/login_sign_in"
+                    android:imeOptions="actionDone"
+                    android:inputType="textAutoComplete"
+                    android:maxLines="1"
+                    tools:ignore="LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginSymbolSignIn"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:layout_marginBottom="48dp"
+                android:text="@string/login_sign_in"
+                android:textAppearance="?android:textAppearanceSmall"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                app:backgroundTint="@color/colorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolNameLayout"
+                app:layout_constraintVertical_bias="1" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
new file mode 100644
index 00000000..b881f1bd
--- /dev/null
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/luckyNumberProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        tools:visibility="invisible" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/luckyNumberSwipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/luckyNumberContent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="300dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/lucky_number_header"
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/luckyNumberText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="52sp"
+                tools:text="14" />
+
+        </LinearLayout>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <LinearLayout
+        android:id="@+id/luckyNumberEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="10dp"
+        android:visibility="gone">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="100dp"
+            android:minHeight="100dp"
+            app:srcCompat="@drawable/ic_more_lucky_number_24dp"
+            app:tint="?android:attr/textColorPrimary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/lucky_number_empty"
+            android:textSize="20sp" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 53920bb2..78edbb03 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -24,10 +24,22 @@
         android:layout_marginTop="48dp"
         android:visibility="invisible" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/openSendMessageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:tint="#FFFFFF"
+        app:srcCompat="@drawable/ic_send_message_24dp" />
+
     <ProgressBar
         android:id="@+id/messageProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:indeterminate="true" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index c0f96045..7150c03a 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -1,22 +1,22 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/messagePreviewContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
 
             <TextView
-                android:id="@+id/messageSubject"
+                android:id="@+id/messagePreviewSubject"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dp"
@@ -25,7 +25,7 @@
                 tools:text="@tools:sample/lorem" />
 
             <TextView
-                android:id="@+id/messageAuthor"
+                android:id="@+id/messagePreviewAuthor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
@@ -34,7 +34,7 @@
                 tools:text="@tools:sample/full_names" />
 
             <TextView
-                android:id="@+id/messageDate"
+                android:id="@+id/messagePreviewDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dp"
@@ -43,7 +43,7 @@
                 tools:text="@tools:sample/date/ddmmyy" />
 
             <TextView
-                android:id="@+id/messageContent"
+                android:id="@+id/messagePreviewContent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
@@ -51,11 +51,10 @@
                 android:textIsSelectable="true"
                 tools:text="@tools:sample/lorem" />
         </LinearLayout>
-
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
-        android:id="@+id/messageError"
+        android:id="@+id/messagePreviewError"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
@@ -82,7 +81,7 @@
     </LinearLayout>
 
     <ProgressBar
-        android:id="@+id/messageProgress"
+        android:id="@+id/messagePreviewProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
new file mode 100644
index 00000000..381ae36c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -0,0 +1,99 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.timetable.completed.CompletedLessonsFragment">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="50dp">
+
+        <ProgressBar
+            android:id="@+id/completedLessonsProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true" />
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/completedLessonsSwipe"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/completedLessonsRecycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+        <LinearLayout
+            android:id="@+id/completedLessonsEmpty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="10dp"
+            android:visibility="gone">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minWidth="100dp"
+                android:minHeight="100dp"
+                android:id="@+id/completedLessonsInfoImage"
+                app:srcCompat="@drawable/ic_menu_main_lessons_completed_24dp"
+                app:tint="?android:attr/textColorPrimary"
+                tools:ignore="contentDescription" />
+
+            <TextView
+                android:id="@+id/completedLessonsInfo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center"
+                android:text="@string/completed_lessons_no_items"
+                android:textSize="20sp" />
+        </LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_gravity="bottom"
+        android:background="?android:attr/windowBackground"
+        android:elevation="10dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/completedLessonsPreviousButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:drawablePadding="4dp"
+            android:gravity="start|center"
+            android:text="@string/all_prev"
+            android:textAlignment="gravity" />
+
+        <TextView
+            android:id="@+id/completedLessonsNavDate"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/app_name" />
+
+        <Button
+            android:id="@+id/completedLessonsNextButton"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_weight="1"
+            android:drawablePadding="4dp"
+            android:gravity="end|center"
+            android:text="@string/all_next"
+            android:textAlignment="gravity" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index 25faab32..e5b5af3d 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?colorControlHighlight"
@@ -8,7 +9,8 @@
     android:paddingLeft="20dp"
     android:paddingTop="10dp"
     android:paddingRight="20dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.exam.ExamHeader">
 
     <TextView
         android:id="@+id/examHeaderDay"
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index f92aec62..75e8388a 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -1,14 +1,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsHeader">
 
     <TextView
         android:id="@+id/gradeHeaderSubject"
@@ -55,5 +56,5 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_round_note_24dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/header_grade_summary.xml b/app/src/main/res/layout/header_homework.xml
similarity index 53%
rename from app/src/main/res/layout/header_grade_summary.xml
rename to app/src/main/res/layout/header_homework.xml
index 3dca71e7..526e8150 100644
--- a/app/src/main/res/layout/header_grade_summary.xml
+++ b/app/src/main/res/layout/header_homework.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?colorControlHighlight"
+    android:minHeight="40dp"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
-    android:paddingTop="7dp"
+    android:paddingTop="10dp"
     android:paddingRight="20dp"
-    android:paddingBottom="7dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.homework.HomeworkHeader">
 
     <TextView
-        android:id="@+id/gradeSummaryHeaderName"
+        android:id="@+id/homeworkHeaderDay"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
         android:layout_weight="1"
-        android:text="@string/app_name"
-        android:textSize="17sp" />
+        android:textSize="18sp"
+        tools:text="@tools:sample/date/day_of_week" />
 
     <TextView
-        android:id="@+id/gradeSummaryHeaderAverage"
+        android:id="@+id/homeworkHeaderDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
         android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="12sp" />
+        android:textSize="13sp"
+        tools:text="@tools:sample/date/ddmmyy" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index bd844b5f..844dd2c9 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?attr/selectableItemBackground"
@@ -8,7 +9,8 @@
     android:paddingStart="24dp"
     android:paddingLeft="24dp"
     android:paddingEnd="24dp"
-    android:paddingRight="24dp">
+    android:paddingRight="24dp"
+    tools:context=".ui.modules.account.AccountItem">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/accountItemImage"
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index 3195b21f..be54b91b 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -1,17 +1,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
-    android:paddingBottom="7dp">
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.attendance.AttendanceItem">
 
     <TextView
         android:id="@+id/attendanceItemNumber"
@@ -22,7 +22,7 @@
         android:maxLength="2"
         android:text="0"
         android:textSize="32sp"
-        tool:ignore="all" />
+        tools:ignore="all" />
 
     <TextView
         android:id="@+id/attendanceItemSubject"
@@ -39,7 +39,7 @@
         android:maxLines="1"
         android:text="@string/app_name"
         android:textSize="17sp"
-        tool:ignore="all" />
+        tools:ignore="all" />
 
     <TextView
         android:id="@+id/attendanceItemDescription"
@@ -61,6 +61,6 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_note_24dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index 9a254038..07392e56 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -21,16 +22,16 @@
             android:layout_marginEnd="40dp"
             android:layout_marginRight="40dp"
             android:layout_weight="1"
-            android:text="@string/app_name"
-            android:textSize="17sp" />
+            android:textSize="17sp"
+            tools:text="January" />
 
         <TextView
             android:id="@+id/attendanceSummaryPercentage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="75%" />
     </LinearLayout>
 
     <LinearLayout
@@ -60,8 +61,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="50" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -91,8 +92,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -122,8 +123,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="25" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -153,8 +154,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -184,8 +185,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="6" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -215,8 +216,8 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -246,7 +247,7 @@
             android:layout_marginEnd="25dp"
             android:layout_marginRight="25dp"
             android:gravity="end"
-            android:text="@string/app_name"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="0" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_attendance_summary_subject.xml b/app/src/main/res/layout/item_attendance_summary_subject.xml
index ce8e9b5e..6e19a081 100644
--- a/app/src/main/res/layout/item_attendance_summary_subject.xml
+++ b/app/src/main/res/layout/item_attendance_summary_subject.xml
@@ -10,5 +10,6 @@
     android:paddingRight="16dp"
     android:textAlignment="textStart"
     android:paddingBottom="12dp"
+    android:ellipsize="end"
     android:text="@string/app_name"
     android:textSize="16sp" />
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
new file mode 100644
index 00000000..a437bf8c
--- /dev/null
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -0,0 +1,72 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/completedLesson_subitem_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/ic_all_divider"
+    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:paddingStart="12dp"
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="12dp"
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.timetable.completed.CompletedLessonItem">
+
+    <TextView
+        android:id="@+id/completedLessonItemNumber"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_centerVertical="true"
+        android:gravity="center"
+        android:maxLength="2"
+        android:textSize="32sp"
+        tools:ignore="all"
+        tools:text="1" />
+
+    <TextView
+        android:id="@+id/completedLessonItemSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
+        android:layout_toEndOf="@+id/completedLessonItemNumber"
+        android:layout_toRightOf="@+id/completedLessonItemNumber"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="17sp"
+        tools:ignore="RelativeOverlap"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/completedLessonItemTopic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@id/completedLessonItemSubject"
+        android:layout_alignLeft="@id/completedLessonItemSubject"
+        android:layout_alignEnd="@+id/completedLessonItemAlert"
+        android:layout_alignRight="@+id/completedLessonItemAlert"
+        android:layout_alignBottom="@+id/completedLessonItemNumber"
+        android:layout_marginEnd="40dp"
+        android:layout_marginRight="40dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:attr/android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem" />
+
+    <ImageView
+        android:id="@+id/completedLessonItemAlert"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="10dp"
+        app:srcCompat="@drawable/ic_timetable_swap_30dp"
+        tools:ignore="contentDescription" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index cd44fb33..801e1dea 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -1,9 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/exams_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless">
+    android:background="?attr/selectableItemBackground"
+    tools:context=".ui.modules.exam.ExamItem">
 
     <TextView
         android:id="@+id/examItemSubject"
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index 79a5e11d..36632d04 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -1,42 +1,43 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:paddingBottom="7dp"
-    android:paddingEnd="12dp"
-    android:paddingLeft="12dp"
-    android:paddingRight="12dp"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="12dp"
-    android:paddingTop="7dp">
+    android:paddingLeft="12dp"
+    android:paddingTop="7dp"
+    android:paddingEnd="12dp"
+    android:paddingRight="12dp"
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.grade.details.GradeDetailsItem">
 
     <TextView
         android:id="@+id/gradeItemValue"
         android:layout_width="45dp"
         android:layout_height="40dp"
         android:layout_centerVertical="true"
-        android:background="@color/grade_default"
+        android:background="@color/grade_material_default"
         android:gravity="center"
         android:maxLength="5"
-        android:text="@string/app_name"
         android:textColor="@color/grade_text"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        tools:text="6" />
 
     <TextView
         android:id="@+id/gradeItemDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginEnd="20dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/gradeItemValue"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toRightOf="@+id/gradeItemValue"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
         android:layout_toStartOf="@id/gradeItemNote"
+        android:layout_toLeftOf="@id/gradeItemNote"
+        android:layout_toEndOf="@+id/gradeItemValue"
+        android:layout_toRightOf="@+id/gradeItemValue"
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/all_description"
@@ -46,9 +47,9 @@
         android:id="@+id/gradeItemDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/gradeItemValue"
-        android:layout_alignLeft="@+id/gradeItemDescription"
         android:layout_alignStart="@+id/gradeItemDescription"
+        android:layout_alignLeft="@+id/gradeItemDescription"
+        android:layout_alignBottom="@+id/gradeItemValue"
         android:text="@string/all_date"
         android:textSize="12sp" />
 
@@ -57,14 +58,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/gradeItemValue"
-        android:layout_marginEnd="20dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/gradeItemDate"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toRightOf="@+id/gradeItemDate"
+        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
         android:layout_toStartOf="@id/gradeItemNote"
+        android:layout_toLeftOf="@id/gradeItemNote"
+        android:layout_toEndOf="@+id/gradeItemDate"
+        android:layout_toRightOf="@+id/gradeItemDate"
         android:text="@string/grade_weight"
         android:textSize="12sp" />
 
@@ -76,5 +77,5 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_round_note_24dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index 81d7693e..a650e9dc 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -1,31 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:minHeight="35dp"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/gradeSummaryItemTitle"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_weight="1"
-        android:text="@string/grade_summary_predicted_grade"
-        android:textSize="14sp" />
+        android:background="?colorControlHighlight"
+        android:orientation="horizontal"
+        android:paddingLeft="20dp"
+        android:paddingTop="7dp"
+        android:paddingRight="20dp"
+        android:paddingBottom="7dp">
 
-    <TextView
-        android:id="@+id/gradeSummaryItemGrade"
-        android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/gradeSummaryItemTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_weight="1"
+            android:textSize="17sp"
+            tools:text="@tools:sample/lorem" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemAverage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="@string/aboutlibrary_lib_version" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginRight="25dp"
-        android:gravity="end"
-        android:text="@string/app_name"
-        android:textSize="12sp" />
+        android:background="@drawable/ic_all_divider"
+        android:minHeight="35dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:layout_weight="1"
+            android:text="@string/grade_summary_predicted_grade"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemPredicted"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="@string/aboutlibrary_lib_version" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/ic_all_divider"
+        android:minHeight="35dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:layout_weight="1"
+            android:text="@string/grade_summary_final_average"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/gradeSummaryItemFinal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginRight="25dp"
+            android:gravity="end"
+            android:textSize="12sp"
+            tools:text="@string/aboutlibrary_lib_version" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 5aac8150..4e90a582 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -1,9 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/homework_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless">
+    android:background="?attr/selectableItemBackground"
+    tools:context=".ui.modules.homework.HomeworkItem">
 
     <TextView
         android:id="@+id/homeworkItemSubject"
diff --git a/app/src/main/res/layout/item_login_options.xml b/app/src/main/res/layout/item_login_student_select.xml
similarity index 82%
rename from app/src/main/res/layout/item_login_options.xml
rename to app/src/main/res/layout/item_login_student_select.xml
index c19d5a66..f13eb601 100644
--- a/app/src/main/res/layout/item_login_options.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
+    android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:context=".ui.modules.login.studentselect.LoginStudentSelectItem">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/loginItemImage"
@@ -14,8 +16,8 @@
         android:layout_height="40dp"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
-        android:tint="@android:color/black"
-        app:srcCompat="@drawable/ic_all_account_24dp" />
+        app:srcCompat="@drawable/ic_all_account_24dp"
+        app:tint="?android:textColorPrimary" />
 
     <TextView
         android:id="@+id/loginItemName"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index cfa03786..e7322afa 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,13 +1,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingLeft="16dp"
     android:paddingTop="10dp"
     android:paddingRight="16dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    tools:context=".ui.modules.message.MessageItem">
 
     <TextView
         android:id="@+id/messageItemAuthor"
@@ -19,7 +19,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="15sp"
-        tool:text="@tools:sample/full_names" />
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/messageItemDate"
@@ -33,7 +33,7 @@
         android:layout_toRightOf="@id/messageItemAuthor"
         android:gravity="end"
         android:textSize="13sp"
-        tool:text="@tools:sample/date/mmddyy" />
+        tools:text="@tools:sample/date/mmddyy" />
 
     <TextView
         android:id="@+id/messageItemSubject"
@@ -47,6 +47,6 @@
         android:maxLines="1"
         android:textColor="?android:attr/android:textColorSecondary"
         android:textSize="12sp"
-        tool:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index 0324c1f0..07eb3344 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="56dp"
     android:background="?attr/selectableItemBackground"
@@ -8,7 +9,8 @@
     android:paddingLeft="16dp"
     android:paddingTop="8dp"
     android:paddingRight="16dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:context=".ui.modules.more.MoreItem">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/moreItemImage"
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 86e8bc76..76fb6a8c 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -1,9 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/note_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless">
+    android:background="?attr/selectableItemBackground"
+    tools:context=".ui.modules.note.NoteItem">
 
     <TextView
         android:id="@+id/noteItemDate"
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index aee4707b..6afc4153 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,17 +1,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tool="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timetable_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?attr/selectableItemBackgroundBorderless"
+    android:background="?attr/selectableItemBackground"
     android:paddingStart="12dp"
     android:paddingLeft="12dp"
     android:paddingTop="7dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
-    android:paddingBottom="7dp">
+    android:paddingBottom="7dp"
+    tools:context=".ui.modules.timetable.TimetableItem">
 
     <TextView
         android:id="@+id/timetableItemNumber"
@@ -22,7 +22,7 @@
         android:maxLength="2"
         android:text="0"
         android:textSize="32sp"
-        tool:ignore="all" />
+        tools:ignore="all" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
@@ -39,7 +39,7 @@
         android:maxLines="1"
         android:text="@string/app_name"
         android:textSize="17sp"
-        tool:ignore="RelativeOverlap" />
+        tools:ignore="RelativeOverlap" />
 
     <TextView
         android:id="@+id/timetableItemTime"
@@ -68,7 +68,7 @@
         android:text="@string/app_name"
         android:textColor="?android:attr/android:textColorSecondary"
         android:textSize="12sp"
-        tool:ignore="RelativeOverlap" />
+        tools:ignore="RelativeOverlap" />
 
     <ImageView
         android:id="@+id/timetableItemAlert"
@@ -78,6 +78,6 @@
         android:layout_alignParentRight="true"
         android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_timetable_swap_30dp"
-        tool:ignore="contentDescription" />
+        tools:ignore="contentDescription" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 2007b323..af055280 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="@drawable/ic_all_divider"
     android:minHeight="45dp"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:context=".ui.widgets.timetable.TimetableWidgetFactory">
 
     <TextView
         android:id="@+id/timetableWidgetItemNumber"
@@ -19,7 +20,7 @@
         android:maxLines="1"
         android:textColor="@android:color/black"
         android:textSize="25sp"
-        tools:text="0" />
+        tools:text="1" />
 
     <TextView
         android:id="@+id/timetableWidgetItemTime"
@@ -31,9 +32,9 @@
         android:layout_marginTop="10dp"
         android:layout_toEndOf="@id/timetableWidgetItemNumber"
         android:layout_toRightOf="@id/timetableWidgetItemNumber"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text"
-        android:textSize="13sp" />
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="13sp"
+        tools:text="08:00 - 08:45" />
 
     <TextView
         android:id="@+id/timetableWidgetItemSubject"
@@ -46,9 +47,9 @@
         android:layout_marginRight="25dp"
         android:layout_toEndOf="@id/timetableWidgetItemTime"
         android:layout_toRightOf="@id/timetableWidgetItemTime"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text"
-        android:textSize="13sp" />
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="13sp"
+        tools:text="Język polski" />
 
     <TextView
         android:id="@+id/timetableWidgetItemDescription"
@@ -63,9 +64,9 @@
         android:layout_marginBottom="5dp"
         android:layout_toEndOf="@id/timetableWidgetItemTime"
         android:layout_toRightOf="@id/timetableWidgetItemTime"
-        android:text="@string/app_name"
         android:textColor="@color/colorPrimaryDark"
-        android:textSize="12sp" />
+        android:textSize="12sp"
+        tools:text="Lekcja odwołana: uczniowie zwolnieni do domu" />
 
     <TextView
         android:id="@+id/timetableWidgetItemRoom"
@@ -78,7 +79,7 @@
         android:layout_marginBottom="5dp"
         android:layout_toEndOf="@id/timetableWidgetItemNumber"
         android:layout_toRightOf="@id/timetableWidgetItemNumber"
-        android:text="@string/app_name"
-        android:textColor="@color/second_text"
-        android:textSize="12sp" />
+        android:textColor="@android:color/secondary_text_light"
+        android:textSize="12sp"
+        tools:text="Sala 25" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 8d415f66..3edcc276 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="@android:color/white"
+    tools:context=".ui.widgets.timetable.TimetableWidgetProvider">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -18,7 +20,8 @@
             android:layout_marginLeft="5dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
-            android:src="@drawable/ic_widget_chevron_24dp" />
+            android:src="@drawable/ic_widget_chevron_24dp"
+            tools:targetApi="lollipop" />
 
         <TextView
             android:id="@+id/timetableWidgetDay"
@@ -32,9 +35,9 @@
             android:layout_toRightOf="@id/timetableWidgetPrev"
             android:gravity="center_horizontal"
             android:maxLines="1"
-            android:text="@string/app_name"
             android:textColor="@android:color/white"
-            android:textSize="15sp" />
+            android:textSize="15sp"
+            tools:text="Poniedziałek" />
 
         <TextView
             android:id="@+id/timetableWidgetDate"
@@ -49,9 +52,9 @@
             android:layout_toRightOf="@id/timetableWidgetPrev"
             android:gravity="center_horizontal"
             android:maxLines="1"
-            android:text="@string/app_name"
             android:textColor="@android:color/white"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            tools:text="12.03.2019" />
 
         <ImageButton
             android:id="@+id/timetableWidgetNext"
@@ -65,7 +68,8 @@
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
-            android:src="@drawable/ic_widget_chevron_24dp" />
+            android:src="@drawable/ic_widget_chevron_24dp"
+            tools:targetApi="lollipop" />
 
     </RelativeLayout>
 
@@ -73,7 +77,8 @@
         android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/timetable_widget_bar_height" />
+        android:layout_marginTop="@dimen/timetable_widget_bar_height"
+        tools:listitem="@layout/item_widget_timetable" />
 
     <TextView
         android:id="@+id/timetableWidgetEmpty"
@@ -82,5 +87,6 @@
         android:layout_gravity="center"
         android:text="@string/widget_timetable_no_items"
         android:textColor="@android:color/black"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+        tools:visibility="invisible" />
 </FrameLayout>
diff --git a/app/src/main/res/menu/action_menu_attendance.xml b/app/src/main/res/menu/action_menu_attendance.xml
index efafe135..94baf338 100644
--- a/app/src/main/res/menu/action_menu_attendance.xml
+++ b/app/src/main/res/menu/action_menu_attendance.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/attendanceMenuSummary"
-        android:icon="@drawable/ic_all_about_24dp"
+        android:icon="@drawable/ic_menu_main_attendance_summary_24dp"
         android:orderInCategory="1"
-        android:title="@string/grade_switch_semester"
+        android:title="@string/attendance_summary_button"
         app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
new file mode 100644
index 00000000..4c2f5920
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/messagePreviewMenuReply"
+        android:icon="@drawable/ic_message_reply_24dp"
+        android:orderInCategory="1"
+        android:title="@string/message_reply"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/action_menu_send_message.xml b/app/src/main/res/menu/action_menu_send_message.xml
new file mode 100644
index 00000000..d512fc76
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_send_message.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/sendMessageMenuSend"
+        android:icon="@drawable/ic_menu_send_message_24dp"
+        android:orderInCategory="1"
+        android:title="@string/send_message_title"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/action_menu_timetable.xml b/app/src/main/res/menu/action_menu_timetable.xml
new file mode 100644
index 00000000..0a13494a
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_timetable.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/timetableMenuCompletedLessons"
+        android:icon="@drawable/ic_menu_main_lessons_completed_24dp"
+        android:orderInCategory="1"
+        android:title="@string/completed_lessons_button"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 0e082ecb..7eaf4e5e 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -7,6 +7,12 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="bottomNavBackground">@color/bottom_nav_background</item>
         <item name="android:navigationBarColor" tools:targetApi="21">@color/bottom_nav_background</item>
+        <item name="dividerColor">@color/divider_inverse</item>
+        <item name="chip_backgroundColor">@color/chip_backgroundColor_inverse</item>
+        <item name="chip_labelColor">@color/chip_labelColor_inverse</item>
+        <item name="chip_detailed_backgroundColor">@color/chip_backgroundColor_inverse</item>
+        <item name="filterable_list_backgroundColor">@color/filterable_list_backgroundColor_inverse</item>
+        <item name="filterable_list_textColor">@color/filterable_list_textColor_inverse</item>
 
         <!--AboutLibraries specific values-->
         <item name="about_libraries_window_background">@color/about_libraries_window_background_dark</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0e6d7e38..dcc73526 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Wulkanowy</string>
 
+
     <!--Activity/Fragment title-->
     <string name="login_title">Wybierz ucznia</string>
     <string name="main_title">Wulkanowy</string>
@@ -12,6 +13,7 @@
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</string>
     <string name="message_title">Wiadomości</string>
+    <string name="send_message_title">Nowa wiadomość</string>
     <string name="note_title">Uwagi i osiągnięcia</string>
     <string name="homework_title">Zadania domowe</string>
     <string name="account_title">Wybierz konto</string>
@@ -25,13 +27,12 @@
     <string name="login_host_hint">Dziennik</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Zaloguj</string>
-    <string name="login_progress">Logowanie&#8230;</string>
-    <string name="login_sync">Synchronizacja</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
-    <string name="login_incorrect_password">To hasło jest niepoprawne</string>
-    <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprwadź symbol</string>
+    <string name="login_incorrect_password">Dane logowania są niepoprawne</string>
+    <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
     <string name="login_duplicate_student">Ten student jest już zalogowany</string>
+    <string name="login_symbol_helper">Symbol znajduje się na stronie dziennika w zakładce Dostęp Mobilny</string>
 
 
     <!--Main-->
@@ -59,24 +60,22 @@
     <string name="grade_summary_calculated_average">Obliczona średnia</string>
     <string name="grade_summary_final_average">Końcowa średnia</string>
     <string name="grade_menu_summary">Podsumowanie</string>
+    <string name="grade_menu_statistics">Klasa</string>
     <string name="grade_menu_read">Oznacz jako przeczytane</string>
+    <string name="grade_statistics_partial">Oceny cząstkowe</string>
+    <string name="grade_statistics_semester">Oceny semestralne</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d ocena</item>
         <item quantity="few">%d oceny</item>
         <item quantity="many">%d ocen</item>
         <item quantity="other">%d ocen</item>
     </plurals>
-
     <plurals name="grade_new_items">
         <item quantity="one">Nowa ocena</item>
         <item quantity="few">Nowe oceny</item>
         <item quantity="many">Nowe oceny</item>
     </plurals>
-
-
-    <!--Grade notify-->
-    <string name="notify_grade_channel">Nowe oceny</string>
-    <plurals name="notify_grade_new_items">
+    <plurals name="grade_notify_new_items">
         <item quantity="one">Dostałeś %1$d ocenę</item>
         <item quantity="few">"Dostałeś %1$d oceny</item>
         <item quantity="many">Dostałeś %1$d ocen</item>
@@ -84,16 +83,6 @@
     </plurals>
 
 
-    <!--Note notify-->
-    <string name="notify_note_channel">Nowe uwagi</string>
-    <plurals name="notify_note_new_items">
-        <item quantity="one">Dostałeś %1$d uwagę</item>
-        <item quantity="few">"Dostałeś %1$d uwagi</item>
-        <item quantity="many">Dostałeś %1$d uwag</item>
-        <item quantity="other">Dostałeś %1$d uwag</item>
-    </plurals>
-
-
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -103,7 +92,17 @@
     <string name="timetable_no_items">Brak lekcji w tym dniu</string>
 
 
+    <!--CompletedLesson-->
+    <string name="completed_lessons_title">Lekcje zrealizowane</string>
+    <string name="completed_lessons_button">Zobacz lekcje zrealizowane</string>
+    <string name="completed_lessons_no_items">Brak informacji o lekcjach zrealizowanych</string>
+    <string name="completed_lessons_topic">Temat</string>
+    <string name="completed_lessons_absence">Nieobecność</string>
+    <string name="completed_lessons_resources">Zasoby</string>
+
+
     <!--Attendance-->
+    <string name="attendance_summary_button">Podsumowanie frekwencji</string>
     <string name="attendance_absence_school">Nieobecny z przyczyn szkolnych</string>
     <string name="attendance_absence_excused">Nieobecność usprawiedliwiona</string>
     <string name="attendance_absence_unexcused">Nieobecność nieusprawiedliwiona</string>
@@ -119,9 +118,11 @@
         <item quantity="many">%1$d nieobecności</item>
     </plurals>
 
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Frekwencja</string>
 
+
     <!--Exam-->
     <string name="exam_no_items">Brak sprawdzianów w tym tygodniu</string>
     <string name="exam_type">Typ</string>
@@ -135,33 +136,31 @@
     <string name="message_no_subject">(brak tematu)</string>
     <string name="message_no_items">Brak wiadomości</string>
     <string name="message_preview_error">Wystąpił błąd podczas pobierania treści wiadomości</string>
-    <string name="message_from">Od: %s</string>
-    <string name="message_to">Do: %s</string>
+    <string name="message_from">Od:</string>
+    <string name="message_to">Do:</string>
     <string name="message_date">Data: %s</string>
+    <string name="message_reply">Odpowiedz</string>
+    <string name="message_subject">Temat</string>
+    <string name="message_content">Treść</string>
+    <string name="message_send_successful">Wiadomość wysłana pomyślnie</string>
+    <string name="message_required_recipients">Musisz wybrać co najmniej 1 adresata</string>
+    <string name="message_content_min_length">Treść wiadomości musi zawierać co najmniej 3 znaki</string>
     <plurals name="message_number_item">
         <item quantity="one">%d wiadomość</item>
         <item quantity="few">%d wiadomości</item>
         <item quantity="many">%d wiadomości</item>
     </plurals>
-
     <plurals name="message_new_items">
         <item quantity="one">Nowa wiadomość</item>
         <item quantity="few">Nowe wiadomości</item>
         <item quantity="many">Nowe wiadomości</item>
     </plurals>
-
-
-    <!--Message notify-->
-    <string name="notify_message_channel">Nowe wiadomości</string>
-    <plurals name="notify_message_new_items">
+    <plurals name="message_notify_new_items">
         <item quantity="one">Dostałeś %1$d wiadomość</item>
         <item quantity="few">"Dostałeś %1$d wiadomości</item>
         <item quantity="many">Dostałeś %1$d wiadomości</item>
     </plurals>
 
-    <!--About-->
-    <string name="about_source_code">Kod źródłowy</string>
-    <string name="about_feedback">Zgłoś błąd</string>
 
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
@@ -171,19 +170,32 @@
         <item quantity="many">%d uwag</item>
         <item quantity="other">%d uwag</item>
     </plurals>
-
     <plurals name="note_new_items">
         <item quantity="one">Nowa uwaga</item>
         <item quantity="few">Nowe uwagi</item>
         <item quantity="many">Nowych uwag</item>
         <item quantity="other">Nowych uwag</item>
     </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">Dostałeś %1$d uwagę</item>
+        <item quantity="few">"Dostałeś %1$d uwagi</item>
+        <item quantity="many">Dostałeś %1$d uwag</item>
+        <item quantity="other">Dostałeś %1$d uwag</item>
+    </plurals>
 
 
     <!--Homework-->
     <string name="homework_no_items">Brak zadań domowych</string>
 
 
+    <!--Lucky number-->
+    <string name="lucky_number_title">Szczęśliwy numerek</string>
+    <string name="lucky_number_header">Dzisiejszym szczęśliwym numerkiem jest</string>
+    <string name="lucky_number_empty">Brak informacji o szczęśliwym numerku</string>
+    <string name="lucky_number_notify_new_item_title">Szczęśliwy numerek na dzisiaj</string>
+    <string name="lucky_number_notify_new_item">Dziś szczęśliwym numerkiem jest: %d</string>
+
+
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
@@ -191,6 +203,12 @@
     <string name="account_logout_student">Wylogowanie ucznia</string>
 
 
+    <!--About-->
+    <string name="about_discord_invite">Discord</string>
+    <string name="about_feedback">Zgłoś błąd</string>
+    <string name="about_homepage">Strona domowa</string>
+
+
     <!--Generic-->
     <string name="all_content">Treść</string>
     <string name="all_description">Opis</string>
@@ -215,17 +233,17 @@
 
 
     <!--Preferences-->
-    <string name="pref_view_header">Widok</string>
+    <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
     <string name="pref_view_summary">Pokazuj podsumowanie w ocenach</string>
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
     <string name="pref_view_theme_dark">Ciemny motyw (Beta)</string>
-    <string name="pref_view_grade_modifier_plus">Wartość plusa</string>
-    <string name="pref_view_grade_modifier_minus">Wartość minusa</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
+    <string name="pref_grade_color_scheme">Schemat kolorów ocen</string>
 
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
+    <string name="pref_notify_debug_switch">Pokazuj powiadomienia debugowania</string>
 
     <string name="pref_services_header">Synchronizacja</string>
     <string name="pref_services_switch">Automatyczna aktualizacja</string>
@@ -233,6 +251,16 @@
     <string name="pref_services_interval">Interwał aktualizacji</string>
     <string name="pref_services_wifi">Tylko WiFi</string>
 
+    <string name="pref_other_header">Inne</string>
+    <string name="pref_other_grade_modifier_plus">Wartość plusa</string>
+    <string name="pref_other_grade_modifier_minus">Wartość minusa</string>
+    <string name="pref_other_fill_message_content">Odpowiadaj z historią wiadomości</string>
+
+
+    <!--Notification Channels-->
+    <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
+    <string name="channel_debug">Debugowanie</string>
+
 
     <!--Colors-->
     <string name="all_black">Czarny</string>
@@ -246,10 +274,12 @@
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
 
+
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_timeout">Zbyt długie oczekiwanie na połączenie</string>
     <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
     <string name="error_service_unavailable">Dziennik jest niedostępny. Spróbuj ponownie później</string>
     <string name="error_unknown">Wystąpił nieoczekiwany błąd</string>
+    <string name="error_feature_disabled">Funkcja wyłączona przez szkołę</string>
 </resources>
diff --git a/app/src/main/res/values-pl/value_prefernces.xml b/app/src/main/res/values-pl/value_prefernces.xml
index c15fa89e..05f2ed50 100644
--- a/app/src/main/res/values-pl/value_prefernces.xml
+++ b/app/src/main/res/values-pl/value_prefernces.xml
@@ -9,16 +9,24 @@
         <item>12 godzin</item>
         <item>24 godzin</item>
     </string-array>
+
     <string-array name="theme_entries">
         <item>Wyłączony</item>
         <item>Włączony</item>
         <item>Automatyczny</item>
         <item>Używaj ustawień systemowych</item>
     </string-array>
+
     <string-array name="grade_modifier_entries">
         <item>Domyślna</item>
         <item>0,25</item>
         <item>0,33</item>
         <item>0,5</item>
     </string-array>
+
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Kolory ocen w dzienniku</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/api_endpoints.xml b/app/src/main/res/values/api_endpoints.xml
index b6fd6a3b..ff8cd23c 100644
--- a/app/src/main/res/values/api_endpoints.xml
+++ b/app/src/main/res/values/api_endpoints.xml
@@ -7,7 +7,6 @@
         <item>EduNet Miasta Tarnowa</item>
         <item>ResMan Rzeszów</item>
         <item>Fakelog</item>
-        <item>Fakelog lokalnie</item>
     </string-array>
     <string-array name="endpoints_values">
         <item>https://vulcan.net.pl</item>
@@ -16,6 +15,5 @@
         <item>https://umt.tarnow.pl</item>
         <item>https://resman.pl</item>
         <item>https://fakelog.cf</item>
-        <item>http://fakelog.localhost:3000</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3593e29e..eef7eab4 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="bottomNavBackground" format="reference" />
+    <attr name="dividerColor" format="reference" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index db513976..49854955 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,16 +6,38 @@
     <color name="colorBackgroundBottomNav">#f0f0f0</color>
 
     <color name="grade_text">#ffffff</color>
-    <color name="grade_six">#91b43c</color>
-    <color name="grade_five">#2cbd92</color>
-    <color name="grade_four">#50b6d6</color>
-    <color name="grade_three">#d2ab24</color>
-    <color name="grade_two">#9071b3</color>
-    <color name="grade_one">#d65757</color>
-    <color name="grade_default">#3d5f9c</color>
 
-    <color name="second_text">#474747</color>
+    <color name="grade_black">#424242</color>
+    <color name="grade_red">#F44336</color>
+    <color name="grade_blue">#2196F3</color>
+    <color name="grade_green">#8BC34A</color>
+    <color name="grade_purple">#7E57C2</color>
+
+    <color name="grade_material_six">#03a9f4</color>
+    <color name="grade_material_five">#4caf50</color>
+    <color name="grade_material_four">#92c400</color>
+    <color name="grade_material_three">#ffa000</color>
+    <color name="grade_material_two">#ff5722</color>
+    <color name="grade_material_one">#d32f2f</color>
+    <color name="grade_material_default">#607d8b</color>
+
+    <color name="grade_vulcan_six">#91b43c</color>
+    <color name="grade_vulcan_five">#2cbd92</color>
+    <color name="grade_vulcan_four">#50b6d6</color>
+    <color name="grade_vulcan_three">#d2ab24</color>
+    <color name="grade_vulcan_two">#9071b3</color>
+    <color name="grade_vulcan_one">#d65757</color>
+    <color name="grade_vulcan_default">#3d5f9c</color>
 
     <color name="bottom_nav_background">#303030</color>
     <color name="bottom_nav_background_inverse">#ffffff</color>
+
+    <color name="chip_backgroundColor_inverse">#595959</color>
+    <color name="chip_labelColor_inverse">#fefefe</color>
+    <color name="chip_detailed_backgroundColor">#fefefe</color>
+    <color name="filterable_list_backgroundColor_inverse">#393939</color>
+    <color name="filterable_list_textColor_inverse">#fefefe</color>
+
+    <color name="divider">#cccccc</color>
+    <color name="divider_inverse">#777777</color>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index ea2585e7..427cca56 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -3,11 +3,14 @@
     <string name="pref_key_start_menu">start_menu</string>
     <string name="pref_key_attendance_present">attendance_present</string>
     <string name="pref_key_theme">theme</string>
-    <string name="pref_key_grade_modifier_plus">grade_modifier_plus</string>
-    <string name="pref_key_grade_modifier_minus">grade_modifier_minus</string>
+    <string name="pref_key_grade_color_scheme">grade_color_scheme</string>
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_services_enable">services_enable</string>
     <string name="pref_key_services_interval">services_interval</string>
     <string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
     <string name="pref_key_notifications_enable">notifications_enable</string>
+    <string name="pref_key_notification_debug">notification_debug</string>
+    <string name="pref_key_grade_modifier_plus">grade_modifier_plus</string>
+    <string name="pref_key_grade_modifier_minus">grade_modifier_minus</string>
+    <string name="pref_key_fill_message_content">fill_message_content</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7cde31c..1debed7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Wulkanowy</string>
 
+
     <!--Activity/Fragment title-->
     <string name="login_title">Select student</string>
     <string name="main_title">Wulkanowy</string>
@@ -12,6 +13,7 @@
     <string name="more_title">More</string>
     <string name="about_title">About</string>
     <string name="message_title">Messages</string>
+    <string name="send_message_title">New message</string>
     <string name="note_title">Notes and achievements</string>
     <string name="homework_title">Homework</string>
     <string name="account_title">Choose account</string>
@@ -22,16 +24,15 @@
     <string name="login_header_symbol">Enter the VULCAN diary symbol</string>
     <string name="login_nickname_hint">Email or nick</string>
     <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">Log</string>
+    <string name="login_host_hint">Register</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Sign in</string>
-    <string name="login_progress">Logging in&#8230;</string>
-    <string name="login_sync">Synchronization&#8230;</string>
     <string name="login_invalid_password">This password is too short</string>
-    <string name="login_incorrect_password">This password is incorrect</string>
+    <string name="login_incorrect_password">Login details are incorrect</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
     <string name="login_duplicate_student">This student has already been logged in</string>
+    <string name="login_symbol_helper">The symbol is located on the register page in the Mobile Access tab</string>
 
 
     <!--Main-->
@@ -59,31 +60,23 @@
     <string name="grade_summary_calculated_average">Calculated average</string>
     <string name="grade_summary_final_average">Final average</string>
     <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
     <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial grades</string>
+    <string name="grade_statistics_semester">Semester grades</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d grade</item>
         <item quantity="other">%d grades</item>
     </plurals>
-
     <plurals name="grade_new_items">
         <item quantity="one">New grade</item>
         <item quantity="other">New grades</item>
     </plurals>
-
-    <!--Grade notify-->
-    <string name="notify_grade_channel">New grades</string>
-    <plurals name="notify_grade_new_items">
+    <plurals name="grade_notify_new_items">
         <item quantity="one">You received %1$d grade</item>
         <item quantity="other">You received %1$d grades</item>
     </plurals>
 
-    <!--Note notify-->
-    <string name="notify_note_channel">New notes</string>
-    <plurals name="notify_note_new_items">
-        <item quantity="one">You received %1$d note</item>
-        <item quantity="other">You received %1$d notes</item>
-    </plurals>
-
 
     <!--Timetable-->
     <string name="timetable_lesson">Lesson</string>
@@ -91,10 +84,20 @@
     <string name="timetable_group">Group</string>
     <string name="timetable_time">Hours</string>
     <string name="timetable_changes">Changes</string>
-    <string name="timetable_no_items">No lesson in this day</string>
+    <string name="timetable_no_items">No lessons this day</string>
+
+
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
 
 
     <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
     <string name="attendance_absence_school">Absent for school reasons</string>
     <string name="attendance_absence_excused">Excused absence</string>
     <string name="attendance_absence_unexcused">Unexcused absence</string>
@@ -109,12 +112,13 @@
         <item quantity="other">%1$d absences</item>
     </plurals>
 
+
     <!--Attendance summary-->
     <string name="attendance_summary_final">Attendance</string>
 
 
     <!--Exam-->
-    <string name="exam_no_items">No exams in this week</string>
+    <string name="exam_no_items">No exams this week</string>
     <string name="exam_type">Type</string>
     <string name="exam_entry_date">Entry date</string>
 
@@ -126,29 +130,28 @@
     <string name="message_no_subject">(no subject)</string>
     <string name="message_no_items">No messages</string>
     <string name="message_preview_error">An error occurred while downloading message content</string>
-    <string name="message_from">From: %s</string>
-    <string name="message_to">To: %s</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
     <string name="message_date">Date: %s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
     <plurals name="message_number_item">
         <item quantity="one">%d message</item>
         <item quantity="other">%d messages</item>
     </plurals>
-
     <plurals name="message_new_items">
         <item quantity="one">New message</item>
         <item quantity="other">New messages</item>
     </plurals>
-
-    <!--Message notify-->
-    <string name="notify_message_channel">New messages</string>
-    <plurals name="notify_message_new_items">
+    <plurals name="message_notify_new_items">
         <item quantity="one">You received %1$d message</item>
         <item quantity="other">You received %1$d messages</item>
     </plurals>
 
-    <!--About-->
-    <string name="about_source_code">Source code</string>
-    <string name="about_feedback">Report a bug</string>
 
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
@@ -156,17 +159,28 @@
         <item quantity="one">%d note</item>
         <item quantity="other">%d notes</item>
     </plurals>
-
     <plurals name="note_new_items">
         <item quantity="one">New note</item>
         <item quantity="other">New notes</item>
     </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
 
 
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
 
 
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %d</string>
+
+
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
@@ -174,6 +188,12 @@
     <string name="account_logout_student">Student logout</string>
 
 
+    <!--About-->
+    <string name="about_discord_invite">Discord</string>
+    <string name="about_feedback">Report a bug</string>
+    <string name="about_homepage">Homepage</string>
+
+
     <!--Generic-->
     <string name="all_content">Content</string>
     <string name="all_description">Description</string>
@@ -192,29 +212,39 @@
 
 
     <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">No lesson</string>
+    <string name="widget_timetable_no_items">No lessons</string>
     <string name="widget_timetable_today">Today</string>
     <string name="widget_timetable_tomorrow">Tomorrow</string>
 
 
     <!--Preferences-->
-    <string name="pref_view_header">View</string>
+    <string name="pref_view_header">Appearance</string>
     <string name="pref_view_list">Default view</string>
     <string name="pref_view_summary">Show the summary in the grades</string>
     <string name="pref_view_present">Show presence in attendance</string>
     <string name="pref_view_theme_dark">Dark theme (Beta)</string>
-    <string name="pref_view_grade_modifier_plus">Value of the plus</string>
-    <string name="pref_view_grade_modifier_minus">Value of the minus</string>
     <string name="pref_view_expand_grade">Expand grades</string>
+    <string name="pref_grade_color_scheme">Grades color scheme</string>
 
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_switch">Show notifications</string>
+    <string name="pref_notify_debug_switch">Show debug notifications</string>
 
     <string name="pref_services_header">Synchronization</string>
     <string name="pref_services_switch">Automatic update</string>
     <string name="pref_services_suspended">Suspended on holiday</string>
     <string name="pref_services_interval">Updates interval</string>
-    <string name="pref_services_wifi">Only WiFi</string>
+    <string name="pref_services_wifi">Wi-Fi only</string>
+
+    <string name="pref_other_header">Other</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+
+
+    <!--Notification Channels-->
+    <string name="channel_new_entries">New entries in register</string>
+    <string name="channel_debug">Debug</string>
 
 
     <!--Colors-->
@@ -229,10 +259,12 @@
     <!--Others-->
     <string name="all_copied">Copied</string>
 
+
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_timeout">Too long wait for connection</string>
     <string name="error_login_failed">Login is failed. Try again or restart the app</string>
     <string name="error_service_unavailable">The log is not available. Try again later</string>
     <string name="error_unknown">An unexpected error occurred</string>
+    <string name="error_feature_disabled">Feature disabled by your school</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b79ef7b7..4bbe3bc1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,8 @@
         <item name="subtitleTextColor">@android:color/primary_text_dark</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="bottomNavBackground">@color/bottom_nav_background_inverse</item>
+        <item name="dividerColor">@color/divider</item>
+        <item name="chip_detailed_backgroundColor">@color/chip_detailed_backgroundColor</item>
 
         <!-- AboutLibraries specific values -->
         <item name="about_libraries_window_background">@color/about_libraries_window_background</item>
diff --git a/app/src/main/res/values/value_prefernces.xml b/app/src/main/res/values/value_prefernces.xml
index 56c5de0e..1a1dceca 100644
--- a/app/src/main/res/values/value_prefernces.xml
+++ b/app/src/main/res/values/value_prefernces.xml
@@ -57,4 +57,15 @@
         <item>0.33</item>
         <item>0.5</item>
     </string-array>
+
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Grade colors in register</item>
+    </string-array>
+    <string-array name="grade_color_scheme_values" translatable="false">
+        <item>vulcan</item>
+        <item>material</item>
+        <item>grade_color</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/xml/provider_widget_timetable.xml b/app/src/main/res/xml/provider_widget_timetable.xml
index 184b3f39..48c6ba39 100644
--- a/app/src/main/res/xml/provider_widget_timetable.xml
+++ b/app/src/main/res/xml/provider_widget_timetable.xml
@@ -5,5 +5,5 @@
     android:minHeight="100dp"
     android:previewImage="@drawable/img_timetable_widget_preview"
     android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="7200000"
+    android:updatePeriodMillis="3600000"
     android:widgetCategory="home_screen" />
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 1ba8885a..08c24124 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -31,20 +31,12 @@
             android:title="@string/pref_view_expand_grade"
             app:iconSpaceReserved="false" />
         <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_plus"
+            android:defaultValue="vulcan"
+            android:entries="@array/grade_color_scheme_entries"
+            android:entryValues="@array/grade_color_scheme_values"
+            android:key="@string/pref_key_grade_color_scheme"
             android:summary="%s"
-            android:title="@string/pref_view_grade_modifier_plus"
-            app:iconSpaceReserved="false" />
-        <ListPreference
-            android:defaultValue="0.0"
-            android:entries="@array/grade_modifier_entries"
-            android:entryValues="@array/grade_modifier_value"
-            android:key="@string/pref_key_grade_modifier_minus"
-            android:summary="%s"
-            android:title="@string/pref_view_grade_modifier_minus"
+            android:title="@string/pref_grade_color_scheme"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
     <PreferenceCategory
@@ -80,5 +72,35 @@
             android:key="@string/pref_key_notifications_enable"
             android:title="@string/pref_notify_switch"
             app:iconSpaceReserved="false" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/pref_key_notification_debug"
+            android:title="@string/pref_notify_debug_switch"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_other_header"
+        app:iconSpaceReserved="false">
+        <ListPreference
+            android:defaultValue="0.0"
+            android:entries="@array/grade_modifier_entries"
+            android:entryValues="@array/grade_modifier_value"
+            android:key="@string/pref_key_grade_modifier_plus"
+            android:summary="%s"
+            android:title="@string/pref_other_grade_modifier_plus"
+            app:iconSpaceReserved="false" />
+        <ListPreference
+            android:defaultValue="0.0"
+            android:entries="@array/grade_modifier_entries"
+            android:entryValues="@array/grade_modifier_value"
+            android:key="@string/pref_key_grade_modifier_minus"
+            android:summary="%s"
+            android:title="@string/pref_other_grade_modifier_minus"
+            app:iconSpaceReserved="false" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_fill_message_content"
+            android:title="@string/pref_other_fill_message_content"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt
index f15f4ea7..4842d305 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.attendance.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt
new file mode 100644
index 00000000..f4c161bc
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt
@@ -0,0 +1,57 @@
+package io.github.wulkanowy.data.repositories.remote
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.timetable.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRemote
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+import java.sql.Date
+
+class CompletedLessonsRemoteTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getCompletedLessonsTest() {
+        every {
+            mockApi.getCompletedLessons(
+                LocalDate.of(2018, 9, 10),
+                LocalDate.of(2018, 9, 15)
+            )
+        } returns Single.just(listOf(
+            getCompletedLesson("2018-09-10"),
+            getCompletedLesson("2018-09-17")
+        ))
+
+        every { mockApi.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
+
+        val completed = CompletedLessonsRemote(mockApi).getCompletedLessons(semesterMock,
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 15)
+        ).blockingGet()
+        Assert.assertEquals(2, completed.size)
+    }
+
+    private fun getCompletedLesson(dateString: String): CompletedLesson {
+        return CompletedLesson().apply { date = Date.valueOf(dateString) }
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt
index 71fcd6d5..0cc78548 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.exams.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.exam.ExamRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/GradeStatisticsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/GradeStatisticsRemoteTest.kt
new file mode 100644
index 00000000..14381791
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/GradeStatisticsRemoteTest.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.remote
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.api.grades.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRemote
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+
+class GradeStatisticsRemoteTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getGradeStatisticsTest() {
+        every { mockApi.getGradesStatistics(1, any()) } returns Single.just(listOf(
+            getGradeStatistics("Fizyka"),
+            getGradeStatistics("Matematyka")
+        ))
+
+        every { mockApi.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.semesterId } returns 1
+        every { semesterMock.semesterName } returns 2
+        every { semesterMock.diaryId } returns 1
+
+        val stats = GradeStatisticsRemote(mockApi).getGradeStatistics(semesterMock, false).blockingGet()
+        Assert.assertEquals(2, stats.size)
+    }
+
+    private fun getGradeStatistics(subjectName: String): GradeStatistics {
+        return GradeStatistics().apply {
+            subject = subjectName
+            gradeValue = 5
+            amount = 10
+        }
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt
new file mode 100644
index 00000000..054f8890
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.repositories.remote
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRemote
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Maybe
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+
+class LuckyNumberRemoteTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getLuckyNumberTest() {
+        every { mockApi.getLuckyNumber() } returns Maybe.just(14)
+
+        every { mockApi.diaryId } returns 1
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
+
+        val luckyNumber = LuckyNumberRemote(mockApi)
+            .getLuckyNumber(semesterMock)
+            .blockingGet()
+
+        assertEquals(14, luckyNumber.luckyNumber)
+        assertEquals(LocalDate.now(), luckyNumber.date)
+        assertEquals(semesterMock.studentId, luckyNumber.studentId)
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt
index 09082ec8..3a26836d 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt
@@ -1,7 +1,8 @@
 package io.github.wulkanowy.data.repositories.remote
 
 import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.api.register.Pupil
+import io.github.wulkanowy.api.register.Student
+import io.github.wulkanowy.data.repositories.student.StudentRemote
 import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -22,8 +23,8 @@ class StudentRemoteTest {
 
     @Test
     fun testRemoteAll() {
-        doReturn(Single.just(listOf(Pupil("", "", 1, "test", "", "", "", Api.LoginType.AUTO))))
-            .`when`(mockApi).getPupils()
+        doReturn(Single.just(listOf(Student("", "", 1, "test", "", "", Api.LoginType.AUTO))))
+            .`when`(mockApi).getStudents()
 
         val students = StudentRemote(mockApi).getStudents("", "", "").blockingGet()
         assertEquals(1, students.size)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt
index 4a5bb6ef..942b28ed 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.api.timetable.Timetable
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.timetable.TimetableRemote
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index 6536ec15..54b3b879 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -6,7 +6,6 @@ import org.junit.Test
 import org.mockito.Mock
 import org.mockito.Mockito.clearInvocations
 import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
 
@@ -32,25 +31,7 @@ class LoginPresenterTest {
     @Test
     fun initViewTest() {
         verify(loginView).initAdapter()
-        verify(loginView).hideActionBar()
-    }
-
-    @Test
-    fun onPageSelectedTest() {
-        presenter.onPageSelected(1)
-        verify(loginView).notifyOptionsViewLoadData()
-    }
-
-    @Test
-    fun onPageSelectedNeverTest() {
-        presenter.onPageSelected(0)
-        verify(loginView, never()).notifyOptionsViewLoadData()
-    }
-
-    @Test
-    fun onSwitchFragmentTest() {
-        presenter.onChildViewSwitchOptions()
-        verify(loginView).switchView(1)
+        verify(loginView).showActionBar(false)
     }
 
     @Test
@@ -59,7 +40,6 @@ class LoginPresenterTest {
         doReturn(1).`when`(loginView).currentViewIndex
         presenter.onBackPressed { }
         verify(loginView).switchView(0)
-        verify(loginView).hideActionBar()
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index 05d2e399..e2d910a9 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.reactivex.Single
@@ -10,12 +10,14 @@ import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
+import org.mockito.Mockito.`when`
 import org.mockito.Mockito.clearInvocations
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.never
 import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
 import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
 
 class LoginFormPresenterTest {
 
@@ -37,7 +39,7 @@ class LoginFormPresenterTest {
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
         clearInvocations(repository, loginFormView)
-        presenter = LoginFormPresenter(TestSchedulersProvider(), errorHandler, repository, analytics)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), errorHandler, repository, analytics, false)
         presenter.onAttachView(loginFormView)
     }
 
@@ -48,87 +50,89 @@ class LoginFormPresenterTest {
 
     @Test
     fun emptyNicknameLoginTest() {
-        presenter.attemptLogin("", "test123", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("")
+        `when`(loginFormView.formPassValue).thenReturn("test123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
 
-        verify(loginFormView).setErrorNicknameRequired()
+        verify(loginFormView).setErrorNameRequired()
         verify(loginFormView, never()).setErrorPassRequired(false)
-        verify(loginFormView, never()).setErrorSymbolRequire()
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        presenter.attemptLogin("@", "", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
 
-        verify(loginFormView, never()).setErrorNicknameRequired()
+        verify(loginFormView, never()).setErrorNameRequired()
         verify(loginFormView).setErrorPassRequired(true)
-        verify(loginFormView, never()).setErrorSymbolRequire()
         verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        presenter.attemptLogin("@", "123", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
 
-        verify(loginFormView, never()).setErrorNicknameRequired()
+        verify(loginFormView, never()).setErrorNameRequired()
         verify(loginFormView, never()).setErrorPassRequired(true)
-        verify(loginFormView, never()).setErrorSymbolRequire()
         verify(loginFormView).setErrorPassInvalid(true)
     }
 
-    @Test
-    fun emptySymbolLoginTest() {
-        doReturn(Single.just(emptyList<Student>()))
-            .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "", "https://fakelog.cf")
-        presenter.attemptLogin("@", "123456", "", "https://fakelog.cf")
-
-        verify(loginFormView).setErrorSymbolRequire()
-    }
-
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO")
+        val studentTest = Student(email = "test@", password = "123", endpoint = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, isCurrent = false, symbol = "", registrationDate = now())
         doReturn(Single.just(listOf(studentTest)))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
 
         verify(loginFormView).hideSoftKeyboard()
         verify(loginFormView).showProgress(true)
         verify(loginFormView).showProgress(false)
         verify(loginFormView).showContent(false)
         verify(loginFormView).showContent(true)
-        verify(loginFormView).switchOptionsView()
     }
 
     @Test
     fun loginEmptyTest() {
         doReturn(Single.just(emptyList<Student>()))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
 
         verify(loginFormView).hideSoftKeyboard()
         verify(loginFormView).showProgress(true)
         verify(loginFormView).showProgress(false)
         verify(loginFormView).showContent(false)
         verify(loginFormView).showContent(true)
-        verify(loginFormView).showSymbolInput()
     }
 
     @Test
     fun loginEmptyTwiceTest() {
         doReturn(Single.just(emptyList<Student>()))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "", "https://fakelog.cf")
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
+        presenter.attemptLogin()
 
         verify(loginFormView, times(2)).hideSoftKeyboard()
         verify(loginFormView, times(2)).showProgress(true)
         verify(loginFormView, times(2)).showProgress(false)
         verify(loginFormView, times(2)).showContent(false)
         verify(loginFormView, times(2)).showContent(true)
-        verify(loginFormView, times(2)).showSymbolInput()
-        verify(loginFormView).setErrorSymbolIncorrect()
     }
 
     @Test
@@ -136,7 +140,10 @@ class LoginFormPresenterTest {
         val testException = RuntimeException("test")
         doReturn(Single.error<List<Student>>(testException))
             .`when`(repository).getStudents(anyString(), anyString(), anyString(), anyString())
-        presenter.attemptLogin("@", "123456", "test", "https://fakelog.cf")
+        `when`(loginFormView.formNameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        presenter.attemptLogin()
 
         verify(loginFormView).hideSoftKeyboard()
         verify(loginFormView).showProgress(true)
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
deleted file mode 100644
index 939d017f..00000000
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/options/LoginOptionsPresenterTest.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.options
-
-import io.github.wulkanowy.TestSchedulersProvider
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.reactivex.Completable
-import io.reactivex.Single
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.clearInvocations
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-
-class LoginOptionsPresenterTest {
-
-    @Mock
-    lateinit var errorHandler: LoginErrorHandler
-
-    @Mock
-    lateinit var loginOptionsView: LoginOptionsView
-
-    @Mock
-    lateinit var studentRepository: StudentRepository
-
-    @Mock
-    lateinit var semesterRepository: SemesterRepository
-
-    @Mock
-    lateinit var analytics: FirebaseAnalyticsHelper
-
-    private lateinit var presenter: LoginOptionsPresenter
-
-    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO") }
-
-    private val testException by lazy { RuntimeException("Problem") }
-
-    @Before
-    fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        clearInvocations(studentRepository, loginOptionsView)
-        clearInvocations(semesterRepository, loginOptionsView)
-        presenter = LoginOptionsPresenter(errorHandler, studentRepository, semesterRepository, TestSchedulersProvider(), analytics)
-        presenter.onAttachView(loginOptionsView)
-    }
-
-    @Test
-    fun initViewTest() {
-        verify(loginOptionsView).initView()
-    }
-
-    @Test
-    fun refreshDataTest() {
-        doReturn(Single.just(listOf(testStudent))).`when`(studentRepository).cachedStudents
-        presenter.onParentViewLoadData()
-        verify(loginOptionsView).showActionBar(true)
-        verify(loginOptionsView).updateData(listOf(LoginOptionsItem(testStudent)))
-    }
-
-    @Test
-    fun refreshDataErrorTest() {
-        doReturn(Single.error<List<Student>>(testException)).`when`(studentRepository).cachedStudents
-        presenter.onParentViewLoadData()
-        verify(loginOptionsView).showActionBar(true)
-        verify(errorHandler).dispatch(testException)
-    }
-
-    @Test
-    fun onSelectedStudentTest() {
-        doReturn(Single.just(1L)).`when`(studentRepository).saveStudent(testStudent)
-        doReturn(Single.just(emptyList<Semester>())).`when`(semesterRepository).getSemesters(testStudent, true)
-        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
-        presenter.onItemSelected(LoginOptionsItem(testStudent))
-        verify(loginOptionsView).showContent(false)
-        verify(loginOptionsView).showProgress(true)
-        verify(loginOptionsView).openMainView()
-    }
-
-    @Test
-    fun onSelectedStudentErrorTest() {
-        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudent(testStudent)
-        doReturn(Single.just(emptyList<Semester>())).`when`(semesterRepository).getSemesters(testStudent, true)
-        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
-        presenter.onItemSelected(LoginOptionsItem(testStudent))
-        verify(loginOptionsView).showContent(false)
-        verify(loginOptionsView).showProgress(true)
-        verify(errorHandler).dispatch(testException)
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
new file mode 100644
index 00000000..1059e0ac
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -0,0 +1,71 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
+
+class LoginStudentSelectPresenterTest {
+
+    @Mock
+    lateinit var errorHandler: LoginErrorHandler
+
+    @Mock
+    lateinit var loginStudentSelectView: LoginStudentSelectView
+
+    @Mock
+    lateinit var studentRepository: StudentRepository
+
+    @Mock
+    lateinit var analytics: FirebaseAnalyticsHelper
+
+    private lateinit var presenter: LoginStudentSelectPresenter
+
+    private val testStudent by lazy { Student(email = "test", password = "test123", endpoint = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", studentName = "", registrationDate = now()) }
+
+    private val testException by lazy { RuntimeException("Problem") }
+
+    @Before
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(studentRepository, loginStudentSelectView)
+        presenter = LoginStudentSelectPresenter(errorHandler, studentRepository, TestSchedulersProvider(), analytics)
+        presenter.onAttachView(loginStudentSelectView, null)
+    }
+
+    @Test
+    fun initViewTest() {
+        verify(loginStudentSelectView).initView()
+    }
+
+    @Test
+    fun onSelectedStudentTest() {
+        doReturn(Single.just(1L)).`when`(studentRepository).saveStudent(testStudent)
+        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(loginStudentSelectView).openMainView()
+    }
+
+    @Test
+    fun onSelectedStudentErrorTest() {
+        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudent(testStudent)
+        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
+        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(errorHandler).dispatch(testException)
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 203ce304..f7c5559d 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.main
 
 import io.github.wulkanowy.TestSchedulersProvider
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.job.ServiceHelper
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import org.junit.Before
@@ -25,7 +25,7 @@ class MainPresenterTest {
     lateinit var prefRepository: PreferencesRepository
 
     @Mock
-    lateinit var serviceHelper: ServiceHelper
+    lateinit var syncManager: SyncManager
 
     @Mock
     lateinit var mainView: MainView
@@ -40,7 +40,7 @@ class MainPresenterTest {
         MockitoAnnotations.initMocks(this)
         clearInvocations(mainView)
 
-        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, TestSchedulersProvider(), serviceHelper, analytics)
+        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, TestSchedulersProvider(), analytics)
         presenter.onAttachView(mainView, -1)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
new file mode 100644
index 00000000..943fb190
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/message/send/TestRecipientChip.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class TestRecipientChip {
+
+    @Test
+    fun testRecipientChipInfo() {
+        assertEquals("Uczeń", getRecipientChip("Kowalski Jan - Uczeń").info)
+        assertEquals("(JK) - pracownik [Fake123456]", getRecipientChip("Kowalski Jan (JK) - pracownik [Fake123456]").info)
+        assertEquals("[KK] - pracownik (Fake123456)", getRecipientChip("Kowalska Karolina [KK] - pracownik (Fake123456)").info)
+        assertEquals("(BK) - Nauczyciel [Fake123456]", getRecipientChip("Kowal-Mazur Barbara (BK) - Nauczyciel [Fake123456]").info)
+    }
+
+    private fun getRecipientChip(realName: String): RecipientChip {
+        return RecipientChip(Recipient(0, "", "", realName, 0, 0, 0, ""))
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index ee4b17cf..fc25c095 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -1,7 +1,9 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.reactivex.Single
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
@@ -25,19 +27,19 @@ class SplashPresenterTest {
     @Before
     fun initPresenter() {
         MockitoAnnotations.initMocks(this)
-        presenter = SplashPresenter(studentRepository, errorHandler)
+        presenter = SplashPresenter(studentRepository, errorHandler, TestSchedulersProvider())
     }
 
     @Test
     fun testOpenLoginView() {
-        doReturn(false).`when`(studentRepository).isStudentSaved
+        doReturn(Single.just(false)).`when`(studentRepository).isStudentSaved()
         presenter.onAttachView(splashView)
         verify(splashView).openLoginView()
     }
 
     @Test
     fun testMainMainView() {
-        doReturn(true).`when`(studentRepository).isStudentSaved
+        doReturn(Single.just(true)).`when`(studentRepository).isStudentSaved()
         presenter.onAttachView(splashView)
         verify(splashView).openMainView()
     }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
index 12a086ed..3b1ab648 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -22,11 +22,11 @@ class GradeExtensionTest {
     @Test
     fun calcWeightedAverage() {
         assertEquals(3.47, listOf(
-            createGrade(5, 6, 0.33),
-            createGrade(5, 5, -0.33),
-            createGrade(4, 1, 0.0),
-            createGrade(1, 9, 0.5),
-            createGrade(0, 0, 0.0)
+            createGrade(5, 6.0, 0.33),
+            createGrade(5, 5.0, -0.33),
+            createGrade(4, 1.0, 0.0),
+            createGrade(1, 9.0, 0.5),
+            createGrade(0, .0, 0.0)
         ).calcAverage(), 0.005)
     }
 
@@ -42,23 +42,23 @@ class GradeExtensionTest {
 
     @Test
     fun changeModifier_default() {
-        assertEquals(.33, createGrade(5, 0, .33).changeModifier(.0, .0).modifier, .0)
-        assertEquals(-.33, createGrade(5, 0, -.33).changeModifier(.0, .0).modifier, .0)
+        assertEquals(.33, createGrade(5, .0, .33).changeModifier(.0, .0).modifier, .0)
+        assertEquals(-.33, createGrade(5, .0, -.33).changeModifier(.0, .0).modifier, .0)
     }
 
     @Test
     fun changeModifier_plus() {
-        assertEquals(.33, createGrade(5, 0, .25).changeModifier(.33, .50).modifier, .0)
-        assertEquals(.25, createGrade(5, 0, .33).changeModifier(.25, .0).modifier, .0)
+        assertEquals(.33, createGrade(5, .0, .25).changeModifier(.33, .50).modifier, .0)
+        assertEquals(.25, createGrade(5, .0, .33).changeModifier(.25, .0).modifier, .0)
     }
 
     @Test
     fun changeModifier_minus() {
-        assertEquals(-.33, createGrade(5, 0, -.25).changeModifier(.25, .33).modifier, .0)
-        assertEquals(-.25, createGrade(5, 0, -.33).changeModifier(.0, .25).modifier, .0)
+        assertEquals(-.33, createGrade(5, .0, -.25).changeModifier(.25, .33).modifier, .0)
+        assertEquals(-.25, createGrade(5, .0, -.33).changeModifier(.0, .25).modifier, .0)
     }
 
-    private fun createGrade(value: Int, weightValue: Int = 0, modifier: Double = 0.25): Grade {
+    private fun createGrade(value: Int, weightValue: Double = .0, modifier: Double = 0.25): Grade {
         return Grade(
             semesterId = 1,
             studentId = 1,
diff --git a/build.gradle b/build.gradle
index 89f697aa..caeca70f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.21'
     repositories {
         mavenCentral()
         google()
@@ -9,12 +9,11 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.google.gms:google-services:4.2.0'
-        classpath "io.fabric.tools:gradle:1.26.1"
-        classpath "com.github.triplet.gradle:play-publisher:1.2.2"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2"
-        classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02'
+        classpath "io.fabric.tools:gradle:1.27.1"
+        classpath "com.github.triplet.gradle:play-publisher:2.1.0"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
     }
 }
 
@@ -34,8 +33,8 @@ allprojects {
         mavenCentral()
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public'}
         maven { url 'https://jitpack.io' }
+        maven { url "https://kotlin.bintray.com/kotlinx/" }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 9e6fce10..24e69b6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,6 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
+android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3f0f9be6..f95599f5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Jan 20 13:58:58 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip