Merge branch 'release/0.10.2'

Version 0.10.1

.gitignore

@@ -1,39 +1,90 @@
-/captures
+# Created by https://www.gitignore.io
-.externalNativeBuild
-
-## https://gist.github.com/iainconnor/8605514
 
 # Built application files
-/build
+*.apk
-/*/build/
+*.ap_
+*.aab
 
-# Crashlytics configuations
+# Files for the ART/Dalvik VM
-com_crashlytics_export_strings.xml
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Gradle generated files
+# Proguard folder generated by Eclipse
-.gradle/
+proguard/
 
-# Signing files
+# Log Files
-.signing/
+*.log
 
-# User-specific configurations
+# Android Studio Navigation editor temp files
-.idea/copyright/profiles_settings.xml
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ configurations
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+.idea/modules.xml
+.idea/navEditor.xml
+.idea/caches/
 .idea/libraries/
-.idea/inspectionProfiles/
+.idea/shelf/
 .idea/.name
 .idea/compiler.xml
+.idea/copyright/profiles_settings.xml
 .idea/encodings.xml
 .idea/misc.xml
-.idea/modules.xml
 .idea/scopes/scope_settings.xml
-.idea/tasks.xml
 .idea/vcs.xml
-.idea/workspace.xml
+.idea/jsLibraryMappings.xml
-.idea/caches/
+.idea/datasources.xml
-*.iml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/runConfigurations.xml
+
+# Keystore files
+*.jks
+*.keystore
+*.p12
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+lint/reports/
+
+### Android Patch ###
+gen-external-apklibs
+output.json
 
 # OS-specific files
 .DS_Store
@@ -43,9 +94,20 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-.idea/caches/
+
-app/key.p12
+# Legacy Eclipse project files
-app/upload-key.jks
+.classpath
-*.log
+.project
-.idea/assetWizardSettings.xml
+.cproject
-.idea/uiDesigner.xml
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar

.idea/codeStyles/Project.xml

@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
@@ -21,13 +18,10 @@
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
-    <XML>
+    <MarkdownNavigatorCodeStyleSettings>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
+      <option name="RIGHT_MARGIN" value="72" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+    </MarkdownNavigatorCodeStyleSettings>
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -38,6 +32,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -48,6 +43,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -59,6 +55,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -69,6 +66,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -79,6 +77,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -89,6 +88,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -99,6 +99,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -110,6 +111,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -121,6 +123,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -138,7 +141,6 @@
       <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
       <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>

.idea/gradle.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.travis.yml

@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.9.2
+    - 0.10.2
 
 android:
  licenses:

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 wulkanowy
+   Copyright 2019 Wulkanowy
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.en.md

@@ -0,0 +1,61 @@
+[Polska wersja README](README.md)
+
+# Wulkanowy
+[![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)
+
+Unofficial android VULCAN UONET+ register client for student and parent
+
+## Features
+
+* logging in using the email and password
+* functions from the register website:
+    * grades
+    * grade statistics
+    * attendance
+    * percentage of attendance
+    * exams
+    * timetable
+    * completed lessons
+    * messages
+    * homework
+    * notes
+    * lucky number
+* calculation of the average
+* notifications, e.g. about a new grade
+* dark and black (AMOLED) theme
+* offline mode
+* no ads
+
+## Download
+
+You can download the current beta from the Google Play or Fdroid store
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Get it on Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on Fdroid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+    
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release
+
+## Built With
+
+
+* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Contributing
+
+Please contribute to the project either by creating a PR or submitting an issue on GitHub.
+
+## License
+
+This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details

README.md

@@ -1,23 +1,62 @@
-# Wulkanowy
+[English version of README](README.en.md)
 
+# Wulkanowy
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
-[![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![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.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)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)
 
-[Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&utm_source=vcs)
+Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
-[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
+## Funkcje
-[(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
 
-Androidowy klient dziennika VULCAN UONET+.
+* logowanie za pomocą e-maila i hasła
+* funkcje ze strony internetowej dziennika:
+    * oceny
+    * statystyki ocen
+    * frekwencja
+    * procent frekwencji
+    * sprawdziany
+    * plan lekcji
+    * lekcje zrealizowane
+    * wiadomości
+    * zadania domowe
+    * uwagi
+    * szczęśliwy numerek
+* obliczanie średniej
+* powiadomienia np. o nowej ocenie
+* ciemny i czarny (AMOLED) motyw
+* tryb offilne
+* brak reklam
+
+## Pobierz
+
+Aktualną wersję beta możesz pobrać ze sklepu Google Play lub Fdroid
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Pobierz z Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Pobierz z Fdroid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
 
 
-## License
+Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
 
-[![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)
+
+## Zbudowana za pomocą
+
+* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Współpraca
+
+Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
+
+## Licencja
+
+Ten projekt jest licencjonowany w ramach Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)

app/.gitignore

@@ -1 +0,0 @@
-/build

app/build.gradle

@@ -15,10 +15,10 @@ android {
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 28
-        versionCode 41
+        versionCode 45
-        versionName "0.9.3"
+        versionName "0.10.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -28,7 +28,8 @@ android {
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString(),
+                             "room.incremental"   : "true"]
             }
         }
     }
@@ -65,6 +66,7 @@ android {
     }
 
     flavorDimensions "platform"
+
     productFlavors {
         play {
             dimension "platform"
@@ -84,6 +86,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    packagingOptions {
+        exclude 'META-INF/library_release.kotlin_module'
+        exclude 'META-INF/library-core_release.kotlin_module'
+    }
 }
 
 androidExtensions {
@@ -97,80 +108,98 @@ play {
     track = 'alpha'
 }
 
+ext {
+    work_manager = "2.2.0"
+    room = "2.2.0-rc01"
+    dagger = "2.24"
+    chucker = "2.0.4"
+    mockk = "1.9.2"
+    mockito_core = "3.0.7"
+}
+
+configurations.all {
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
+    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
+}
+
 dependencies {
-    implementation "io.github.wulkanowy:api:0.9.3"
+    implementation "io.github.wulkanowy:api:0.10.2"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core:1.0.2"
+    implementation "androidx.core:core-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "androidx.activity:activity-ktx:1.0.0"
-    implementation "androidx.fragment:fragment:1.0.0"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.1.0"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0-beta04"
     implementation "androidx.viewpager:viewpager:1.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.0.0"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
     implementation "com.google.android.material:material:1.1.0-alpha07"
-    implementation "com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
+    implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
-    implementation "androidx.work:work-runtime:2.0.1"
+    implementation "androidx.work:work-runtime-ktx:$work_manager"
-    implementation "androidx.work:work-rxjava2:2.0.1"
+    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.room:room-runtime:2.1.0"
+    implementation "androidx.room:room-runtime:$room"
-    implementation "androidx.room:room-rxjava2:2.1.0"
+    implementation "androidx.room:room-rxjava2:$room"
-    kapt "androidx.room:room-compiler:2.1.0"
+    implementation "androidx.room:room-ktx:$room"
+    kapt "androidx.room:room-compiler:$room"
 
-    implementation "com.google.dagger:dagger-android-support:2.23.1"
+    implementation "com.google.dagger:dagger-android-support:$dagger"
-    kapt "com.google.dagger:dagger-compiler:2.23.1"
+    kapt "com.google.dagger:dagger-compiler:$dagger"
-    kapt "com.google.dagger:dagger-android-processor:2.23.1"
+    kapt "com.google.dagger:dagger-android-processor:$dagger"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation "com.ncapdevi:frag-nav:3.2.0"
+    implementation "com.ncapdevi:frag-nav:3.3.0"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.12"
 
     implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.3"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.4"
+    implementation "com.mikepenz:aboutlibraries:7.0.3"
 
-    implementation "com.mikepenz:aboutlibraries:6.2.3"
+    playImplementation "com.google.firebase:firebase-core:17.2.0"
-    implementation "com.takisoft.preferencex:preferencex:1.0.0"
-
-    playImplementation "com.google.firebase:firebase-core:16.0.9"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
-    releaseImplementation "fr.o80.chucker:library-no-op:2.0.4"
+    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
 
-    debugImplementation "fr.o80.chucker:library:2.0.4"
+    debugImplementation "fr.o80.chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.9.2"
+    testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-core:2.28.2"
+    testImplementation "org.mockito:mockito-core:$mockito_core"
-    testImplementation("org.mockito:mockito-inline:2.28.2") {
+    testImplementation("org.mockito:mockito-inline:3.0.7") {
         exclude group: "org.mockito", module: "mockito-core"
     }
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.1"
-    androidTestImplementation "io.mockk:mockk-android:1.9.2"
+    androidTestImplementation "io.mockk:mockk-android:$mockk"
-    androidTestImplementation "androidx.room:room-testing:2.1.0"
+    androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-core:2.28.2"
+    androidTestImplementation "org.mockito:mockito-core:$mockito_core"
-    androidTestImplementation("org.mockito:mockito-android:2.28.2") {
+    androidTestImplementation("org.mockito:mockito-android:3.0.7") {
         exclude group: 'org.mockito', module: 'mockito-core'
     }
 }

app/jacoco.gradle

@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.3"
+    toolVersion "0.8.4"
     reportsDir = file("$buildDir/reports")
 }
 

app/proguard-rules.pro

@@ -11,6 +11,10 @@
 -verbose
 
 
+#Keep all wulkanowy files
+-keep class io.github.wulkanowy.** {*;}
+
+
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
@@ -32,11 +36,10 @@
 -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.** {*;}
 
 #Config for Material Components
--keep class com.google.android.material.tabs.** {*;}
+-keep class com.google.android.material.tabs.** { *; }

app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt

@@ -5,7 +5,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
@@ -21,14 +21,14 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedHelper: SharedPrefHelper
+    private lateinit var sharedProvider: SharedPrefProvider
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 

app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt

@@ -7,7 +7,7 @@ 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 = "", teacher: String = ""): TimetableLocal {
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
         studentId = 1,
         diaryId = 2,
@@ -23,12 +23,12 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
-        changes = false,
+        changes = changes,
         canceled = false
     )
 }
 
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = ""): TimetableRemote {
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
     return TimetableRemote(
         number = number,
         start = start.toDate(),
@@ -39,7 +39,7 @@ fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subje
         room = room,
         teacher = teacher,
         info = "",
-        changes = false,
+        changes = changes,
         canceled = false
     )
 }

app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt

@@ -60,7 +60,7 @@ class TimetableRepositoryTest {
     }
 
     @Test
-    fun copyDetailsToCompletedFromPrevious() {
+    fun copyRoomToCompletedFromPrevious() {
         timetableLocal.saveTimetable(listOf(
             createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
             createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
@@ -83,7 +83,32 @@ class TimetableRepositoryTest {
         assertEquals("123", lessons[0].room)
         assertEquals("321", lessons[1].room)
         assertEquals("213", lessons[2].room)
+    }
 
-        assertEquals("", lessons[3].teacher)
+    @Test
+    fun copyTeacherToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda", "Jan Garnkiewicz", false),
+            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia", "Paweł Jumper", false),
+            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F", "", true),
+            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "", false)
+        ))
+
+        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda", "", true), // should override local
+            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia", "", false),
+            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F", "Jan Garnkiewicz", false),
+            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F", "Paweł Jumper", false)
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(4, lessons.size)
+        assertEquals("", lessons[0].teacher)
+        assertEquals("Paweł Jumper", lessons[1].teacher)
+        assertEquals("Jan Garnkiewicz", lessons[2].teacher)
+        assertEquals("Paweł Jumper", lessons[3].teacher)
     }
 }

app/src/debug/res/drawable/ic_launcher_foreground.xml

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

app/src/debug/res/drawable/ic_launcher_foreground_dev.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#ad2a2a"
+        android:pathData="M2465,1904v561h-759L704,1463l-120,-120 -1,-1 5,-9 1,-3c9,-15 20,-29 31,-43l16,-19 3,-4 21,-30 3,-6c7,-11 12,-23 18,-35l14,-24 3,-4v-1a234,234 0,0 0,20 -53v-1l1,-3c4,-15 7,-31 13,-46l5,-9v-1c5,-10 11,-19 14, -30 2,-9 3,-19 3,-28v-1,-21l3,-17v-3l4,-17h1v-1c0,-2 -1,-4 -3,-4l8,-8 4,1c13,-4 25,-10 37,-17l8,-5 22,-16 9,-9v-1l5, -11c3,-9 2,-19 2,-29l6,-6 4,2 45,45 10,9 14,14 101,101 17,17 16,17 31,-31 -193,-191 1,-2 1,-2 -1,-3v-1l-1,-1 27,-27 192,-192 2,1a27,27 0,0 1,14 3l6,6c2,2 8,3 9,1l1310,1310z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
+    <path
+        android:fillColor="#3f3f3f"
+        android:pathData="M886.7,1119.5h1580.5c0.6,0 0,292 0,292H886.7a19.4,19.4 0,0 1,-19.5 -19.5v-253c0,-10.8 8.7,-19.5 19.5,-19.5z"
+        android:strokeWidth="4"
+        android:strokeAlpha=".5"
+        android:strokeColor="#000"
+        android:strokeLineCap="square"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha=".2"
+        android:fillColor="#000"
+        android:pathData="M1191.2,1173.4v19.9h-88.7v59.3h77v19.9h-77v65.4h89.8v19.9L1079,1357.8v-104.2l-52.3,-52.3 -0.8, -0.2a75.1,75.1 0,0 1,12.7 23,104 104,0 0,1 5.7,34.7v13.5c0,12.7 -2,24.3 -5.7,34.8a72.8,72.8 0,0 1,-41.6 44.4,85.5 85.5,0 0,1 -34.3,6.3L920,1357.8v-6.6l-0.4,6.8 53.8,53.5h622L1416,1232l-58.4,-58.4h-0.3l-58,184.1h -20.4l-44.7,-141.3zM1245.8,1173.5l43,146.5 23.7,-79.7zM972.1,1173.8zM943.8,1192.5v146.1h18.9a62,62 0,0 0,25.8 -5.2,50.3 50.3,0 0,0 18,-14c4.9,-6 8.4,-13 10.7,-21 2.3,-8 3.6,-16.7 3.7,-26v-13.9c-0.1,-9.4 -1.4,-18 -3.7,-26 -2.4,-8 -6,-15 -10.7,-20.7a49.3,49.3 0,0 0,-18 -14,63.4 63.4,0 0,0 -25.8,-5.3zM1022.6,1197.3l2,2.1 -2,-2z"
+        android:strokeWidth="1.9"
+        android:strokeColor="#000" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M920,1357.7v-184.5h42.7q19.3,0.3 34.3,6.6 15.2,6.2 25.6,17.5 10.6,11.2 16,26.9 5.6,15.6 5.7, 34.6v13.5q-0.1,19 -5.7,34.7 -5.4,15.6 -16,26.9 -10.4,11.2 -25.6,17.5 -15,6.2 -34.3,6.3zM943.8,1192.5v146.1h18.9q15, -0.1 25.8,-5.2 11,-5.2 18,-14 7.3,-9 10.7,-21 3.5,-12 3.6,-26v-13.9q0,-14 -3.6,-26t-10.7,-20.7q-7,-9 -18,-14 -10.9,-5 -25.8,-5.3zM1179.5,1272.5h-77v65.4h89.8v19.9L1079,1357.8v-184.6h112.2v20h-88.7v59.4h77zM1288.9, 1320l43.6,-146.8h25l-58.2,184.6h-20.4l-58.3,-184.6h25z"
+        android:strokeWidth="1"
+        android:strokeColor="#000" />
+</vector>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +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"/>
+    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
 </adaptive-icon>

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +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"/>
+    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
 </adaptive-icon>

app/src/debug/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#D32F2F</color>
-</resources>

app/src/main/AndroidManifest.xml

@@ -4,8 +4,6 @@
     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" />
@@ -45,6 +43,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"

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

@@ -5,7 +5,6 @@ import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
-import androidx.work.WorkManager
 import com.jakewharton.threetenabp.AndroidThreeTen
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
@@ -13,6 +12,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.CrashlyticsTree
@@ -24,11 +24,14 @@ import timber.log.Timber
 import java.io.IOException
 import javax.inject.Inject
 
-class WulkanowyApp : DaggerApplication() {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
     lateinit var workerFactory: SyncWorkerFactory
 
+    @Inject
+    lateinit var themeManager: ThemeManager
+
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -41,20 +44,12 @@ class WulkanowyApp : DaggerApplication() {
         super.onCreate()
         AndroidThreeTen.init(this)
         RxJavaPlugins.setErrorHandler(::onError)
+        themeManager.applyDefaultTheme()
 
-        initWorkManager()
         initLogging()
         initCrashlytics(this, appInfo)
     }
 
-    private fun initWorkManager() {
-        WorkManager.initialize(this,
-            Configuration.Builder()
-                .setWorkerFactory(workerFactory)
-                .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
-                .build())
-    }
-
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
@@ -76,4 +71,9 @@ class WulkanowyApp : DaggerApplication() {
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
         return DaggerAppComponent.factory().create(this)
     }
+
+    override fun getWorkManagerConfiguration() = Configuration.Builder()
+        .setWorkerFactory(workerFactory)
+        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
+        .build()
 }

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

@@ -1,18 +1,15 @@
 package io.github.wulkanowy.data.db
 
-import android.annotation.SuppressLint
 import android.content.SharedPreferences
+import androidx.core.content.edit
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-@SuppressLint("ApplySharedPref")
+class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
-class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
 
     fun putLong(key: String, value: Long, sync: Boolean = false) {
-        sharedPref.edit().putLong(key, value).apply {
+        sharedPref.edit(sync) { putLong(key, value) }
-            if (sync) commit() else apply()
-        }
     }
 
     fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)

app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt

@@ -32,10 +32,11 @@ class TimetableRepository @Inject constructor(
                         .doOnSuccess { old ->
                             local.deleteTimetable(old.uniqueSubtract(new))
                             local.saveTimetable(new.uniqueSubtract(old).map { item ->
-                                item.apply {
+                                item.also { new ->
-                                    old.singleOrNull { this.start == it.start }?.let {
+                                    old.singleOrNull { new.start == it.start }?.let { old ->
-                                        return@map copy(
+                                        return@map new.copy(
-                                            room = if (room.isEmpty()) it.room else room
+                                            room = if (new.room.isEmpty()) old.room else new.room,
+                                            teacher = if (new.teacher.isEmpty() && !new.changes) old.teacher else new.teacher
                                         )
                                     }
                                 }

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

@@ -14,7 +14,7 @@ import javax.inject.Singleton
     AppModule::class,
     RepositoryModule::class,
     ServicesModule::class,
-    BuilderModule::class])
+    BindingModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {
 
     @Component.Factory

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

@@ -6,16 +6,17 @@ import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
 
+@Suppress("unused")
 @Module
-internal abstract class BuilderModule {
+internal abstract class BindingModule {
 
     @PerActivity
     @ContributesAndroidInjector

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

@@ -1,8 +1,6 @@
 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
@@ -28,6 +26,7 @@ import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
+@Suppress("unused")
 @AssistedModule
 @Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
@@ -37,17 +36,12 @@ abstract class ServicesModule {
 
         @JvmStatic
         @Provides
-        fun provideWorkManager() = WorkManager.getInstance()
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
         @JvmStatic
         @Singleton
         @Provides
-        fun provideNotificationManagerCompat(context: Context) = NotificationManagerCompat.from(context)
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
-
-        @JvmStatic
-        @Singleton
-        @Provides
-        fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
     }
 
     @ContributesAndroidInjector

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

@@ -8,9 +8,9 @@ import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
-import androidx.work.PeriodicWorkRequest
+import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
@@ -26,14 +26,13 @@ import javax.inject.Singleton
 class SyncManager @Inject constructor(
     private val workManager: WorkManager,
     private val preferencesRepository: PreferencesRepository,
-    sharedPrefHelper: SharedPrefHelper,
+    sharedPrefProvider: SharedPrefProvider,
     newEntriesChannel: NewEntriesChannel,
     debugChannel: DebugChannel,
     appInfo: AppInfo
 ) {
 
     companion object {
-
         private const val APP_VERSION_CODE_KEY = "app_version_code"
     }
 
@@ -45,18 +44,18 @@ class SyncManager @Inject constructor(
             if (appInfo.isDebug) debugChannel.create()
         }
 
-        if (sharedPrefHelper.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
+        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
             startSyncWorker(true)
-            sharedPrefHelper.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
+            sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
         }
-
         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, 10, MINUTES)
+                PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
+                    .setInitialDelay(10, MINUTES)
                     .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
                     .setConstraints(Constraints.Builder()
                         .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) UNMETERED else CONNECTED)

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

@@ -64,7 +64,7 @@ class SyncWorker @AssistedInject constructor(
     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)
+            .setSmallIcon(R.drawable.ic_more_settings)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))

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

@@ -3,15 +3,15 @@ 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 androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class DebugChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
 ) {
 
@@ -21,7 +21,8 @@ class DebugChannel @Inject constructor(
 
     fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT).apply {
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
+                .apply {
                     lockscreenVisibility = VISIBILITY_PUBLIC
                 })
     }

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

@@ -3,15 +3,15 @@ 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 androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class NewEntriesChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
 ) {
 
@@ -21,7 +21,8 @@ class NewEntriesChannel @Inject constructor(
 
     fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH).apply {
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH)
+                .apply {
                     enableLights(true)
                     enableVibration(true)
                     lockscreenVisibility = VISIBILITY_PUBLIC

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

@@ -15,7 +15,7 @@ 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.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class GradeWork @Inject constructor(
         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)
+            .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
             .setDefaults(DEFAULT_ALL)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.GRADE.id,
+                PendingIntent.getActivity(context, MainView.Section.GRADE.id,
-                    MainActivity.getStartIntent(context, MenuView.GRADE, true), FLAG_UPDATE_CURRENT))
+                    MainActivity.getStartIntent(context, MainView.Section.GRADE, true), 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}") }

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

@@ -15,7 +15,7 @@ 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.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class LuckyNumberWork @Inject constructor(
         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)
+            .setSmallIcon(R.drawable.ic_stat_luckynumber)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+                    MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
             .build())
     }
 }

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

@@ -16,7 +16,7 @@ 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.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -42,14 +42,14 @@ class MessageWork @Inject constructor(
         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)
+            .setSmallIcon(R.drawable.ic_stat_message)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.MESSAGE.id,
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MenuView.MESSAGE, true), FLAG_UPDATE_CURRENT)
+                    MainActivity.getStartIntent(context, MainView.Section.MESSAGE, true), FLAG_UPDATE_CURRENT)
             )
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))

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

@@ -15,7 +15,7 @@ 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.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class NoteWork @Inject constructor(
         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)
+            .setSmallIcon(R.drawable.ic_stat_note)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, MenuView.NOTE.id,
+                PendingIntent.getActivity(context, MainView.Section.NOTE.id,
-                    MainActivity.getStartIntent(context, MenuView.NOTE, true), FLAG_UPDATE_CURRENT))
+                    MainActivity.getStartIntent(context, MainView.Section.NOTE, true), 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}") }

app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt

@@ -3,7 +3,7 @@ package io.github.wulkanowy.services.widgets
 import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.android.AndroidInjection
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
@@ -23,7 +23,7 @@ class TimetableWidgetService : RemoteViewsService() {
     lateinit var semesterRepo: SemesterRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     @Inject
     lateinit var schedulers: SchedulersProvider

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

@@ -1,5 +1,8 @@
 package io.github.wulkanowy.ui.base
 
+import android.app.ActivityManager
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Bundle
@@ -8,22 +11,21 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.AndroidInjection
 import dagger.android.DispatchingAndroidInjector
-import dagger.android.support.HasSupportFragmentInjector
+import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
+import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView, HasAndroidInjector {
-    HasSupportFragmentInjector {
 
     @Inject
-    lateinit var supportFragmentInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
@@ -37,10 +39,15 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
-        themeManager.applyTheme(this)
+        themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+        if (SDK_INT >= LOLLIPOP) {
+            @Suppress("DEPRECATION")
+            setTaskDescription(ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)))
+        }
     }
 
     override fun showError(text: String, error: Throwable) {
@@ -78,5 +85,5 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
         presenter.onDetachView()
     }
 
-    override fun supportFragmentInjector() = supportFragmentInjector
+    override fun androidInjector() = androidInjector
 }

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

@@ -4,14 +4,15 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 
-class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) :
+    FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     private val pages = mutableMapOf<Fragment, String?>()
 
     var containerId = 0
 
     fun getFragmentInstance(position: Int): Fragment? {
-        if (containerId == 0) throw IllegalArgumentException("Container id is 0")
+        require(containerId != 0) { "Container id is 0" }
         return fragmentManager.findFragmentByTag("android:switcher:$containerId:$position")
     }
 

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

@@ -2,13 +2,13 @@ package io.github.wulkanowy.ui.base
 
 import android.content.ClipData
 import android.content.ClipboardManager
-import android.content.Context.CLIPBOARD_SERVICE
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.core.content.getSystemService
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import kotlinx.android.synthetic.main.dialog_error.*
@@ -49,7 +49,7 @@ class ErrorDialog : DialogFragment() {
             errorDialogContent.text = writer.toString()
             errorDialogCopy.setOnClickListener {
                 ClipData.newPlainText("wulkanowyError", writer.toString()).let { clip ->
-                    (activity?.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip = clip
+                    activity?.getSystemService<ClipboardManager>()?.primaryClip = clip
                 }
                 Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
             }

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

@@ -2,27 +2,29 @@ package io.github.wulkanowy.ui.base
 
 import android.content.pm.PackageManager.GET_ACTIVITIES
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class ThemeManager @Inject constructor(private val preferencesRepository: PreferencesRepository) {
 
-    fun applyTheme(activity: AppCompatActivity) {
+    fun applyActivityTheme(activity: AppCompatActivity) {
         if (isThemeApplicable(activity)) {
-            activity.delegate.apply {
+            applyDefaultTheme()
-                when (preferencesRepository.appTheme) {
+            if (preferencesRepository.appTheme == "black") activity.setTheme(R.style.WulkanowyTheme_Black)
-                    "light" -> setLocalNightMode(MODE_NIGHT_NO)
-                    "dark" -> setLocalNightMode(MODE_NIGHT_YES)
-                    "black" -> {
-                        setLocalNightMode(MODE_NIGHT_YES)
-                        activity.setTheme(R.style.WulkanowyTheme_Black)
-                    }
-                }
         }
     }
+
+    fun applyDefaultTheme() {
+        AppCompatDelegate.setDefaultNightMode(
+            if (preferencesRepository.appTheme == "light") MODE_NIGHT_NO
+            else MODE_NIGHT_YES
+        )
     }
 
     private fun isThemeApplicable(activity: AppCompatActivity): Boolean {

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

@@ -1,19 +1,29 @@
 package io.github.wulkanowy.ui.modules.about
 
 import android.content.Intent
+import android.content.Intent.ACTION_SENDTO
+import android.content.Intent.EXTRA_EMAIL
+import android.content.Intent.EXTRA_SUBJECT
+import android.content.Intent.EXTRA_TEXT
+import android.graphics.drawable.Drawable
 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 eu.davidea.flexibleadapter.FlexibleAdapter
-import com.mikepenz.aboutlibraries.LibsFragmentCompat
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.withOnExtraListener
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
 
 class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
@@ -22,58 +32,89 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
     lateinit var presenter: AboutPresenter
 
     @Inject
-    lateinit var fragmentCompat: LibsFragmentCompat
+    lateinit var aboutAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
 
     @Inject
     lateinit var appInfo: AppInfo
 
+    override val versionRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_version), "${appInfo.versionName} (${appInfo.versionCode})", getCompatDrawable(R.drawable.ic_all_about))
+        }
+
+    override val feedbackRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_feedback), getString(R.string.about_feedback_summary), getCompatDrawable(R.drawable.ic_about_feedback))
+        }
+
+    override val discordRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
+        }
+
+    override val homepageRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_homepage), getString(R.string.about_homepage_summary), getCompatDrawable(R.drawable.ic_about_homepage))
+        }
+
+    override val licensesRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_licenses), getString(R.string.about_licenses_summary), getCompatDrawable(R.drawable.ic_about_licenses))
+        }
+
+    override val privacyRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_privacy), getString(R.string.about_privacy_summary), getCompatDrawable(R.drawable.ic_about_privacy))
+        }
+
+    override val titleStringId get() = R.string.about_title
+
     companion object {
         fun newInstance() = AboutFragment()
     }
 
-    override val titleStringId: Int
-        get() = R.string.about_title
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        presenter.onAttachView(this)
+        return inflater.inflate(R.layout.fragment_about, container, false)
-        return Bundle().apply {
-            putSerializable("data", LibsBuilder()
-                .withAboutAppName(getString(R.string.app_name))
-                .withAboutVersionShown(true)
-                .withAboutIconShown(true)
-                .withLicenseShown(true)
-                .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", "Jsoup", "Retrofit", "okio",
-                    "Butterknife", "CircleImageView")
-                .withOnExtraListener { presenter.onExtraSelect(it) })
-        }.let {
-            fragmentCompat.onCreateView(inflater.context, inflater, container, savedInstanceState, it)
-        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fragmentCompat.onViewCreated(view, savedInstanceState)
+        presenter.onAttachView(this)
     }
 
-    override fun openDiscordInviteView() {
+    override fun initView() {
+        aboutAdapter.setOnItemClickListener(presenter::onItemSelected)
+
+        with(aboutRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = aboutAdapter
+        }
+    }
+
+    override fun updateData(header: AboutScrollableHeader, items: List<AboutItem>) {
+        with(aboutAdapter) {
+            removeAllScrollableHeaders()
+            addScrollableHeader(header)
+            updateDataSet(items)
+        }
+    }
+
+    override fun openDiscordInvite() {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openHomepageWebView() {
+    override fun openHomepage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
     }
 
-    override fun openEmailClientView() {
+    override fun openEmailClient() {
-        val intent = Intent(Intent.ACTION_SENDTO).apply {
+        val intent = Intent(ACTION_SENDTO)
+            .apply {
                 data = Uri.parse("mailto:")
-            putExtra(Intent.EXTRA_EMAIL, Array(1) { "wulkanowyinc@gmail.com" })
+                putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
-            putExtra(Intent.EXTRA_SUBJECT, "Zgłoszenie błędu")
+                putExtra(EXTRA_SUBJECT, "Zgłoszenie błędu")
-            putExtra(Intent.EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n" + "-".repeat(40) + "\n" + """
+                putExtra(EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n${"-".repeat(40)}\n " +
+                    """
                         Build: ${appInfo.versionCode}
                         SDK: ${appInfo.systemVersion}
                         Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
@@ -89,8 +130,15 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         }
     }
 
+    override fun openLicenses() {
+        (activity as? MainActivity)?.pushView(LicenseFragment.newInstance())
+    }
+
+    override fun openPrivacyPolicy() {
+        context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
+    }
+
     override fun onDestroyView() {
-        fragmentCompat.onDestroyView()
         presenter.onDetachView()
         super.onDestroyView()
     }

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

@@ -0,0 +1,56 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_about.*
+
+class AboutItem(
+    val title: String,
+    private val summary: String,
+    private val image: Drawable?
+) : AbstractFlexibleItem<AboutItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            aboutItemImage.setImageDrawable(image)
+            aboutItemTitle.text = title
+            aboutItemSummary.text = summary
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as AboutItem
+
+        if (title != other.title) return false
+        if (summary != other.summary) return false
+        if (image != other.image) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = title.hashCode()
+        result = 31 * result + summary.hashCode()
+        result = 31 * result + (image?.hashCode() ?: 0)
+        return result
+    }
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}

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

@@ -1,14 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import com.mikepenz.aboutlibraries.LibsFragmentCompat
-import dagger.Module
-import dagger.Provides
-import io.github.wulkanowy.di.scopes.PerFragment
-
-@Module
-class AboutModule {
-
-    @PerFragment
-    @Provides
-    fun provideLibsFragmentCompat() = LibsFragmentCompat()
-}

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

@@ -1,9 +1,6 @@
 package io.github.wulkanowy.ui.modules.about
 
-import com.mikepenz.aboutlibraries.Libs
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL1
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL2
-import com.mikepenz.aboutlibraries.Libs.SpecialButton.SPECIAL3
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -21,28 +18,53 @@ class AboutPresenter @Inject constructor(
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
+        view.initView()
         Timber.i("About view was initialized")
+        loadData()
     }
 
-    fun onExtraSelect(type: Libs.SpecialButton?) {
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is AboutItem) return
         view?.run {
-            when (type) {
+            when (item.title) {
-                SPECIAL1 -> {
+                feedbackRes?.first -> {
-                    Timber.i("Opening discord invide page")
+                    Timber.i("Opening email client ")
-                    analytics.logEvent("open_page", "name" to "discord")
+                    openEmailClient()
-                    openDiscordInviteView()
+                    analytics.logEvent("about_open", "name" to "feedback")
                 }
-                SPECIAL2 -> {
+                discordRes?.first -> {
-                    Timber.i("Opening home page")
+                    Timber.i("Opening discord")
-                    analytics.logEvent("open_page", "name" to "home")
+                    openDiscordInvite()
-                    openHomepageWebView()
+                    analytics.logEvent("about_open", "name" to "discord")
                 }
-                SPECIAL3 -> {
+                homepageRes?.first -> {
-                    Timber.i("Opening email client")
+                    Timber.i("Opening homepage")
-                    analytics.logEvent("open_page", "name" to "email")
+                    openHomepage()
-                    openEmailClientView()
+                    analytics.logEvent("about_open", "name" to "homepage")
+                }
+                licensesRes?.first -> {
+                    Timber.i("Opening licenses view")
+                    openLicenses()
+                    analytics.logEvent("about_open", "name" to "licenses")
+                }
+                privacyRes?.first -> {
+                    Timber.i("Opening privacy page ")
+                    openPrivacyPolicy()
+                    analytics.logEvent("about_open", "name" to "privacy")
                 }
             }
         }
     }
+
+    private fun loadData() {
+        view?.run {
+            updateData(AboutScrollableHeader(), listOfNotNull(
+                versionRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                feedbackRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                discordRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                homepageRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                licensesRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
+                privacyRes?.let { (title, summary, image) -> AboutItem(title, summary, image) }))
+        }
+    }
 }

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

@@ -0,0 +1,41 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.view.View
+import androidx.core.content.res.ResourcesCompat
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.scrollable_header_about.*
+
+class AboutScrollableHeader : AbstractFlexibleItem<AboutScrollableHeader.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.scrollable_header_about
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            val context = contentView.context
+            val drawable = ResourcesCompat.getDrawableForDensity(context.resources, context.applicationInfo.icon, 640, null)
+
+            aboutScrollableHeaderIcon.setImageDrawable(drawable)
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return true
+    }
+
+    override fun hashCode() = javaClass.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}

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

@@ -1,12 +1,33 @@
 package io.github.wulkanowy.ui.modules.about
 
+import android.graphics.drawable.Drawable
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AboutView : BaseView {
 
-    fun openDiscordInviteView()
+    val versionRes: Triple<String, String, Drawable?>?
 
-    fun openEmailClientView()
+    val feedbackRes: Triple<String, String, Drawable?>?
 
-    fun openHomepageWebView()
+    val discordRes: Triple<String, String, Drawable?>?
+
+    val homepageRes: Triple<String, String, Drawable?>?
+
+    val licensesRes: Triple<String, String, Drawable?>?
+
+    val privacyRes: Triple<String, String, Drawable?>?
+
+    fun initView()
+
+    fun updateData(header: AboutScrollableHeader, items: List<AboutItem>)
+
+    fun openDiscordInvite()
+
+    fun openEmailClient()
+
+    fun openHomepage()
+
+    fun openLicenses()
+
+    fun openPrivacyPolicy()
 }

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

@@ -0,0 +1,86 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.text.parseAsHtml
+import com.mikepenz.aboutlibraries.Libs
+import com.mikepenz.aboutlibraries.entity.Library
+import dagger.Lazy
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.setOnItemClickListener
+import kotlinx.android.synthetic.main.fragment_license.*
+import javax.inject.Inject
+
+class LicenseFragment : BaseFragment(), LicenseView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LicensePresenter
+
+    @Inject
+    lateinit var licenseAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+
+    @Inject
+    lateinit var libs: Lazy<Libs>
+
+    override val titleStringId get() = R.string.license_title
+
+    override val appLibraries: ArrayList<Library>?
+        get() = context?.let {
+            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+        }
+
+    companion object {
+        fun newInstance() = LicenseFragment()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_license, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(licenseRecycler) {
+            layoutManager = SmoothScrollLinearLayoutManager(context)
+            adapter = licenseAdapter
+        }
+        licenseAdapter.setOnItemClickListener(presenter::onItemSelected)
+    }
+
+    override fun updateData(data: List<LicenseItem>) {
+        licenseAdapter.updateDataSet(data)
+    }
+
+    override fun openLicense(licenseHtml: String) {
+        context?.let {
+            AlertDialog.Builder(it).apply {
+                setTitle(R.string.license_dialog_title)
+                setMessage(licenseHtml.parseAsHtml())
+                setPositiveButton(android.R.string.ok) { _, _ -> }
+                show()
+            }
+        }
+    }
+
+    override fun showProgress(show: Boolean) {
+        licenseProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}

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

@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.view.View
+import com.mikepenz.aboutlibraries.entity.Library
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
+import io.github.wulkanowy.R
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.main.item_license.*
+
+class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewHolder>() {
+
+    override fun getLayoutRes() = R.layout.item_license
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
+        with(holder) {
+            licenseItemName.text = library.libraryName
+            licenseItemSummary.text = library.license?.licenseName
+        }
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as LicenseItem
+
+        if (library != other.library) return false
+
+        return true
+    }
+
+    override fun hashCode() = library.hashCode()
+
+    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
+        LayoutContainer {
+
+        override val containerView: View? get() = contentView
+    }
+}

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.content.Context
+import com.mikepenz.aboutlibraries.Libs
+import dagger.Module
+import dagger.Provides
+import io.github.wulkanowy.di.scopes.PerFragment
+
+@Module
+class LicenseModule {
+
+    @PerFragment
+    @Provides
+    fun provideLibs(context: Context) = Libs(context)
+}

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

@@ -0,0 +1,40 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
+import javax.inject.Inject
+
+class LicensePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository
+) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
+
+    override fun onAttachView(view: LicenseView) {
+        super.onAttachView(view)
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelected(item: AbstractFlexibleItem<*>) {
+        if (item !is LicenseItem) return
+        view?.run { item.library.license?.licenseDescription?.let { openLicense(it) } }
+    }
+
+    private fun loadData() {
+        disposable.add(Single.fromCallable { view?.appLibraries }
+            .map {
+                val exclude = listOf("Android-Iconics", "CircleImageView", "FastAdapter", "Jsoup", "okio", "Retrofit")
+                it.filter { library -> !exclude.contains(library.libraryName) }
+            }
+            .map { it.map { library -> LicenseItem(library) } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnEvent { _, _ -> view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
+    }
+}

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

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import com.mikepenz.aboutlibraries.entity.Library
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LicenseView : BaseView {
+
+    val appLibraries: ArrayList<Library>?
+
+    fun initView()
+
+    fun updateData(data: List<LicenseItem>)
+
+    fun openLicense(licenseHtml: String)
+
+    fun showProgress(show: Boolean)
+}

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

@@ -1,13 +1,16 @@
 package io.github.wulkanowy.ui.modules.account
 
 import android.annotation.SuppressLint
+import android.graphics.PorterDuff
 import android.view.View
+import androidx.core.graphics.ColorUtils
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_account.*
 
@@ -15,16 +18,19 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
 
     override fun getLayoutRes() = R.layout.item_account
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-        return ViewHolder(view, adapter)
-    }
 
     @SuppressLint("SetTextI18n")
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
+        val context = holder.contentView.context
+
+        val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
             accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (student.isCurrent) R.drawable.ic_account_circular_border else 0)
+            accountItemImage.setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
         }
     }
 
@@ -45,8 +51,9 @@ class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewH
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        override val containerView: View
+        LayoutContainer {
-            get() = contentView
+
+        override val containerView: View? get() = contentView
     }
 }

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

@@ -17,11 +17,13 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_attendance.*
 import javax.inject.Inject
 
-class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView, MainView.TitledView {
+class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendancePresenter
@@ -35,14 +37,11 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         fun newInstance() = AttendanceFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.attendance_title
-        get() = R.string.attendance_title
 
-    override val isViewEmpty: Boolean
+    override val isViewEmpty get() = attendanceAdapter.isEmpty
-        get() = attendanceAdapter.isEmpty
 
-    override val currentStackSize: Int?
+    override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
-        get() = (activity as? MainActivity)?.currentStackSize
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -60,21 +59,21 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
     }
 
     override fun initView() {
-        attendanceAdapter.apply {
+        attendanceAdapter.setOnItemClickListener(presenter::onAttendanceItemSelected)
-            setOnItemClickListener { presenter.onAttendanceItemSelected(it) }
-        }
 
-        attendanceRecycler.run {
+        with(attendanceRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceAdapter
             addItemDecoration(FlexibleItemDecoration(context)
                 .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
+                .withDrawDividerOnLastItem(false))
-            )
         }
-        attendanceSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+
+        attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {

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

@@ -8,7 +8,13 @@ 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.*
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousOrSameSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
@@ -26,6 +32,8 @@ class AttendancePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().previousOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -33,7 +41,8 @@ class AttendancePresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Attendance view was initialized")
-        loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -56,7 +65,7 @@ class AttendancePresenter @Inject constructor(
         Timber.i("Attendance view is reselected")
         view?.also { view ->
             if (view.currentStackSize == 1) {
-                now().previousOrSameSchoolDay.also {
+                baseDate.also {
                     if (currentDate != it) {
                         loadData(it)
                         reloadView()
@@ -78,6 +87,20 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
         currentDate = date
@@ -127,8 +150,14 @@ class AttendancePresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
+            showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }

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

@@ -15,6 +15,7 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject
@@ -35,11 +36,9 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
         fun newInstance() = AttendanceSummaryFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.attendance_title
-        get() = R.string.attendance_title
 
-    override val isViewEmpty
+    override val isViewEmpty get() = attendanceSummaryAdapter.isEmpty
-        get() = attendanceSummaryAdapter.isEmpty
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_attendance_summary, container, false)
@@ -52,25 +51,26 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     }
 
     override fun initView() {
-        attendanceSummaryRecycler.run {
+        with(attendanceSummaryRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = attendanceSummaryAdapter
         }
-        attendanceSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
 
-        context?.let {
+        attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
+
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
+
+        with(attendanceSummarySubjects) {
+            adapter = subjectsAdapter
+            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        attendanceSummarySubjects.run {
+        attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
-            adapter = subjectsAdapter
-            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
-        }
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
-        subjectsAdapter.run {
+        with(subjectsAdapter) {
             clear()
             addAll(data)
             notifyDataSetChanged()
@@ -78,9 +78,9 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     }
 
     override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
-        attendanceSummaryAdapter.apply {
+        with(attendanceSummaryAdapter) {
             updateDataSet(data, true)
-            removeAllScrollableHeaders()
+            removeAllScrollableFooters()
             addScrollableHeader(header)
         }
     }

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

@@ -46,7 +46,7 @@ class AttendanceSummaryPresenter @Inject constructor(
         loadData(currentSubjectId, true)
     }
 
-    fun onSubjectSelected(name: String) {
+    fun onSubjectSelected(name: String?) {
         Timber.i("Select attendance summary subject $name")
         view?.run {
             showContent(false)

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

@@ -16,6 +16,7 @@ import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject
@@ -34,11 +35,9 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
         fun newInstance() = ExamFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.exam_title
-        get() = R.string.exam_title
 
-    override val isViewEmpty: Boolean
+    override val isViewEmpty get() = examAdapter.isEmpty
-        get() = examAdapter.isEmpty
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_exam, container, false)
@@ -51,20 +50,21 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
     }
 
     override fun initView() {
-        examAdapter.run {
+        examAdapter.setOnItemClickListener(presenter::onExamItemSelected)
-            setOnItemClickListener { presenter.onExamItemSelected(it) }
+
-        }
+        with(examRecycler) {
-        examRecycler.run {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = examAdapter
             addItemDecoration(FlexibleItemDecoration(context)
                 .withDefaultDivider(R.layout.item_exam)
-                .withDrawDividerOnLastItem(false)
+                .withDrawDividerOnLastItem(false))
-            )
         }
-        examSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
         examNextButton.setOnClickListener { presenter.onNextWeek() }
+
+        examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun hideRefresh() {

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

@@ -10,6 +10,7 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
@@ -30,6 +31,8 @@ class ExamPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -37,7 +40,8 @@ class ExamPresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Exam view was initialized")
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -65,7 +69,7 @@ class ExamPresenter @Inject constructor(
 
     fun onViewReselected() {
         Timber.i("Exam view is reselected")
-        now().nextOrSameSchoolDay.also {
+        baseDate.also {
             if (currentDate != it) {
                 loadData(it)
                 reloadView()
@@ -73,6 +77,20 @@ class ExamPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading exam data started")
         currentDate = date
@@ -81,9 +99,8 @@ class ExamPresenter @Inject constructor(
             add(studentRepository.getCurrentStudent()
                 .delay(200, MILLISECONDS)
                 .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap {
+                .flatMap { examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh) }
-                    examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh)
+                .map { it.groupBy { exam -> exam.date }.toSortedMap() }
-                }.map { it.groupBy { exam -> exam.date }.toSortedMap() }
                 .map { createExamItems(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -126,6 +143,12 @@ class ExamPresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +

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

@@ -17,6 +17,7 @@ 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.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
@@ -37,11 +38,9 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
         fun newInstance() = GradeFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.grade_title
-        get() = R.string.grade_title
 
-    override val currentPageIndex: Int
+    override val currentPageIndex get() = gradeViewPager.currentItem
-        get() = gradeViewPager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -64,7 +63,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun initView() {
-        pagerAdapter.apply {
+        with(pagerAdapter) {
             containerId = gradeViewPager.id
             addFragmentsWithTitle(mapOf(
                 GradeDetailsFragment.newInstance() to getString(R.string.all_details),
@@ -73,13 +72,18 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             ))
         }
 
-        gradeViewPager.run {
+        with(gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener(presenter::onPageSelected)
         }
-        gradeTabLayout.setupWithViewPager(gradeViewPager)
+
-        gradeSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        with(gradeTabLayout) {
+            setupWithViewPager(gradeViewPager)
+            setElevationCompat(context.dpToPx(4f))
+        }
+
+        gradeSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -117,11 +121,13 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun showSemesterDialog(selectedIndex: Int) {
-        arrayOf(getString(R.string.grade_semester, 1),
+        val choices = arrayOf(
-            getString(R.string.grade_semester, 2)).also { array ->
+            getString(R.string.grade_semester, 1),
-            context?.let {
+            getString(R.string.grade_semester, 2)
-                AlertDialog.Builder(it)
+        )
-                    .setSingleChoiceItems(array, selectedIndex) { dialog, which ->
+
+        AlertDialog.Builder(requireContext())
+            .setSingleChoiceItems(choices, selectedIndex) { dialog, which ->
                 presenter.onSemesterSelected(which)
                 dialog.dismiss()
             }
@@ -129,8 +135,6 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .show()
     }
-        }
-    }
 
     fun onChildRefresh() {
         presenter.onChildViewRefresh()

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

@@ -10,6 +10,7 @@ import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
 import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
 import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 
+@Suppress("unused")
 @Module
 abstract class GradeModule {
 

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

@@ -19,6 +19,7 @@ import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import kotlinx.android.synthetic.main.fragment_grade_statistics.*
@@ -37,8 +38,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isViewEmpty
+    override val isViewEmpty get() = gradeStatisticsChart.isEmpty
-        get() = gradeStatisticsChart.isEmpty
 
     private lateinit var gradeColors: List<Pair<Int, Int>>
 
@@ -75,32 +75,30 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     }
 
     override fun initView() {
-        gradeStatisticsChart.run {
+        with(gradeStatisticsChart) {
             description.isEnabled = false
             setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
             setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
             animateXY(1000, 1000)
             minAngleForSlices = 25f
-            legend.apply {
+            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-            }
         }
 
-        context?.let {
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
-            subjectsAdapter = ArrayAdapter(it, android.R.layout.simple_spinner_item, ArrayList<String>())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
-        }
 
-        gradeStatisticsSubjects.run {
+        with(gradeStatisticsSubjects) {
             adapter = subjectsAdapter
-            setOnItemSelectedListener { presenter.onSubjectSelected((it as TextView).text.toString()) }
+            setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        gradeStatisticsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+
+        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
-        subjectsAdapter.run {
+        with(subjectsAdapter) {
             clear()
             addAll(data)
             notifyDataSetChanged()
@@ -204,7 +202,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putBoolean(GradeStatisticsFragment.SAVED_CHART_TYPE, presenter.currentIsSemester)
+        outState.putBoolean(SAVED_CHART_TYPE, presenter.currentIsSemester)
     }
 
     override fun onDestroyView() {

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

@@ -62,7 +62,7 @@ class GradeStatisticsPresenter @Inject constructor(
         view?.notifyParentRefresh()
     }
 
-    fun onSubjectSelected(name: String) {
+    fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
         view?.run {
             showContent(false)
@@ -71,8 +71,8 @@ class GradeStatisticsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        (subjects.singleOrNull { it.name == name }?.name).let {
+        (subjects.singleOrNull { it.name == name }?.name)?.let {
-            if (it != currentSubjectName) loadData(currentSemesterId, name, currentIsSemester)
+            if (it != currentSubjectName) loadData(currentSemesterId, it, currentIsSemester)
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt

@@ -13,6 +13,7 @@ import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_homework.*
 import javax.inject.Inject
@@ -31,8 +32,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
         fun newInstance() = HomeworkFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.homework_title
-        get() = R.string.homework_title
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_homework, container, false)
@@ -45,21 +45,21 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
     }
 
     override fun initView() {
-        homeworkAdapter.run {
+        homeworkAdapter.setOnItemClickListener(presenter::onHomeworkItemSelected)
-            setOnItemClickListener { presenter.onHomeworkItemSelected(it) }
-        }
 
-        homeworkRecycler.run {
+        with(homeworkRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = homeworkAdapter
             addItemDecoration(FlexibleItemDecoration(context)
                 .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
+                .withDrawDividerOnLastItem(false))
-            )
         }
-        homeworkSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
         homeworkNextButton.setOnClickListener { presenter.onNextDay() }
+
+        homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun updateData(data: List<HomeworkItem>) {
@@ -110,7 +110,7 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(HomeworkFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
     }
 
     override fun onDestroyView() {

app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt

@@ -10,11 +10,13 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -28,6 +30,8 @@ class HomeworkPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -35,7 +39,8 @@ class HomeworkPresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Homework view was initialized")
-        loadData(LocalDate.ofEpochDay(date ?: LocalDate.now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -61,6 +66,20 @@ class HomeworkPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading homework data started")
         currentDate = date
@@ -113,8 +132,14 @@ class HomeworkPresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(7).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(7).isHolidays)
+            showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
                 currentDate.friday.toFormattedString("dd.MM"))
         }

app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt

@@ -28,5 +28,6 @@ class LoginErrorHandler @Inject constructor(
     override fun clear() {
         super.clear()
         onBadCredentials = {}
+        onStudentDuplicate = {}
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt

@@ -10,6 +10,7 @@ import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
 
+@Suppress("unused")
 @Module
 internal abstract class LoginModule {
 

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
+import androidx.core.widget.doOnTextChanged
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -17,8 +18,6 @@ import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openInternetBrowser
-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
@@ -35,14 +34,15 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         fun newInstance() = LoginFormFragment()
     }
 
-    override val formNameValue: String
+    override val formNameValue get() = loginFormName.text.toString()
-        get() = loginFormName.text.toString()
 
-    override val formPassValue: String
+    override val formPassValue get() = loginFormPass.text.toString()
-        get() = loginFormPass.text.toString()
 
-    override val formHostValue: String?
+    override val formHostValue get() = hostValues[(hostKeys.indexOf(loginFormHost.text.toString()))]
-        get() = resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+
+    private lateinit var hostKeys: Array<String>
+
+    private lateinit var hostValues: Array<String>
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_login_form, container, false)
@@ -54,9 +54,12 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun initView() {
-        loginFormName.setOnTextChangedListener { presenter.onNameTextChanged() }
+        hostKeys = resources.getStringArray(R.array.endpoints_keys)
-        loginFormPass.setOnTextChangedListener { presenter.onPassTextChanged() }
+        hostValues = resources.getStringArray(R.array.endpoints_values)
-        loginFormHost.setOnItemSelectedListener { presenter.onHostSelected() }
+
+        loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
         loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
         loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
 
@@ -64,40 +67,44 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
             if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
         }
 
-        context?.let {
+        with(loginFormHost) {
-            loginFormHost.adapter = ArrayAdapter.createFromResource(it, R.array.endpoints_keys, android.R.layout.simple_spinner_item)
+            //Bug with filter in ExposedDropdownMenu on restoring state
-                .apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
+            isSaveEnabled = false
+
+            setText(hostKeys.getOrElse(0) { "" })
+            setAdapter(ArrayAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            keyListener = null
         }
     }
 
-    override fun setDefaultCredentials(name: String, pass: String) {
+    override fun setCredentials(name: String, pass: String) {
         loginFormName.setText(name)
         loginFormPass.setText(pass)
     }
 
     override fun setErrorNameRequired() {
-        loginFormNameLayout.run {
+        with(loginFormNameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
-        loginFormPassLayout.run {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        loginFormPassLayout.run {
+        with(loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        loginFormPassLayout.run {
+        with(loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
@@ -129,7 +136,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
 
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
-        loginFormVersion.apply {
+        with(loginFormVersion) {
             visibility = VISIBLE
             text = "${getString(R.string.app_name)} ${appInfo.versionName}"
         }
@@ -140,10 +147,11 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun notifyParentAccountLogged(students: List<Student>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students,
+            Triple(
                 loginFormName.text.toString(),
                 loginFormPass.text.toString(),
-            resources.getStringArray(R.array.endpoints_values)[loginFormHost.selectedItemPosition]
+                formHostValue
             ))
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt

@@ -40,7 +40,7 @@ class LoginFormPresenter @Inject constructor(
         view?.apply {
             clearPassError()
             clearNameError()
-            if (formHostValue?.contains("fakelog") == true) setDefaultCredentials("jan@fakelog.cf", "jan123")
+            if (formHostValue.contains("fakelog")) setCredentials("jan@fakelog.cf", "jan123")
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt

@@ -11,9 +11,9 @@ interface LoginFormView : BaseView {
 
     val formPassValue: String
 
-    val formHostValue: String?
+    val formHostValue: String
 
-    fun setDefaultCredentials(name: String, pass: String)
+    fun setCredentials(name: String, pass: String)
 
     fun setErrorNameRequired()
 

app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt

@@ -48,7 +48,7 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
             get() = itemView
 
         init {
-            loginItemCheck.setOnClickListener { super.onClick(loginItemContainer) }
+            loginItemCheck.keyListener = null
         }
 
         override fun onClick(view: View?) {

app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt

@@ -9,12 +9,12 @@ import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
+import androidx.core.widget.doOnTextChanged
 import 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
@@ -45,7 +45,7 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     override fun initView() {
         loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
 
-        loginSymbolName.setOnTextChangedListener { presenter.onSymbolTextChanged() }
+        loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
         loginSymbolName.apply {
             setOnEditorActionListener { _, id, _ ->

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt

@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.modules.luckynumberwidget
 
 import android.annotation.SuppressLint
 import android.view.View
+import androidx.core.graphics.ColorUtils
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IFlexible
@@ -9,6 +10,7 @@ import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
+import io.github.wulkanowy.utils.getThemeAttrColor
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_account.*
 
@@ -17,16 +19,19 @@ class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolea
 
     override fun getLayoutRes() = R.layout.item_account
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-        return ViewHolder(view, adapter)
-    }
 
     @SuppressLint("SetTextI18n")
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.apply {
+        val context = holder.contentView.context
+
+        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
             accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
+            accountItemImage.setColorFilter(colorImage)
         }
     }
 
@@ -47,8 +52,9 @@ class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolea
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        override val containerView: View
+        LayoutContainer {
-            get() = contentView
+
+        override val containerView: View? get() = contentView
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt

@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -14,7 +14,7 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val sharedPref: SharedPrefHelper
+    private val sharedPref: SharedPrefProvider
 ) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt

@@ -21,13 +21,14 @@ import android.view.View.VISIBLE
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.reactivex.Maybe
 import timber.log.Timber
@@ -51,7 +52,7 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
     lateinit var appWidgetManager: AppWidgetManager
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     companion object {
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
@@ -74,8 +75,8 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
                     getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)?.luckyNumber?.toString() ?: "#"
                 )
                 setOnClickPendingIntent(R.id.luckyNumberWidgetContainer,
-                    PendingIntent.getActivity(context, MenuView.LUCKY_NUMBER.id,
+                    PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
-                        MainActivity.getStartIntent(context, MenuView.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
+                        MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
             }.also {
                 setStyles(it, intent)
                 appWidgetManager.updateAppWidget(appWidgetId, it)
@@ -114,7 +115,9 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
         } catch (e: Exception) {
+            if (e.cause !is NoCurrentStudentException) {
                 Timber.e(e, "An error has occurred in lucky number provider")
+            }
             null
         }
     }

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

@@ -4,16 +4,21 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
 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.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
+import dagger.Lazy
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
@@ -26,8 +31,9 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.safelyPopFragment
+import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
 import kotlinx.android.synthetic.main.activity_main.*
 import javax.inject.Inject
@@ -40,10 +46,13 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     @Inject
     lateinit var navController: FragNavController
 
+    @Inject
+    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
+
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
 
-        fun getStartIntent(context: Context, startMenu: MainView.MenuView? = null, clear: Boolean = false): Intent {
+        fun getStartIntent(context: Context, startMenu: MainView.Section? = null, clear: Boolean = false): Intent {
             return Intent(context, MainActivity::class.java)
                 .apply {
                     if (clear) flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
@@ -52,24 +61,21 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         }
     }
 
-    override val isRootView: Boolean
+    override val isRootView get() = navController.isRootFragment
-        get() = navController.isRootFragment
 
-    override val currentViewTitle: String?
+    override val currentStackSize get() = navController.currentStack?.size
-        get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
 
-    override val currentStackSize: Int?
+    override val currentViewTitle get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
-        get() = navController.currentStack?.size
 
     override var startMenuIndex = 0
 
     override var startMenuMoreIndex = -1
 
-    private val moreMenuFragments = listOf<Fragment>(
+    private val moreMenuFragments = mapOf<Int, Fragment>(
-        MessageFragment.newInstance(),
+        MainView.Section.MESSAGE.id to MessageFragment.newInstance(),
-        HomeworkFragment.newInstance(),
+        MainView.Section.HOMEWORK.id to HomeworkFragment.newInstance(),
-        NoteFragment.newInstance(),
+        MainView.Section.NOTE.id to NoteFragment.newInstance(),
-        LuckyNumberFragment.newInstance()
+        MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance()
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -78,11 +84,11 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         setSupportActionBar(mainToolbar)
         messageContainer = mainFragmentContainer
 
-        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.MenuView)
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
 
-        navController.run {
+        with(navController) {
             initialize(startMenuIndex, savedInstanceState)
-            pushFragment(moreMenuFragments.getOrNull(startMenuMoreIndex))
+            pushFragment(moreMenuFragments[startMenuMoreIndex])
         }
     }
 
@@ -92,30 +98,31 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     }
 
     override fun initView() {
-        mainBottomNav.run {
+        with(mainToolbar) {
-            addItems(
+            if (SDK_INT >= LOLLIPOP) stateListAnimator = null
-                listOf(
+            setBackgroundColor(overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(4f)))
-                    AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_menu_main_grade_26dp, 0),
+        }
-                    AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_menu_main_attendance_24dp, 0),
+
-                    AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_menu_main_exam_24dp, 0),
+        with(mainBottomNav) {
-                    AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_menu_main_timetable_24dp, 0),
+            addItems(listOf(
-                    AHBottomNavigationItem(R.string.more_title, R.drawable.ic_menu_main_more_24dp, 0)
+                AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
-                )
+                AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_main_attendance, 0),
-            )
+                AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0),
-            accentColor = ContextCompat.getColor(context, R.color.colorPrimary)
+                AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_main_timetable, 0),
-            inactiveColor = getThemeAttrColor(android.R.attr.textColorSecondary)
+                AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
-            defaultBackgroundColor = getThemeAttrColor(R.attr.bottomNavBackground)
+            ))
+            accentColor = getThemeAttrColor(R.attr.colorPrimary)
+            inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153)
+            defaultBackgroundColor = overlayProvider.get().getSurfaceColorWithOverlayIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
             setTitleTextSizeInSp(10f, 10f)
-            setOnTabSelectedListener { position, wasSelected ->
+            setOnTabSelectedListener(presenter::onTabSelected)
-                presenter.onTabSelected(position, wasSelected)
-            }
         }
 
-        navController.run {
+        with(navController) {
-            setOnViewChangeListener { presenter.onViewChange() }
+            setOnViewChangeListener(presenter::onViewChange)
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
                 GradeFragment.newInstance(),
@@ -152,6 +159,10 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         navController.showDialogFragment(AccountDialog.newInstance())
     }
 
+    override fun showActionBarElevation(show: Boolean) {
+        ViewCompat.setElevation(mainToolbar, if (show) dpToPx(4f) else 0f)
+    }
+
     override fun notifyMenuViewReselected() {
         (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentReselected()
     }
@@ -164,8 +175,8 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         navController.pushFragment(fragment)
     }
 
-    override fun popView() {
+    override fun popView(depth: Int) {
-        navController.safelyPopFragment()
+        navController.safelyPopFragments(depth)
     }
 
     override fun onBackPressed() {

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

@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.main
 
+import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import dagger.Module
 import dagger.Provides
@@ -7,7 +8,8 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
-import io.github.wulkanowy.ui.modules.about.AboutModule
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseModule
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
@@ -19,15 +21,16 @@ import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.MessageModule
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceModule
+import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 
+@Suppress("unused")
 @Module
 abstract class MainModule {
 
@@ -39,6 +42,11 @@ abstract class MainModule {
         fun provideFragNavController(activity: MainActivity): FragNavController {
             return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
         }
+
+        //In activities must be injected as Lazy
+        @JvmStatic
+        @Provides
+        fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
     }
 
     @PerFragment
@@ -74,7 +82,7 @@ abstract class MainModule {
     abstract fun bindTimetableFragment(): TimetableFragment
 
     @PerFragment
-    @ContributesAndroidInjector(modules = [AboutModule::class])
+    @ContributesAndroidInjector
     abstract fun bindAboutFragment(): AboutFragment
 
     @PerFragment
@@ -108,4 +116,8 @@ abstract class MainModule {
     @PerFragment
     @ContributesAndroidInjector
     abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [LicenseModule::class])
+    abstract fun bindLicenseFragment(): LicenseFragment
 }

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

@@ -5,6 +5,8 @@ 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.ui.modules.main.MainView.Section.GRADE
+import io.github.wulkanowy.ui.modules.main.MainView.Section.MESSAGE
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
@@ -19,7 +21,7 @@ class MainPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
 
-    fun onAttachView(view: MainView, initMenu: MainView.MenuView?) {
+    fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
         view.apply {
             getProperViewIndexes(initMenu).let { (main, more) ->
@@ -34,8 +36,9 @@ class MainPresenter @Inject constructor(
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onViewChange() {
+    fun onViewChange(section: MainView.Section?) {
         view?.apply {
+            showActionBarElevation(section != GRADE && section != MESSAGE)
             currentViewTitle?.let { setViewTitle(it) }
             currentStackSize?.let {
                 if (it > 1) showHomeArrow(true)
@@ -77,10 +80,10 @@ class MainPresenter @Inject constructor(
         } == true
     }
 
-    private fun getProperViewIndexes(initMenu: MainView.MenuView?): Pair<Int, Int> {
+    private fun getProperViewIndexes(initMenu: MainView.Section?): Pair<Int, Int> {
-        return when {
+        return when (initMenu?.id) {
-            initMenu?.id in 0..3 -> initMenu!!.id to -1
+            in 0..3 -> initMenu!!.id to -1
-            (initMenu?.id ?: 0) > 3 -> 4 to initMenu!!.id - 4
+            in 4..10 -> 4 to initMenu!!.id
             else -> prefRepository.startMenuIndex to -1
         }
     }

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

@@ -22,11 +22,13 @@ interface MainView : BaseView {
 
     fun showAccountPicker()
 
+    fun showActionBarElevation(show: Boolean)
+
     fun notifyMenuViewReselected()
 
     fun setViewTitle(title: String)
 
-    fun popView()
+    fun popView(depth: Int = 1)
 
     interface MainChildView {
 
@@ -38,14 +40,17 @@ interface MainView : BaseView {
         val titleStringId: Int
     }
 
-    enum class MenuView(val id: Int) {
+    enum class Section(val id: Int) {
         GRADE(0),
         ATTENDANCE(1),
         EXAM(2),
         TIMETABLE(3),
-        MESSAGE(4),
+        MORE(4),
-        HOMEWORK(5),
+        MESSAGE(5),
-        NOTE(6),
+        HOMEWORK(6),
-        LUCKY_NUMBER(7),
+        NOTE(7),
+        LUCKY_NUMBER(8),
+        SETTINGS(9),
+        ABOUT(10)
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt

@@ -16,6 +16,7 @@ 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.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import kotlinx.android.synthetic.main.fragment_message.*
 import javax.inject.Inject
@@ -32,11 +33,9 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
         fun newInstance() = MessageFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.message_title
-        get() = R.string.message_title
 
-    override val currentPageIndex: Int
+    override val currentPageIndex get() = messageViewPager.currentItem
-        get() = messageViewPager.currentItem
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_message, container, false)
@@ -48,7 +47,7 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
     }
 
     override fun initView() {
-        pagerAdapter.apply {
+        with(pagerAdapter) {
             containerId = messageViewPager.id
             addFragmentsWithTitle(mapOf(
                 MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
@@ -57,12 +56,16 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
             ))
         }
 
-        messageViewPager.run {
+        with(messageViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
-            setOnSelectPageListener { presenter.onPageSelected(it) }
+            setOnSelectPageListener(presenter::onPageSelected)
+        }
+
+        with(messageTabLayout) {
+            setupWithViewPager(messageViewPager)
+            setElevationCompat(context.dpToPx(4f))
         }
-        messageTabLayout.setupWithViewPager(messageViewPager)
 
         openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt

@@ -8,6 +8,7 @@ import io.github.wulkanowy.di.scopes.PerFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 
+@Suppress("unused")
 @Module
 abstract class MessageModule {
 

app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChip.kt

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

app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.ui.modules.message.send
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.materialchipsinput.ChipItem
+
+data class RecipientChipItem(
+
+    override val title: String,
+
+    override val summary: String,
+
+    val recipient: Recipient
+
+) : ChipItem

app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt

@@ -2,18 +2,20 @@ package io.github.wulkanowy.ui.modules.message.send
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Rect
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.TouchDelegate
 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.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
 import kotlinx.android.synthetic.main.activity_send_message.*
@@ -38,14 +40,18 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         }
     }
 
-    override val formRecipientsData: List<Recipient>
+    override val isDropdownListVisible: Boolean
-        get() = (sendMessageRecipientsInput.selectedChipList).map { (it as RecipientChip).recipient }
+        get() = sendMessageTo.isDropdownListVisible
+
+    @Suppress("UNCHECKED_CAST")
+    override val formRecipientsData: List<RecipientChipItem>
+        get() = sendMessageTo.addedChipItems as List<RecipientChipItem>
 
     override val formSubjectValue: String
-        get() = sendMessageSubjectInput.text.toString()
+        get() = sendMessageSubject.text.toString()
 
     override val formContentValue: String
-        get() = sendMessageContentInput.text.toString()
+        get() = sendMessageMessageContent.text.toString()
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -66,6 +72,12 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
+    override fun initView() {
+        setUpExtendedHitArea()
+        sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+        sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.action_menu_send_message, menu)
         return true
@@ -81,15 +93,15 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setReportingUnit(unit: ReportingUnit) {
-        sendMessageFromTextView.setText(unit.senderName)
+        sendMessageFrom.text = unit.senderName
     }
 
-    override fun setRecipients(recipients: List<Recipient>) {
+    override fun setRecipients(recipients: List<RecipientChipItem>) {
-        sendMessageRecipientsInput.filterableList = recipients.map { RecipientChip(it) }
+        sendMessageTo.filterableChipItems = recipients
     }
 
-    override fun setSelectedRecipients(recipients: List<Recipient>) {
+    override fun setSelectedRecipients(recipients: List<RecipientChipItem>) {
-        recipients.map { sendMessageRecipientsInput.addChip(RecipientChip(it)) }
+        sendMessageTo.addChips(recipients)
     }
 
     override fun showProgress(show: Boolean) {
@@ -109,11 +121,11 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setSubject(subject: String) {
-        sendMessageSubjectInput.setText(subject)
+        sendMessageSubject.setText(subject)
     }
 
     override fun setContent(content: String) {
-        sendMessageContentInput.setText(content)
+        sendMessageMessageContent.setText(content)
     }
 
     override fun showMessage(text: String) {
@@ -124,7 +136,41 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         if (show) showSoftInput() else hideSoftInput()
     }
 
+    override fun hideDropdownList() {
+        sendMessageTo.hideDropdownList()
+    }
+
+    override fun scrollToRecipients() {
+        sendMessageScroll.post {
+            sendMessageScroll.scrollTo(0, sendMessageTo.bottom - dpToPx(53f).toInt())
+        }
+    }
+
     override fun popView() {
         onBackPressed()
     }
+
+    private fun setUpExtendedHitArea() {
+        fun extendHitArea() {
+            val containerHitRect = Rect().apply {
+                sendMessageContent.getHitRect(this)
+            }
+
+            val contentHitRect = Rect().apply {
+                sendMessageMessageContent.getHitRect(this)
+            }
+
+            contentHitRect.top = contentHitRect.bottom
+            contentHitRect.bottom = containerHitRect.bottom
+
+            sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, sendMessageMessageContent)
+        }
+
+        sendMessageMessageContent.post {
+            sendMessageMessageContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                extendHitArea()
+            }
+            extendHitArea()
+        }
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt

@@ -32,6 +32,7 @@ class SendMessagePresenter @Inject constructor(
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
+        view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
         view.apply {
@@ -54,15 +55,47 @@ class SendMessagePresenter @Inject constructor(
         }
     }
 
+    fun onTouchScroll(): Boolean {
+        return view?.run {
+            if (isDropdownListVisible) {
+                hideDropdownList()
+                true
+            } else false
+        } == true
+    }
+
+    fun onRecipientsTextChange(text: String) {
+        if (text.isBlank()) return
+        view?.scrollToRecipients()
+    }
+
     fun onUpNavigate(): Boolean {
         view?.popView()
         return true
     }
 
+    fun onSend(): Boolean {
+        view?.run {
+            when {
+                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
+                formContentValue.length < 3 -> showMessage(messageContentMinLength)
+                else -> {
+                    sendMessage(
+                        subject = formSubjectValue,
+                        content = formContentValue,
+                        recipients = formRecipientsData.map { it.recipient }
+                    )
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     private fun loadData(message: Message?, reply: Boolean?) {
         var reportingUnit: ReportingUnit? = null
-        var recipients: List<Recipient> = emptyList()
+        var recipientChips: List<RecipientChipItem> = emptyList()
-        var selectedRecipient: List<Recipient> = emptyList()
+        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
 
         Timber.i("Loading recipients started")
         disposable.add(studentRepository.getCurrentStudent()
@@ -73,14 +106,14 @@ class SendMessagePresenter @Inject constructor(
                     .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
                     .doOnSuccess {
                         Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
-                        recipients = it
+                        recipientChips = createChips(it)
                     }
                     .flatMapCompletable {
                         if (message == null || reply != true) Completable.complete()
                         else recipientRepository.getMessageRecipients(student, message)
                             .doOnSuccess {
                                 Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
-                                selectedRecipient = it
+                                selectedRecipientChips = createChips(it)
                             }
                             .ignoreElement()
                     }
@@ -95,11 +128,11 @@ class SendMessagePresenter @Inject constructor(
             }
             .doFinally { view?.run { showProgress(false) } }
             .subscribe({
-                view?.apply {
+                view?.run {
                     if (reportingUnit !== null) {
                         reportingUnit?.let { setReportingUnit(it) }
-                        setRecipients(recipients)
+                        setRecipients(recipientChips)
-                        if (selectedRecipient.isNotEmpty()) setSelectedRecipients(selectedRecipient)
+                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
                         showContent(true)
                     } else {
                         Timber.e("Loading recipients result: Can't find the reporting unit")
@@ -145,21 +178,29 @@ class SendMessagePresenter @Inject constructor(
         )
     }
 
-    fun onSend(): Boolean {
+    private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
-        view?.run {
+        fun generateCorrectSummary(recipientRealName: String): String {
-            when {
+            val substring = recipientRealName.substringBeforeLast("-")
-                formRecipientsData.isEmpty() -> showMessage(messageRequiredRecipients)
+            return when {
-                formContentValue.length < 3 -> showMessage(messageContentMinLength)
+                substring == recipientRealName -> recipientRealName
-                else -> {
+                substring.indexOf("(") != -1 -> {
-                    sendMessage(
+                    recipientRealName.indexOf("(")
-                        subject = formSubjectValue,
+                        .let { recipientRealName.substring(if (it != -1) it else 0) }
-                        content = formContentValue,
+                }
-                        recipients = formRecipientsData
+                substring.indexOf("[") != -1 -> {
+                    recipientRealName.indexOf("[")
+                        .let { recipientRealName.substring(if (it != -1) it else 0) }
+                }
+                else -> recipientRealName.substringAfter("-")
+            }.trim()
+        }
+
+        return recipients.map {
+            RecipientChipItem(
+                title = it.name,
+                summary = generateCorrectSummary(it.realName),
+                recipient = it
             )
-                    return true
         }
     }
-        }
-        return false
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt

@@ -1,12 +1,13 @@
 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 isDropdownListVisible: Boolean
+
+    val formRecipientsData: List<RecipientChipItem>
 
     val formSubjectValue: String
 
@@ -18,11 +19,13 @@ interface SendMessageView : BaseView {
 
     val messageSuccess: String
 
+    fun initView()
+
     fun setReportingUnit(unit: ReportingUnit)
 
-    fun setRecipients(recipients: List<Recipient>)
+    fun setRecipients(recipients: List<RecipientChipItem>)
 
-    fun setSelectedRecipients(recipients: List<Recipient>)
+    fun setSelectedRecipients(recipients: List<RecipientChipItem>)
 
     fun showProgress(show: Boolean)
 
@@ -38,5 +41,9 @@ interface SendMessageView : BaseView {
 
     fun showSoftInput(show: Boolean)
 
+    fun hideDropdownList()
+
+    fun scrollToRecipients()
+
     fun popView()
 }

app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt

@@ -5,7 +5,6 @@ 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
@@ -20,6 +19,7 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_more.*
 import javax.inject.Inject
@@ -39,60 +39,26 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     override val titleStringId: Int
         get() = R.string.more_title
 
-
     override val messagesRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.message_title) to getCompatDrawable(R.drawable.ic_more_messages) }
-            return context?.run {
-                getString(R.string.message_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_messages_24dp)
-            }
-        }
 
     override val homeworkRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.homework_title) to getCompatDrawable(R.drawable.ic_more_homework) }
-            return context?.run {
-                getString(R.string.homework_title) to ContextCompat.getDrawable(this, R.drawable.ic_menu_main_homework_24dp)
-            }
-        }
 
     override val noteRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.note_title) to getCompatDrawable(R.drawable.ic_more_note) }
-            return context?.run {
-                getString(R.string.note_title) to ContextCompat.getDrawable(this, R.drawable.ic_menu_main_note_24dp)
-            }
-        }
 
     override val luckyNumberRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) }
-            return context?.run {
-                getString(R.string.lucky_number_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_lucky_number_24dp)
-            }
-        }
 
     override val mobileDevicesRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
-            return context?.run {
-                getString(R.string.mobile_devices_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_menu_main_mobile_devices_24dp)
-            }
-        }
 
     override val settingsRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
-            return context?.run {
-                getString(R.string.settings_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_more_settings_24dp)
-            }
-        }
 
     override val aboutRes: Pair<String, Drawable?>?
-        get() {
+        get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
-            return context?.run {
-                getString(R.string.about_title) to
-                    ContextCompat.getDrawable(this, R.drawable.ic_all_about_24dp)
-            }
-        }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_more, container, false)
@@ -104,7 +70,7 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     }
 
     override fun initView() {
-        moreAdapter.run { setOnItemClickListener { presenter.onItemSelected(it) } }
+        moreAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
 
         moreRecycler.apply {
             layoutManager = SmoothScrollLinearLayoutManager(context)
@@ -148,8 +114,8 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         (activity as? MainActivity)?.pushView(AboutFragment.newInstance())
     }
 
-    override fun popView() {
+    override fun popView(depth: Int) {
-        (activity as? MainActivity)?.popView()
+        (activity as? MainActivity)?.popView(depth)
     }
 
     override fun onDestroyView() {

app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt

@@ -22,7 +22,7 @@ class MorePresenter @Inject constructor(
     }
 
     fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is MoreItem) {
+        if (item !is MoreItem) return
         Timber.i("Select more item \"${item.title}\"")
         view?.run {
             when (item.title) {
@@ -36,11 +36,10 @@ class MorePresenter @Inject constructor(
             }
         }
     }
-    }
 
     fun onViewReselected() {
         Timber.i("More view is reselected")
-        view?.popView()
+        view?.popView(2)
     }
 
     private fun loadData() {

app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt

@@ -27,7 +27,7 @@ interface MoreView : BaseView {
 
     fun openAboutView()
 
-    fun popView()
+    fun popView(depth: Int)
 
     fun openMessagesView()
 

app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt

@@ -3,7 +3,8 @@ package io.github.wulkanowy.ui.modules.settings
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import com.takisoft.preferencex.PreferenceFragmentCompat
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
 import dagger.android.support.AndroidSupportInjection
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -24,8 +25,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
         fun newInstance() = SettingsFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.settings_title
-        get() = R.string.settings_title
 
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
@@ -37,9 +37,9 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
         presenter.onAttachView(this)
     }
 
-    override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.scheme_preferences)
+        setPreferencesFromResource(R.xml.scheme_preferences, rootKey)
-        findPreference(getString(R.string.pref_key_notification_debug)).isVisible = appInfo.isDebug
+        findPreference<Preference>(getString(R.string.pref_key_notification_debug))?.isVisible = appInfo.isDebug
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
@@ -51,7 +51,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
     }
 
     override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
-        findPreference(serviceEnablesKey).run {
+        findPreference<Preference>(serviceEnablesKey)?.apply {
             summary = if (isHolidays) getString(R.string.pref_services_suspended) else ""
             isEnabled = !isHolidays
         }

app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt

@@ -31,12 +31,14 @@ class SettingsPresenter @Inject constructor(
 
     fun onSharedPreferenceChanged(key: String) {
         Timber.i("Change settings $key")
-        preferencesRepository.apply {
+
+        with(preferencesRepository) {
             when (key) {
                 serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
                 servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
                 isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
                 appThemeKey -> view?.recreateView()
+                else -> Unit
             }
         }
         analytics.logEvent("setting_changed", "name" to key)

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt

@@ -17,11 +17,13 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
+import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable.*
 import javax.inject.Inject
 
-class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView, MainView.TitledView {
+class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: TimetablePresenter
@@ -35,17 +37,13 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         fun newInstance() = TimetableFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.timetable_title
-        get() = R.string.timetable_title
 
-    override val roomString: String
+    override val roomString get() = getString(R.string.timetable_room)
-        get() = getString(R.string.timetable_room)
 
-    override val isViewEmpty: Boolean
+    override val isViewEmpty get() = timetableAdapter.isEmpty
-        get() = timetableAdapter.isEmpty
 
-    override val currentStackSize: Int?
+    override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
-        get() = (activity as? MainActivity)?.currentStackSize
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,11 +61,9 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun initView() {
-        timetableAdapter.run {
+        timetableAdapter.setOnItemClickListener(presenter::onTimetableItemSelected)
-            setOnItemClickListener { presenter.onTimetableItemSelected(it) }
-        }
 
-        timetableRecycler.run {
+        with(timetableRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = timetableAdapter
             addItemDecoration(FlexibleItemDecoration(context)
@@ -75,9 +71,12 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
                 .withDrawDividerOnLastItem(false)
             )
         }
-        timetableSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
         timetableNextButton.setOnClickListener { presenter.onNextDay() }
+
+        timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt

@@ -8,6 +8,7 @@ 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.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
@@ -29,6 +30,8 @@ class TimetablePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -36,7 +39,8 @@ class TimetablePresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Timetable was initialized")
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -59,7 +63,7 @@ class TimetablePresenter @Inject constructor(
         Timber.i("Timetable view is reselected")
         view?.also { view ->
             if (view.currentStackSize == 1) {
-                now().nextOrSameSchoolDay.also {
+                baseDate.also {
                     if (currentDate != it) {
                         loadData(it)
                         reloadView()
@@ -71,7 +75,7 @@ class TimetablePresenter @Inject constructor(
 
     fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
         if (item is TimetableItem) {
-            Timber.i("Select exam item ${item.lesson.id}")
+            Timber.i("Select timetable item ${item.lesson.id}")
             view?.showTimetableDialog(item.lesson)
         }
     }
@@ -81,6 +85,20 @@ class TimetablePresenter @Inject constructor(
         return true
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading timetable data started")
         currentDate = date
@@ -125,8 +143,14 @@ class TimetablePresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
+            showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt

@@ -4,7 +4,6 @@ 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
@@ -13,6 +12,8 @@ import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.setOnItemClickListener
 import kotlinx.android.synthetic.main.fragment_timetable_completed.*
 import javax.inject.Inject
@@ -31,11 +32,9 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
         fun newInstance() = CompletedLessonsFragment()
     }
 
-    override val titleStringId: Int
+    override val titleStringId get() = R.string.completed_lessons_title
-        get() = R.string.completed_lessons_title
 
-    override val isViewEmpty
+    override val isViewEmpty get() = completedLessonsAdapter.isEmpty
-        get() = completedLessonsAdapter.isEmpty
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
@@ -48,17 +47,18 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     }
 
     override fun initView() {
-        completedLessonsAdapter.run {
+        completedLessonsAdapter.setOnItemClickListener(presenter::onCompletedLessonsItemSelected)
-            setOnItemClickListener { presenter.onCompletedLessonsItemSelected(it) }
-        }
 
-        completedLessonsRecycler.run {
+        with(completedLessonsRecycler) {
             layoutManager = SmoothScrollLinearLayoutManager(context)
             adapter = completedLessonsAdapter
         }
-        completedLessonsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+
+        completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
         completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
         completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+
+        completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
     }
 
     override fun updateData(data: List<CompletedLessonItem>) {
@@ -82,10 +82,8 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
     }
 
     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))
+        completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
-        }
     }
 
     override fun showProgress(show: Boolean) {
@@ -114,7 +112,7 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(CompletedLessonsFragment.SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
     }
 
     override fun onDestroyView() {

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt

@@ -7,6 +7,7 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
@@ -28,6 +29,8 @@ class CompletedLessonsPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -35,7 +38,8 @@ class CompletedLessonsPresenter @Inject constructor(
         super.onAttachView(view)
         Timber.i("Completed lessons is attached")
         view.initView()
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
@@ -65,6 +69,20 @@ class CompletedLessonsPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading completed lessons data started")
         currentDate = date
@@ -109,8 +127,14 @@ class CompletedLessonsPresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
+            showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt

@@ -2,12 +2,14 @@ package io.github.wulkanowy.ui.modules.timetablewidget
 
 import android.annotation.SuppressLint
 import android.view.View
+import androidx.core.graphics.ColorUtils
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.getThemeAttrColor
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.item_account.*
 
@@ -16,16 +18,19 @@ class TimetableWidgetConfigureItem(val student: Student, private val isCurrent:
 
     override fun getLayoutRes() = R.layout.item_account
 
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-        return ViewHolder(view, adapter)
-    }
 
     @SuppressLint("SetTextI18n")
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.apply {
+        val context = holder.contentView.context
+
+        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
+
+        with(holder) {
             accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
-            accountItemImage.setBackgroundResource(if (isCurrent) R.drawable.ic_account_circular_border else 0)
+            accountItemImage.setColorFilter(colorImage)
         }
     }
 
@@ -46,8 +51,9 @@ class TimetableWidgetConfigureItem(val student: Student, private val isCurrent:
         return result
     }
 
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
+    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        override val containerView: View
+        LayoutContainer {
-            get() = contentView
+
+        override val containerView: View? get() = contentView
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt

@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -14,7 +14,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
     schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val sharedPref: SharedPrefHelper
+    private val sharedPref: SharedPrefProvider
 ) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt

@@ -11,7 +11,7 @@ import android.widget.AdapterView.INVALID_POSITION
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -28,7 +28,7 @@ class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val sharedPref: SharedPrefHelper,
+    private val sharedPref: SharedPrefProvider,
     private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
@@ -60,8 +60,6 @@ class TimetableWidgetFactory(
                     .filter { true }
                     .flatMap { studentRepository.getSavedStudents().toMaybe() }
                     .flatMap {
-                        if (studentId == 0L) throw IllegalArgumentException("Student id is 0")
-
                         it.singleOrNull { student -> student.id == studentId }
                             .let { student ->
                                 if (student != null) Maybe.just(student)

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt

@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
@@ -15,12 +16,13 @@ import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.widget.RemoteViews
 import dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView.MenuView
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
@@ -43,7 +45,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     lateinit var studentRepository: StudentRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefHelper
+    lateinit var sharedPref: SharedPrefProvider
 
     @Inject
     lateinit var schedulers: SchedulersProvider
@@ -110,6 +112,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         }
     }
 
+    @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
         RemoteViews(context.packageName, R.layout.widget_timetable).apply {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
@@ -130,8 +133,8 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                     putExtra(EXTRA_FROM_PROVIDER, true)
                 }, FLAG_UPDATE_CURRENT))
             setPendingIntentTemplate(R.id.timetableWidgetList,
-                PendingIntent.getActivity(context, MenuView.TIMETABLE.id,
+                PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
-                    MainActivity.getStartIntent(context, MenuView.TIMETABLE, true), FLAG_UPDATE_CURRENT))
+                    MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
         }.also {
             sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
             appWidgetManager.apply {
@@ -173,7 +176,9 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                 .subscribeOn(schedulers.backgroundThread)
                 .blockingGet()
         } catch (e: Exception) {
+            if (e.cause !is NoCurrentStudentException) {
                 Timber.e(e, "An error has occurred in timetable widget provider")
+            }
             null
         }
     }

app/src/main/java/io/github/wulkanowy/ui/widgets/FittedScrollableTabLayout.kt

@@ -1,14 +1,13 @@
-package io.github.wulkanowy.ui.modules.grade
+package io.github.wulkanowy.ui.widgets
 
 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 {
+class FittedScrollableTabLayout : MaterialTabLayout {
 
     constructor(context: Context) : super(context)
 

app/src/main/java/io/github/wulkanowy/ui/widgets/MaterialLinearLayout.kt

@@ -0,0 +1,39 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import androidx.core.view.ViewCompat
+import com.google.android.material.elevation.ElevationOverlayProvider
+import com.google.android.material.shape.MaterialShapeDrawable
+
+class MaterialLinearLayout : LinearLayout {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attr: AttributeSet) : super(context, attr)
+
+    constructor(context: Context, attr: AttributeSet, defStyleAttr: Int) : super(context, attr, defStyleAttr)
+
+    init {
+        val drawable = MaterialShapeDrawable.createWithElevationOverlay(context, ViewCompat.getElevation(this))
+        ViewCompat.setBackground(this, drawable)
+    }
+
+    override fun setElevation(elevation: Float) {
+        super.setElevation(elevation)
+        if (background is MaterialShapeDrawable) {
+            (background as MaterialShapeDrawable).elevation = elevation
+        }
+    }
+
+    fun setElevationCompat(elevation: Float) {
+        if (SDK_INT >= LOLLIPOP) {
+            setElevation(elevation)
+        } else {
+            setBackgroundColor(ElevationOverlayProvider(context).getSurfaceColorWithOverlayIfNeeded(elevation))
+        }
+    }
+}