Merge branch 'release/0.17.0'

Version 0.16.0

.circleci/config.yml

@@ -7,11 +7,11 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android@sha256:5cdc8626cc6f13efe5ed982cdcdb432b0472f8740fed8743a6461e025ad6cdfc
     working_directory: *workspace_root
     environment:
       environment:
-        JVM_OPTS: -Xmx3200m
+        _JAVA_OPTS: -Xmx3072m
 
   attach_workspace: &attach_workspace
     attach_workspace:
@@ -35,7 +35,7 @@ jobs:
           command: ./gradlew dependencies --no-daemon --stacktrace --console=plain -PdisablePreDex || true
       - run:
           name: Initial build
-          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Run FOSSA
           command: fossa --no-ansi || true
@@ -56,7 +56,7 @@ jobs:
           <<: *general_cache_key
       - run:
           name: Run lint
-          command: ./gradlew lint -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew lint -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
       - store_artifacts:
           path: ./app/build/reports/
           destination: lint_reports/app/
@@ -75,7 +75,7 @@ jobs:
           <<: *general_cache_key
       - run:
           name: Run app tests
-          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Upload unit code coverage to codecov
           command: bash <(curl -s https://codecov.io/bash) -F app
@@ -93,9 +93,12 @@ jobs:
     <<: *container_config
     steps:
       - *attach_workspace
+      - run:
+          name: Accept licenses
+          command: yes | sdkmanager --licenses && yes | sdkmanager --update
       - run:
           name: Setup emulator
-          command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a"
       - run:
           name: Launch emulator
           command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
@@ -113,7 +116,7 @@ jobs:
             adb shell input keyevent 82
       - run:
           name: Run instrumented tests
-          command: ./gradlew clean createDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Collect logs from emulator
           command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
@@ -159,7 +162,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2

.gitignore

@@ -1,39 +1,91 @@
-/captures
-.externalNativeBuild
-
-## https://gist.github.com/iainconnor/8605514
+# Created by https://www.gitignore.io
 
 # Built application files
-/build
-/*/build/
+*.apk
+*.ap_
+*.aab
 
-# Crashlytics configuations
-com_crashlytics_export_strings.xml
+# Files for the ART/Dalvik VM
+*.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
-.gradle/
+# Proguard folder generated by Eclipse
+proguard/
 
-# Signing files
-.signing/
+# Log Files
+*.log
 
-# User-specific configurations
-.idea/copyright/profiles_settings.xml
+# Android Studio Navigation editor temp files
+.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/caches/
-*.iml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/runConfigurations.xml
+.idea/discord.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,8 +95,21 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-.idea/caches/
-app/key.p12
-app/upload-key.jks
-*.log
-.idea/assetWizardSettings.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+.idea/jarRepositories.xml

.gitlab-ci.yml

@@ -12,7 +12,7 @@ build:
   script:
     - ./gradlew --no-daemon --stacktrace dependencies || true
     - ./gradlew --no-daemon --stacktrace assembleDebug
-    - mv app/build/outputs/apk/debug/app-debug.apk .
+    - mv app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk .
   artifacts:
     name: "${CI_PROJECT_NAME}_${CI_BUILD_REF_NAME}-${CI_BUILD_ID}"
     paths:
@@ -26,7 +26,7 @@ tests:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease test
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease test
   artifacts:
     paths:
     - app/build/reports/tests
@@ -39,7 +39,7 @@ lint:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease lint
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease lint
   artifacts:
     paths:
     - app/build/reports

.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>
@@ -19,40 +16,12 @@
       <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
       <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
-      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
+      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -63,6 +32,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -73,6 +43,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -84,6 +55,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -94,6 +66,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -104,6 +77,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -114,6 +88,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -124,6 +99,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -135,6 +111,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -146,6 +123,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -163,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>

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.travis.yml

@@ -3,14 +3,19 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=28
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_API_LEVEL=29
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
 
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
+branches:
+  only:
+    - develop
+    - 0.17.0
+
 android:
  licenses:
     - android-sdk-preview-license-.+
@@ -29,34 +34,34 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-19
-    - sys-img-armeabi-v7a-android-19
+    - android-22
+    - sys-img-armeabi-v7a-android-22
 
 before_script:
     # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
     - adb shell input keyevent 82 &
     - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
-  - ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --stacktrace --daemon
+  - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew createDebugCoverageReport --stacktrace --daemon
-  - ./gradlew jacocoTestReport --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew -Pcoverage testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
   - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
       git fetch --unshallow;
-      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
     fi
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
     fi
 
 after_success:

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?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+
+Unofficial android VULCAN UONET+ register client for both students and their parents
+
+## Features
+
+* logging in using the email and password OR using token and pin
+* 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 independently of school's preferences
+* notifications, e.g. about a new grade
+* dark and black (AMOLED) theme
+* offline mode
+* no ads
+
+## Download
+
+You can download the current beta version from the Google Play or the F-Droid 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 F-Droid"
+    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 being prepared for the next release
+
+## Built With
+
+
+* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## 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,22 +1,62 @@
+[English version of README](README.en.md)
+
 # Wulkanowy
-
-[![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/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.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=shield)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_shield)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
 
-[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/daeff1893f3c8128/builds/master/artifacts/0)
-[(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
+## Funkcje
 
-Androidowy klient dziennika VULCAN UONET+.
+* logowanie za pomocą e-maila i hasła LUB tokena i pinu
+* 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 niezależnie od preferencji szkoły
+* 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 F-Droid
+
+[<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 F-Droid"
+    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.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=large)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_large)
+
+## Zbudowana za pomocą
+
+* [Wulkanowy SDK](https://github.com/wulkanowy/SDK)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Współpraca
+
+Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
+
+## Licencja
+
+Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)

app/.gitignore

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

app/build.gradle

@@ -4,35 +4,41 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
+apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
-
-    playAccountConfigs {
-        defaultAccountConfig {
-            serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL")
-            pk12File = file('key.p12')
-        }
-    }
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 20
-        versionName "0.6.1"
+        minSdkVersion 17
+        targetSdkVersion 29
+        versionCode 54
+        versionName "0.17.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-        playAccountConfig = playAccountConfigs.defaultAccountConfig
         manifestPlaceholders = [
-                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
                 crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [
+                        "room.schemaLocation": "$projectDir/schemas".toString(),
+                        "room.incremental"   : "true"
+                ]
+            }
+        }
+    }
+
+    sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -48,7 +54,6 @@ android {
         release {
             buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
-            useProguard false
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
@@ -57,15 +62,45 @@ android {
             buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = true
+            testCoverageEnabled = project.hasProperty('coverage')
             ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
-            multiDexKeepProguard file('proguard-multidex-rules.pro')
+        }
+    }
+
+    flavorDimensions "platform"
+
+    productFlavors {
+        play {
+            dimension "platform"
+        }
+
+        fdroid {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
+            dimension "platform"
         }
     }
 
     lintOptions {
         disable 'HardwareIds'
     }
+
+    compileOptions {
+        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'
+    }
+
+    aboutLibraries {
+        configPath = "app/src/main/res/raw"
+    }
 }
 
 androidExtensions {
@@ -73,67 +108,108 @@ androidExtensions {
 }
 
 play {
+    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
+    serviceAccountCredentials = file('key.p12')
+    defaultToAppBundles = false
     track = 'alpha'
-    uploadImages = false
+}
+
+ext {
+    work_manager = "2.3.4"
+    room = "2.2.5"
+    dagger = "2.27"
+    // don't update https://github.com/ChuckerTeam/chucker/issues/242
+    chucker = "3.2.0"
+    mockk = "1.9.2"
 }
 
 configurations.all {
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp-urlconnection:3.11.0"
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
 }
 
 dependencies {
+    implementation "io.github.wulkanowy:sdk:0.17.0"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.6.0') { exclude module: "threetenbp" }
+    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-beta01"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "com.google.android.material:material:1.0.0"
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-beta01"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
+    implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
+    implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
-    implementation "com.mikepenz:aboutlibraries:6.2.0"
-    implementation "com.firebase:firebase-jobdispatcher:0.8.5"
+    implementation "androidx.work:work-runtime-ktx:$work_manager"
+    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "com.google.dagger:dagger-android-support:2.19"
-    kapt "com.google.dagger:dagger-compiler:2.19"
-    kapt "com.google.dagger:dagger-android-processor:2.19"
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
 
-    implementation "androidx.room:room-runtime:2.1.0-alpha03"
-    implementation "androidx.room:room-rxjava2:2.1.0-alpha03"
-    kapt "androidx.room:room-compiler:2.1.0-alpha03"
+    implementation "androidx.room:room-runtime:$room"
+    implementation "androidx.room:room-rxjava2:$room"
+    implementation "androidx.room:room-ktx:$room"
+    kapt "androidx.room:room-compiler:$room"
+
+    implementation "com.google.dagger:dagger-android-support:$dagger"
+    kapt "com.google.dagger:dagger-compiler:$dagger"
+    kapt "com.google.dagger:dagger-android-processor:$dagger"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
+    implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
+    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation "com.github.YarikSOffice:lingver:1.2.1"
 
-    implementation "com.aurelhubert:ahbottomnavigation:2.2.0"
-    implementation 'com.ncapdevi:frag-nav:3.0.0'
-
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.4"
-
-    implementation "com.jakewharton.threetenabp:threetenabp:1.1.0"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
 
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.3"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
+    implementation "fr.bipi.treessence:treessence:0.3.2"
+    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "io.coil-kt:coil:0.9.5"
 
-    implementation 'com.google.firebase:firebase-core:16.0.6'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7'
+    playImplementation 'com.google.firebase:firebase-analytics:17.3.0'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.4'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.4"
+    playImplementation "com.google.firebase:firebase-messaging:20.1.0"
+    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
-    testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.8.13.kotlin13"
-    testImplementation "org.mockito:mockito-inline:2.23.4"
-    testImplementation 'org.threeten:threetenbp:1.3.8'
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
-    androidTestImplementation 'androidx.test:core:1.1.0'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'org.mockito:mockito-android:2.23.4'
+    testImplementation "junit:junit:4.13"
+    testImplementation "io.mockk:mockk:$mockk"
+    testImplementation "org.threeten:threetenbp:1.4.3"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
+
+    androidTestImplementation "androidx.test:core:1.2.0"
+    androidTestImplementation "androidx.test:runner:1.2.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
+    androidTestImplementation "io.mockk:mockk-android:$mockk"
+    androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    androidTestImplementation "org.mockito:mockito-android:3.3.3"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/hooks.gradle

@@ -0,0 +1,10 @@
+apply plugin: "com.star-zero.gradle.githook"
+
+githook {
+    failOnMissingHooksDir = false
+    hooks {
+        "pre-push" {
+            shell = "./app/play-publish-lint.sh"
+        }
+    }
+}

app/jacoco.gradle

@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.2"
+    toolVersion "0.8.5"
     reportsDir = file("$buildDir/reports")
 }
 
@@ -31,17 +31,20 @@ task jacocoTestReport(type: JacocoReport) {
                     '**/*_Provide*Factory*.*',
                     '**/*_Factory.*']
 
-    classDirectories = fileTree(
+    classDirectories.setFrom(fileTree(
             dir: "$buildDir/intermediates/classes/debug",
             excludes: excludes
     ) + fileTree(
-            dir: "$buildDir/tmp/kotlin-classes/debug",
+            dir: "$buildDir/tmp/kotlin-classes/playDebug",
             excludes: excludes
-    )
+    ))
 
-    sourceDirectories = files("$project.projectDir/src/main/java")
-    executionData = fileTree(
+    sourceDirectories.setFrom(files([
+            "src/main/java",
+            "src/play/java"
+    ]))
+    executionData.setFrom(fileTree(
             dir: project.projectDir,
             includes: ["**/*.exec", "**/*.ec"]
-    )
+    ))
 }

app/play-publish-lint.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -
+
+content=$(cat < "app/src/main/play/release-notes/pl-PL/default.txt") || exit
+if [[ "${#content}" -gt 500 ]]; then
+    echo >&2 "Release notes content has reached the limit of 500 characters"
+    exit 1
+fi

app/proguard-multidex-rules.pro

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

app/proguard-rules.pro

@@ -5,15 +5,19 @@
 -dontskipnonpubliclibraryclasses
 -dontskipnonpubliclibraryclassmembers
 -dontpreverify
+-dontobfuscate
 -allowaccessmodification
 -repackageclasses ''
 -verbose
 
 
+#Keep all wulkanowy files
+-keep class io.github.wulkanowy.** {*;}
+
+
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
--renamesourcefileattribute SourceFile
 -keep class com.crashlytics.** {*;}
 -keep public class * extends java.lang.Exception
 -dontwarn com.crashlytics.**
@@ -32,5 +36,17 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
-#Config for API
--keep class io.github.wulkanowy.api.** {*;}
+
+#Config for MPAndroidChart
+-keep class com.github.mikephil.charting.** { *; }
+
+
+#Config for Material Components
+-keep class com.google.android.material.tabs.** { *; }
+
+
+#Config for About Libraries
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}

app/sonarqube.gradle

@@ -29,5 +29,6 @@ sonarqube {
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.android.lint.report", "build/reports/lint-results.xml"
         property "sonar.jacoco.reportPaths", fileTree(dir: project.projectDir, includes: ['**/*.exec', '**/*.ec'])
+        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacocoTestReport/jacocoTestReport.xml"
     }
 }

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

@@ -0,0 +1,35 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.preference.PreferenceManager
+import androidx.room.Room
+import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.SharedPrefProvider
+import org.junit.Rule
+
+abstract class AbstractMigrationTest {
+
+    val dbName = "migration-test"
+
+    @get:Rule
+    val helper: MigrationTestHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        AppDatabase::class.java.canonicalName,
+        FrameworkSQLiteOpenHelperFactory()
+    )
+
+    fun getMigratedRoomDatabase(): AppDatabase {
+        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, dbName)
+            .addMigrations(*AppDatabase.getMigrations(SharedPrefProvider(PreferenceManager
+                .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())))
+            )
+            .build()
+        // close the database and release any stream resources when the test finishes
+        helper.closeWhenFinished(database)
+        return database
+    }
+}

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

@@ -0,0 +1,133 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
+import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class Migration12Test : AbstractMigrationTest() {
+
+    @Test
+    fun twoNotRelatedStudents() {
+        helper.createDatabase(dbName, 11).apply {
+            // user 1
+            createStudent(this, 1, true)
+            createSemester(this, 1, false, 5, 1)
+            createSemester(this, 1, true, 5, 2)
+
+            // user 2
+            createStudent(this, 2, true)
+            createSemester(this, 2, false, 6, 1)
+            createSemester(this, 2, true, 6, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(2, students.size)
+
+        students[0].run {
+            assertEquals(1, studentId)
+            assertEquals(5, classId)
+        }
+
+        students[1].run {
+            assertEquals(2, studentId)
+            assertEquals(6, classId)
+        }
+    }
+
+    @Test
+    fun removeStudentsWithoutClassId() {
+        helper.createDatabase(dbName, 11).apply {
+            // user 1
+            createStudent(this, 1, true)
+            createSemester(this, 1, false, 0, 2)
+            createStudent(this, 2, true)
+            createSemester(this, 2, true, 1, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(1, students.size)
+
+        students[0].run {
+            assertEquals(2, studentId)
+            assertEquals(1, classId)
+        }
+    }
+
+    @Test
+    fun ensureThereIsOnlyOneCurrentStudent() {
+        helper.createDatabase(dbName, 11).apply {
+            // user 1
+            createStudent(this, 1, true)
+            createSemester(this, 1, true, 5, 2)
+            createStudent(this, 2, true)
+            createSemester(this, 2, true, 6, 2)
+            createStudent(this, 3, true)
+            createSemester(this, 3, false, 7, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(3, students.size)
+
+        students[0].run {
+            assertEquals(studentId, 1)
+            assertEquals(false, isCurrent)
+        }
+        students[1].run {
+            assertEquals(studentId, 2)
+            assertEquals(false, isCurrent)
+        }
+        students[2].run {
+            assertEquals(studentId, 3)
+            assertEquals(true, isCurrent)
+        }
+    }
+
+    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean) {
+        db.insert("Students", CONFLICT_FAIL, ContentValues().apply {
+            put("endpoint", "https://fakelog.cf")
+            put("loginType", "STANDARD")
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", "Default")
+            put("student_id", studentId)
+            put("student_name", "Jan Kowalski")
+            put("school_id", "000123")
+            put("school_name", "")
+            put("is_current", isCurrent)
+            put("registration_date", "0")
+        })
+    }
+
+    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean, classId: Int, diaryId: Int) {
+        db.insert("Semesters", CONFLICT_FAIL, ContentValues().apply {
+            put("student_id", studentId)
+            put("diary_id", diaryId)
+            put("diary_name", "IA")
+            put("semester_id", diaryId * 5)
+            put("semester_name", "1")
+            put("is_current", isCurrent)
+            put("class_id", classId)
+            put("unit_id", "99")
+        })
+    }
+}

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

@@ -0,0 +1,195 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.wulkanowy.data.db.Converters
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.threeten.bp.LocalDate.of
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class Migration13Test : AbstractMigrationTest() {
+
+    @Test
+    fun studentsWithSchoolNameWithClassName() {
+        helper.createDatabase(dbName, 12).apply {
+            createStudent(this, 1, "Klasa A - Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1, 1)
+            createStudent(this, 2, "Klasa B - Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 2, 1)
+            createStudent(this, 2, "Klasa C - Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", 1, 2)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(3, students.size)
+
+        students[0].run {
+            assertEquals(1, studentId)
+            assertEquals("A", className)
+            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
+        }
+
+        students[1].run {
+            assertEquals(2, studentId)
+            assertEquals("B", className)
+            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
+        }
+
+        students[2].run {
+            assertEquals(2, studentId)
+            assertEquals("C", className)
+            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", schoolName)
+        }
+    }
+
+    @Test
+    fun studentsWithSchoolNameWithoutClassName() {
+        helper.createDatabase(dbName, 12).apply {
+            createStudent(this, 1, "Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1)
+            createStudent(this, 2, "Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 1)
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll().blockingGet()
+
+        assertEquals(2, students.size)
+
+        students[0].run {
+            assertEquals(1, studentId)
+            assertEquals("", className)
+            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
+        }
+
+        students[1].run {
+            assertEquals(2, studentId)
+            assertEquals("", className)
+            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
+        }
+    }
+
+    @Test
+    fun markAtLeastAndOnlyOneSemesterAtCurrent() {
+        helper.createDatabase(dbName, 12).apply {
+            createStudent(this, 1, "", 5)
+            createSemester(this, 1, 5, 1, 1, false)
+            createSemester(this, 1, 5, 2, 1, false)
+            createSemester(this, 1, 5, 3, 2, false)
+            createSemester(this, 1, 5, 4, 2, false)
+
+            createStudent(this, 2, "", 5)
+            createSemester(this, 2, 5, 5, 5, true)
+            createSemester(this, 2, 5, 6, 5, true)
+            createSemester(this, 2, 5, 7, 55, true)
+            createSemester(this, 2, 5, 8, 55, true)
+
+            createStudent(this, 3, "", 5)
+            createSemester(this, 3, 5, 11, 99, false)
+            createSemester(this, 3, 5, 12, 99, false)
+            createSemester(this, 3, 5, 13, 100, false)
+            createSemester(this, 3, 5, 14, 100, true)
+            close()
+        }
+
+        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+
+        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
+        assertTrue { semesters1.single { it.second }.second }
+        semesters1[0].run {
+            assertFalse(second)
+            assertEquals(1, first.semesterId)
+            assertEquals(1, first.diaryId)
+        }
+        semesters1[2].run {
+            assertFalse(second)
+            assertEquals(3, first.semesterId)
+            assertEquals(2, first.diaryId)
+        }
+        semesters1[3].run {
+            assertTrue(second)
+            assertEquals(4, first.semesterId)
+            assertEquals(2, first.diaryId)
+        }
+
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertEquals(1970, it[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].first.end)
+            assertEquals(of(1970, 1, 1), it[0].first.start)
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
+        }
+
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
+        }
+    }
+
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
+        val semesters = mutableListOf<Pair<Semester, Boolean>>()
+
+        val cursor = db.query(query)
+        if (cursor.moveToFirst()) {
+            do {
+                semesters.add(Semester(
+                    studentId = cursor.getInt(1),
+                    diaryId = cursor.getInt(2),
+                    diaryName = cursor.getString(3),
+                    semesterId = cursor.getInt(4),
+                    semesterName = cursor.getInt(5),
+                    classId = cursor.getInt(7),
+                    unitId = cursor.getInt(8),
+                    schoolYear = cursor.getInt(9),
+                    start = Converters().timestampToDate(cursor.getLong(10))!!,
+                    end = Converters().timestampToDate(cursor.getLong(11))!!
+                ) to (cursor.getInt(6) == 1))
+            } while (cursor.moveToNext())
+        }
+        return semesters.toList()
+    }
+
+    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
+        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("endpoint", "https://fakelog.cf")
+            put("loginType", "STANDARD")
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", "Default")
+            put("student_id", studentId)
+            put("class_id", classId)
+            put("student_name", "Jan Kowalski")
+            put("school_id", schoolId)
+            put("school_name", schoolName)
+            put("is_current", false)
+            put("registration_date", "0")
+        })
+    }
+
+    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, classId: Int, semesterId: Int, diaryId: Int, isCurrent: Boolean = false) {
+        db.insert("Semesters", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("student_id", studentId)
+            put("diary_id", diaryId)
+            put("diary_name", "IA")
+            put("semester_id", semesterId)
+            put("semester_name", "1")
+            put("is_current", isCurrent)
+            put("class_id", classId)
+            put("unit_id", "99")
+        })
+    }
+}

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

@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories
+
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
+import io.reactivex.Observable
+import io.reactivex.Single
+
+class TestInternetObservingStrategy : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(true)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(true)
+    }
+
+    override fun getDefaultPingHost() = "localhost"
+}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.attendance
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -10,7 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,19 +35,19 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "")
+            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
         ))
 
         val attendance = attendanceLocal
-                .getAttendance(Semester(1, 1, 2, "", 3, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, attendance.size)
-        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(attendance[0].date, of(2018, 9, 10))
+        assertEquals(attendance[1].date, of(2018, 9, 14))
     }
 }

app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt

@@ -0,0 +1,59 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class CompletedLessonsLocalTest {
+
+    private lateinit var completedLessonsLocal: CompletedLessonsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        completedLessonsLocal.saveCompletedLessons(listOf(
+            getCompletedLesson(of(2018, 9, 10), 1),
+            getCompletedLesson(of(2018, 9, 14), 2),
+            getCompletedLesson(of(2018, 9, 17), 3)
+        ))
+
+        val completed = completedLessonsLocal
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
+        assertEquals(2, completed.size)
+        assertEquals(completed[0].date, of(2018, 9, 10))
+        assertEquals(completed[1].date, of(2018, 9, 14))
+    }
+
+    private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
+        return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
+    }
+}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.exam
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -10,7 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,19 +35,19 @@ class ExamLocalTest {
     @Test
     fun saveAndReadTest() {
         examLocal.saveExams(listOf(
-                Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
+            Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
         ))
 
         val exams = examLocal
-                .getExams(Semester(1, 1, 2, "", 3, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, exams.size)
-        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(exams[0].date, of(2018, 9, 10))
+        assertEquals(exams[1].date, of(2018, 9, 14))
     }
 }

app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt

@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeLocalTest {
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
+            createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
+            createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
+        ))
+
+        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
+
+        val grades = gradeLocal
+            .getGrades(semester)
+            .blockingGet()
+
+        assertEquals(2, grades.size)
+        assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
+        assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
+    }
+}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt

@@ -0,0 +1,181 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import android.os.Build.VERSION_CODES.P
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.github.wulkanowy.sdk.Sdk
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.reactivex.Single
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class GradeRepositoryTest {
+
+    @MockK
+    private lateinit var mockSdk: Sdk
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var studentMock: Student
+
+    private lateinit var gradeRemote: GradeRemote
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeRemote = GradeRemote(mockSdk)
+
+        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 1
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun markOlderThanRegisterDateAsRead() {
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
+            createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
+            createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
+            createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun mitigateOldGradesNotifications() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
+            createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
+            createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
+        ))
+
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
+            createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
+            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
+            createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun subtractLocaleDuplicateGrades() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(2, grades.size)
+    }
+
+    @Test
+    fun subtractRemoteDuplicateGrades() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.size)
+    }
+
+    @Test
+    fun emptyLocal() {
+        gradeLocal.saveGrades(listOf())
+
+        every { mockSdk.getGrades(1) } returns Single.just(listOf(
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.size)
+    }
+
+    @Test
+    fun emptyRemote() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockSdk.getGrades(1) } returns Single.just(listOf())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(0, grades.size)
+    }
+}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt

@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import org.threeten.bp.LocalDate
+import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
+import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
+
+fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
+    return GradeLocal(
+        semesterId = semesterId,
+        studentId = 1,
+        modifier = .0,
+        teacher = "",
+        subject = "",
+        date = date,
+        color = "",
+        comment = "",
+        description = desc,
+        entry = "",
+        gradeSymbol = "",
+        value = value.toDouble(),
+        weight = "",
+        weightValue = weight
+    )
+}
+
+fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
+    return GradeRemote(
+        subject = "",
+        color = "",
+        comment = "",
+        date = date,
+        description = desc,
+        entry = "",
+        modifier = .0,
+        symbol = "",
+        teacher = "",
+        value = value.toDouble(),
+        weight = weight.toString(),
+        weightValue = weight
+    )
+}

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

@@ -0,0 +1,106 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.now
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeStatisticsLocalTest {
+
+    private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndRead_subject() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
+        assertEquals(1, stats.size)
+        assertEquals(stats[0].subject, "Matematyka")
+    }
+
+    @Test
+    fun saveAndRead_all() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Chemia", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
+        assertEquals(3, stats.size)
+        assertEquals(stats[0].subject, "Wszystkie")
+        assertEquals(stats[1].subject, "Matematyka")
+        assertEquals(stats[2].subject, "Chemia")
+    }
+
+    @Test
+    fun saveAndRead_points() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+            getGradePointsStatistics("Matematyka", 2, 1),
+            getGradePointsStatistics("Chemia", 2, 1),
+            getGradePointsStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        with(stats[0]) {
+            assertEquals(subject, "Matematyka")
+            assertEquals(others, 5.0)
+            assertEquals(student, 5.0)
+        }
+    }
+
+    @Test
+    fun saveAndRead_subjectEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        assertEquals(null, stats)
+    }
+
+    @Test
+    fun saveAndRead_allEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        assertEquals(null, stats)
+    }
+
+    private fun getSemester(): Semester {
+        return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
+    }
+
+    private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
+        return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
+    }
+
+    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
+        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
+    }
+}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt

@@ -0,0 +1,49 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.now
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class LuckyNumberLocalTest {
+
+    private lateinit var luckyNumberLocal: LuckyNumberLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
+
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
+
+        assertEquals(1, luckyNumber.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
+        assertEquals(14, luckyNumber.luckyNumber)
+    }
+}

app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt

@@ -0,0 +1,60 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class RecipientLocalTest {
+
+    private lateinit var recipientLocal: RecipientLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        recipientLocal = RecipientLocal(testDb.recipientDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        recipientLocal.saveRecipients(listOf(
+            Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
+            Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
+            Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
+        ))
+
+        val recipients = recipientLocal.getRecipients(
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
+            2,
+            ReportingUnit(1, 4, "", 0, "", emptyList())
+        ).blockingGet()
+
+        assertEquals(2, recipients.size)
+        assertEquals(1, recipients[0].studentId)
+        assertEquals("3rPracownik", recipients[1].realId)
+        assertEquals("Kowalski Jan", recipients[0].name)
+        assertEquals("Kowalska Karolina [KK] - Pracownik (Fake123456)", recipients[1].realName)
+        assertEquals(3, recipients[0].loginId)
+        assertEquals(4, recipients[1].unitId)
+        assertEquals(2, recipients[0].role)
+        assertEquals("hash", recipients[1].hash)
+    }
+}

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

@@ -1,16 +1,17 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.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
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -20,15 +21,15 @@ 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))
-        studentLocal = StudentLocal(testDb.studentDao, sharedHelper, context)
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
     @After
@@ -38,9 +39,8 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true))
+        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", scrapperBaseUrl = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolShortName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "", loginMode = "API", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 0, isParent = false)))
             .blockingGet()
-        assert(studentLocal.isStudentSaved)
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)

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

@@ -0,0 +1,48 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
+
+fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
+    return TimetableLocal(
+        studentId = 1,
+        diaryId = 2,
+        number = number,
+        start = start,
+        end = now(),
+        date = start.toLocalDate(),
+        subject = subject,
+        subjectOld = "",
+        group = "",
+        room = room,
+        roomOld = "",
+        teacher = teacher,
+        teacherOld = "",
+        info = "",
+        isStudentPlan = true,
+        changes = changes,
+        canceled = false
+    )
+}
+
+fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
+    return TimetableRemote(
+        number = number,
+        start = start,
+        end = start.plusMinutes(45),
+        date = start.toLocalDate(),
+        subject = subject,
+        group = "",
+        room = room,
+        teacher = teacher,
+        info = "",
+        changes = changes,
+        canceled = false,
+        roomOld = "",
+        subjectOld = "",
+        teacherOld = "",
+        studentPlan = true
+    )
+}

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

@@ -1,17 +1,16 @@
-package io.github.wulkanowy.data.repositories.local
+package io.github.wulkanowy.data.repositories.timetable
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Timetable
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -23,7 +22,8 @@ class TimetableLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
         timetableDb = TimetableLocal(testDb.timetableDao)
     }
 
@@ -35,19 +35,17 @@ class TimetableLocalTest {
     @Test
     fun saveAndReadTest() {
         timetableDb.saveTimetable(listOf(
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 10), "", "", "", "", ""),
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 14), "", "", "", "", ""),
-                Timetable(1, 2, 1, LocalDateTime.now(), LocalDateTime.now(),
-                        LocalDate.of(2018, 9, 17), "", "", "", "", "")
+            createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
+            createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
+            createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
         ))
 
         val exams = timetableDb.getTimetable(
-                Semester(0, 1, 2, "3", 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
+            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 14)
         ).blockingGet()
+
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
         assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))

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

@@ -0,0 +1,147 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import android.os.Build.VERSION_CODES.P
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.github.wulkanowy.sdk.Sdk
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.reactivex.Single
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.of
+import kotlin.test.assertEquals
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class TimetableRepositoryTest {
+
+    @MockK
+    private lateinit var mockSdk: Sdk
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private lateinit var timetableRemote: TimetableRemote
+
+    private lateinit var timetableLocal: TimetableLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        timetableLocal = TimetableLocal(testDb.timetableDao)
+        timetableRemote = TimetableRemote(mockSdk)
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 2
+        every { semesterMock.schoolYear } returns 2019
+        every { semesterMock.semesterId } returns 1
+        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun copyRoomToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
+            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
+            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
+            createTimetableLocal(of(2019, 3, 5, 10, 30),3, "213", "W-F", "Jan Kowalski")
+        ))
+
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
+            createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
+            createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
+            createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(4, lessons.size)
+        assertEquals("123", lessons[0].room)
+        assertEquals("321", lessons[1].room)
+        assertEquals("213", lessons[2].room)
+    }
+
+    @Test
+    fun copyTeacherToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
+            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true),
+            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true),
+
+            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "", false),
+            createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
+            createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
+            createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
+        ))
+
+        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
+            createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
+            createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
+            createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
+            createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
+
+            createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
+            createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
+            createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+            .blockingGet()
+
+        assertEquals(12, lessons.size)
+
+        assertEquals("Paweł Poniedziałkowski", lessons[0].teacher)
+        assertEquals("Jakub Wtorkowski", lessons[1].teacher)
+        assertEquals("Joanna Poniedziałkowska", lessons[2].teacher)
+        assertEquals("Joanna Wtorkowska", lessons[3].teacher)
+
+        assertEquals("Joanna Wtorkowska", lessons[4].teacher)
+        assertEquals("", lessons[5].teacher)
+        assertEquals("", lessons[6].teacher)
+        assertEquals("", lessons[7].teacher)
+
+        assertEquals("Paweł Środowski", lessons[8].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[9].teacher)
+        assertEquals("Paweł Środowski", lessons[10].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[11].teacher)
+    }
+}

app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="30.434782"
+    android:viewportHeight="30.434782">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 8.131 2.131 C 7.601 2.131 7.092 2.342 6.717 2.717 C 6.342 3.092 6.131 3.601 6.131 4.131 L 6.131 18.131 C 6.131 18.661 6.342 19.17 6.717 19.545 C 7.092 19.92 7.601 20.131 8.131 20.131 L 16.918 20.131 C 17.252 19.39 17.712 18.714 18.277 18.131 L 8.131 18.131 L 8.131 4.131 L 22.131 4.131 L 22.131 16.1 C 22.516 16.034 22.906 16.001 23.297 16 C 23.576 16.002 23.854 16.02 24.131 16.055 L 24.131 4.131 C 24.131 3.601 23.92 3.092 23.545 2.717 C 23.17 2.342 22.661 2.131 22.131 2.131 L 8.131 2.131 Z M 2.131 6.131 L 2.131 22.131 C 2.131 22.661 2.342 23.17 2.717 23.545 C 3.092 23.92 3.601 24.131 4.131 24.131 L 16.391 24.131 C 16.329 23.757 16.297 23.379 16.297 23 C 16.299 22.709 16.319 22.419 16.357 22.131 L 4.131 22.131 L 4.131 6.131 L 2.131 6.131 Z M 14.131 6.131 C 13.601 6.131 13.092 6.342 12.717 6.717 C 12.342 7.092 12.131 7.601 12.131 8.131 L 12.131 14.131 C 12.131 15.231 13.031 16.131 14.131 16.131 L 16.131 16.131 C 16.661 16.131 17.17 15.92 17.545 15.545 C 17.92 15.17 18.131 14.661 18.131 14.131 L 18.131 12.131 C 18.131 11.601 17.92 11.092 17.545 10.717 C 17.17 10.342 16.661 10.131 16.131 10.131 L 14.131 10.131 L 14.131 8.131 L 18.131 8.131 L 18.131 6.131 L 14.131 6.131 Z M 14.131 12.131 L 16.131 12.131 L 16.131 14.131 L 14.131 14.131 L 14.131 12.131 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 20.174 28 L 20.174 18.521 L 23.091 18.521 Q 24.341 18.521 25.324 19.087 Q 26.314 19.647 26.867 20.689 Q 27.421 21.724 27.421 23.046 L 27.421 23.482 Q 27.421 24.803 26.874 25.832 Q 26.333 26.861 25.344 27.427 Q 24.354 27.993 23.111 28 Z M 22.128 20.103 L 22.128 26.431 L 23.072 26.431 Q 24.217 26.431 24.823 25.682 Q 25.428 24.934 25.441 23.54 L 25.441 23.039 Q 25.441 21.594 24.842 20.852 Q 24.243 20.103 23.091 20.103 Z" />
+</vector>

app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 10.734 3.043 C 9.234 3.043 8.043 4.293 8.043 5.793 C 8.043 7.683 9.743 9.223 13.043 12.223 C 16.343 9.223 18.043 7.684 18.043 5.734 C 18.043 4.234 16.793 3.043 15.293 3.043 C 14.433 3.043 13.613 3.403 13.043 4.043 C 12.473 3.403 11.654 3.043 10.734 3.043 Z M 5.734 8.043 C 4.234 8.043 3.043 9.293 3.043 10.793 C 3.043 11.653 3.403 12.473 4.043 13.043 C 3.403 13.613 3.043 14.434 3.043 15.354 C 3.043 16.854 4.293 18.043 5.793 18.043 C 7.683 18.043 9.223 16.343 12.223 13.043 C 9.223 9.743 7.684 8.043 5.734 8.043 Z M 20.293 8.043 C 18.403 8.043 16.863 9.743 13.873 13.043 C 15.043 14.334 15.987 15.373 16.824 16.168 C 17.476 15.484 18.26 14.94 19.129 14.567 C 19.997 14.195 20.932 14.002 21.877 14 C 22.181 14.002 22.484 14.025 22.785 14.066 C 22.615 13.68 22.365 13.329 22.043 13.043 C 22.683 12.473 23.043 11.654 23.043 10.734 C 23.043 9.234 21.793 8.043 20.293 8.043 Z M 13.043 13.863 C 9.743 16.863 8.043 18.404 8.043 20.354 C 8.043 21.854 9.293 23.043 10.793 23.043 C 11.653 23.043 12.473 22.683 13.043 22.043 C 13.576 22.642 14.333 22.982 15.182 23.025 C 14.981 22.369 14.879 21.686 14.877 21 C 14.88 19.52 15.351 18.078 16.225 16.883 C 15.422 16.032 14.368 15.067 13.043 13.863 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>

app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 5.043 3.043 C 3.943 3.043 3.053 3.943 3.053 5.043 L 3.043 23.043 L 7.043 19.043 L 15.16 19.043 C 15.646 17.378 16.733 15.952 18.209 15.043 L 7.043 15.043 L 7.043 13.043 L 19.043 13.043 L 19.043 14.609 C 19.935 14.211 20.9 14.003 21.877 14 C 22.268 14.003 22.658 14.038 23.043 14.105 L 23.043 5.043 C 23.043 3.943 22.143 3.043 21.043 3.043 L 5.043 3.043 Z M 7.043 7.043 L 19.043 7.043 L 19.043 9.043 L 7.043 9.043 L 7.043 7.043 Z M 7.043 10.043 L 19.043 10.043 L 19.043 12.043 L 7.043 12.043 L 7.043 10.043 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>

app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 3.043 3.043 L 3.043 12.043 C 3.043 13.043 4.043 14.043 5.043 14.043 L 7.244 14.043 C 7.644 16.043 8.943 17.743 12.043 18.043 L 12.043 20.143 C 9.843 20.343 9.043 21.444 9.043 22.744 L 9.043 23.043 L 15.188 23.043 C 14.983 22.381 14.879 21.693 14.877 21 C 14.877 20.763 14.888 20.527 14.912 20.291 C 14.649 20.226 14.364 20.172 14.043 20.143 L 14.043 18.043 C 14.68 17.981 15.224 17.848 15.717 17.678 C 16.382 16.446 17.401 15.442 18.643 14.795 C 18.725 14.551 18.792 14.299 18.844 14.043 L 21.043 14.043 C 22.043 14.043 23.043 13.043 23.043 12.043 L 23.043 3.043 L 19.043 3.043 C 18.143 3.043 17.043 4.043 17.043 5.043 L 9.043 5.043 C 9.043 4.043 7.943 3.043 7.043 3.043 L 3.043 3.043 Z M 5.043 5.043 L 7.043 5.043 L 7.043 12.043 L 5.043 12.043 L 5.043 5.043 Z M 19.043 5.043 L 21.043 5.043 L 21.043 12.043 L 19.043 12.043 L 19.043 5.043 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/colorPrimary" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
+</adaptive-icon>

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

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

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

@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+
+    <bool name="pref_default_notification_debug">true</bool>
+</resources>

app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt

@@ -0,0 +1,16 @@
+@file:Suppress("UNUSED_PARAMETER")
+
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import timber.log.Timber
+
+fun initCrashlytics(context: Context, appInfo: AppInfo) {}
+
+open class TimberTreeNoOp : Timber.Tree() {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
+}
+
+class CrashlyticsTree : TimberTreeNoOp()
+
+class CrashlyticsExceptionTree : TimberTreeNoOp()

app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt

@@ -0,0 +1,13 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FirebaseAnalyticsHelper @Inject constructor() {
+
+    @Suppress("UNUSED_PARAMETER")
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
+        // do nothing
+    }
+}

app/src/main/AndroidManifest.xml

@@ -18,14 +18,14 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen">
+            android:theme="@style/WulkanowyTheme.SplashScreen"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -33,26 +33,45 @@
             android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
-
-        <service
-            android:name=".services.job.SyncWorker"
-            android:exported="false">
+        <activity
+            android:name=".ui.modules.message.send.SendMessageActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/send_message_title"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
             <intent-filter>
-                <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
-        </service>
+        </activity>
+        <activity
+            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name=".services.widgets.TimetableWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver
-            android:name=".ui.widgets.timetable.TimetableWidgetProvider"
+            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
+            android:exported="true"
             android:label="@string/timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -61,6 +80,32 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/provider_widget_timetable" />
         </receiver>
+        <receiver
+            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider"
+            android:label="@string/lucky_number_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/provider_widget_lucky_number" />
+        </receiver>
+
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
+            tools:node="remove" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
 
         <meta-data
             android:name="io.fabric.ApiKey"
@@ -68,5 +113,13 @@
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${crashlytics_enabled}" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_stat_push" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="push_channel" />
     </application>
 </manifest>

app/src/main/assets/contributors.json

@@ -0,0 +1,38 @@
+[
+  {
+    "displayName": "Mikołaj Pich",
+    "githubUsername": "mklkj"
+  },
+  {
+    "displayName": "Rafał Borcz",
+    "githubUsername": "Faierbel"
+  },
+  {
+    "displayName": "Dominik Korsa",
+    "githubUsername": "dominik-korsa"
+  },
+  {
+    "displayName": "Kacper Ziubryniewicz",
+    "githubUsername": "kapi2289"
+  },
+  {
+    "displayName": "doteq",
+    "githubUsername": "doteq"
+  },
+  {
+    "displayName": "Paweł Krzyś",
+    "githubUsername": "pavuloff"
+  },
+  {
+    "displayName": "Piotr Romanowski",
+    "githubUsername": "v0idzz"
+  },
+  {
+    "displayName": "Dinolek",
+    "githubUsername": "Dinolek"
+  },
+  {
+    "displayName": "Mateusz Idziejczak",
+    "githubUsername": "PanTajemnic"
+  }
+]

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

@@ -1,28 +1,43 @@
 package io.github.wulkanowy
 
 import android.content.Context
-import androidx.appcompat.app.AppCompatDelegate
+import android.util.Log.DEBUG
+import android.util.Log.INFO
+import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
-import com.crashlytics.android.Crashlytics
-import com.crashlytics.android.core.CrashlyticsCore
+import androidx.work.Configuration
 import com.jakewharton.threetenabp.AndroidThreeTen
+import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.utils.Log
-import io.fabric.sdk.android.Fabric
-import io.github.wulkanowy.BuildConfig.DEBUG
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import fr.bipi.tressence.file.FileLoggerTree
 import io.github.wulkanowy.di.DaggerAppComponent
+import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import io.github.wulkanowy.ui.base.ThemeManager
+import io.github.wulkanowy.utils.ActivityLifecycleLogger
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.github.wulkanowy.utils.initCrashlytics
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject
 
-class WulkanowyApp : DaggerApplication() {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
-    lateinit var prefRepository: PreferencesRepository
+    lateinit var workerFactory: SyncWorkerFactory
+
+    @Inject
+    lateinit var themeManager: ThemeManager
+
+    @Inject
+    lateinit var appInfo: AppInfo
 
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
@@ -32,24 +47,46 @@ class WulkanowyApp : DaggerApplication() {
     override fun onCreate() {
         super.onCreate()
         AndroidThreeTen.init(this)
-        initializeFabric()
-        if (DEBUG) enableDebugLog()
-        AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
+        RxJavaPlugins.setErrorHandler(::onError)
+        Lingver.init(this)
+        themeManager.applyDefaultTheme()
+
+        initLogging()
+        initCrashlytics(this, appInfo)
     }
 
-    private fun enableDebugLog() {
-        Timber.plant(DebugLogTree())
-        FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+    private fun initLogging() {
+        if (appInfo.isDebug) {
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+            Timber.plant(DebugLogTree())
+            Timber.plant(FileLoggerTree.Builder()
+                .withFileName("wulkanowy.%g.log")
+                .withDirName(applicationContext.filesDir.absolutePath)
+                .withFileLimit(10)
+                .withMinPriority(DEBUG)
+                .build()
+            )
+        } else {
+            Timber.plant(CrashlyticsExceptionTree())
+            Timber.plant(CrashlyticsTree())
+        }
+        registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun initializeFabric() {
-        Fabric.with(Fabric.Builder(this).kits(
-            Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!BuildConfig.CRASHLYTICS_ENABLED).build()).build()
-        ).debuggable(BuildConfig.DEBUG).build())
-        Timber.plant(CrashlyticsTree())
+    private fun onError(error: Throwable) {
+        //RxJava's too deep stack traces may cause SOE on older android devices
+        val cause = error.cause
+        if (error is UndeliverableException && cause is IOException || cause is InterruptedException || cause is StackOverflowError) {
+            Timber.e(cause, "An undeliverable error occurred")
+        } else throw error
     }
 
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.builder().create(this)
+        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/ApiHelper.kt

@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data
-
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.entities.Student
-import java.net.URL
-import javax.inject.Inject
-
-class ApiHelper @Inject constructor(private val api: Api) {
-
-    fun initApi(student: Student) {
-        api.apply {
-            email = student.email
-            password = student.password
-            symbol = student.symbol
-            schoolSymbol = student.schoolSymbol
-            studentId = student.studentId
-            useNewStudent = false
-            host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
-            ssl = student.endpoint.startsWith("https")
-            loginType = Api.LoginType.valueOf(student.loginType)
-        }
-    }
-
-    fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        initApi(Student(email = email, password = password, symbol = symbol, endpoint = endpoint, loginType = "AUTO"))
-    }
-}

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

@@ -2,17 +2,20 @@ package io.github.wulkanowy.data
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.AssetManager
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
+import com.chuckerteam.chucker.api.ChuckerCollector
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.chuckerteam.chucker.api.RetentionManager
 import dagger.Module
 import dagger.Provides
-import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
-import okhttp3.logging.HttpLoggingInterceptor
-import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
-import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
+import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.sdk.Sdk
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -23,30 +26,45 @@ internal class RepositoryModule {
     @Provides
     fun provideInternetObservingSettings(): InternetObservingSettings {
         return InternetObservingSettings.builder()
-            .strategy(SocketInternetObservingStrategy())
-            .host("www.google.com")
+            .strategy(WalledGardenInternetObservingStrategy())
             .build()
     }
 
     @Singleton
     @Provides
-    fun provideApi(): Api {
-        return Api().apply {
-            logLevel = NONE
+    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
+        return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
-            setInterceptor(HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { Timber.d(it) }).setLevel(BASIC))
+            setSimpleHttpLogger { Timber.d(it) }
+
+            // for debug only
+            addInterceptor(ChuckerInterceptor(context, chuckerCollector), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideDatabase(context: Context) = AppDatabase.newInstance(context)
+    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
+        return ChuckerCollector(
+            context = context,
+            showNotification = prefRepository.isDebugNotificationEnable,
+            retentionPeriod = RetentionManager.Period.ONE_HOUR
+        )
+    }
+
+    @Singleton
+    @Provides
+    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
     fun provideResources(context: Context): Resources = context.resources
 
+    @Singleton
+    @Provides
+    fun provideAssets(context: Context): AssetManager = context.assets
+
     @Singleton
     @Provides
     fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
@@ -67,10 +85,22 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
 
+    @Singleton
+    @Provides
+    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
+
+    @Singleton
+    @Provides
+    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
+
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
 
+    @Singleton
+    @Provides
+    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
+
     @Singleton
     @Provides
     fun provideExamDao(database: AppDatabase) = database.examsDao
@@ -98,4 +128,32 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSubjectDao(database: AppDatabase) = database.subjectDao
+
+    @Singleton
+    @Provides
+    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
+
+    @Singleton
+    @Provides
+    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
+
+    @Singleton
+    @Provides
+    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+
+    @Singleton
+    @Provides
+    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
+
+    @Singleton
+    @Provides
+    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
+
+    @Singleton
+    @Provides
+    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
+
+    @Singleton
+    @Provides
+    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
 }

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

@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import javax.inject.Inject
+
+class SdkHelper @Inject constructor(private val sdk: Sdk) {
+
+    fun init(student: Student) {
+        sdk.apply {
+            email = student.email
+            password = student.password
+            symbol = student.symbol
+            schoolSymbol = student.schoolSymbol
+            studentId = student.studentId
+            classId = student.classId
+
+            if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+                scrapperBaseUrl = student.scrapperBaseUrl
+                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+            }
+            loginId = student.userLoginId
+
+            mode = Sdk.Mode.valueOf(student.loginMode)
+            mobileBaseUrl = student.mobileBaseUrl
+            certKey = student.certificateKey
+            privateKey = student.privateKey
+        }
+    }
+}

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

@@ -6,30 +6,75 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
+import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
+import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
+import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
+import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
+import io.github.wulkanowy.data.db.dao.RecipientDao
+import io.github.wulkanowy.data.db.dao.ReportingUnitDao
+import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
+import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.migrations.Migration10
+import io.github.wulkanowy.data.db.migrations.Migration11
+import io.github.wulkanowy.data.db.migrations.Migration12
+import io.github.wulkanowy.data.db.migrations.Migration13
+import io.github.wulkanowy.data.db.migrations.Migration14
+import io.github.wulkanowy.data.db.migrations.Migration15
+import io.github.wulkanowy.data.db.migrations.Migration16
+import io.github.wulkanowy.data.db.migrations.Migration17
+import io.github.wulkanowy.data.db.migrations.Migration18
+import io.github.wulkanowy.data.db.migrations.Migration19
+import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration20
+import io.github.wulkanowy.data.db.migrations.Migration21
+import io.github.wulkanowy.data.db.migrations.Migration22
+import io.github.wulkanowy.data.db.migrations.Migration23
+import io.github.wulkanowy.data.db.migrations.Migration24
+import io.github.wulkanowy.data.db.migrations.Migration25
+import io.github.wulkanowy.data.db.migrations.Migration3
+import io.github.wulkanowy.data.db.migrations.Migration4
+import io.github.wulkanowy.data.db.migrations.Migration5
+import io.github.wulkanowy.data.db.migrations.Migration6
+import io.github.wulkanowy.data.db.migrations.Migration7
+import io.github.wulkanowy.data.db.migrations.Migration8
+import io.github.wulkanowy.data.db.migrations.Migration9
 import javax.inject.Singleton
 
 @Singleton
@@ -43,21 +88,65 @@ import javax.inject.Singleton
         AttendanceSummary::class,
         Grade::class,
         GradeSummary::class,
+        GradeStatistics::class,
+        GradePointsStatistics::class,
         Message::class,
+        MessageAttachment::class,
         Note::class,
         Homework::class,
-        Subject::class
+        Subject::class,
+        LuckyNumber::class,
+        CompletedLesson::class,
+        ReportingUnit::class,
+        Recipient::class,
+        MobileDevice::class,
+        Teacher::class,
+        School::class
     ],
-    version = 1,
-    exportSchema = false
+    version = AppDatabase.VERSION_SCHEMA,
+    exportSchema = true
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        fun newInstance(context: Context): AppDatabase {
+        const val VERSION_SCHEMA = 25
+
+        fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17(),
+                Migration18(),
+                Migration19(sharedPrefProvider),
+                Migration20(),
+                Migration21(),
+                Migration22(),
+                Migration23(),
+                Migration24(),
+                Migration25()
+            )
+        }
+
+        fun newInstance(context: Context, sharedPrefProvider: SharedPrefProvider): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
+                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
+                .fallbackToDestructiveMigrationOnDowngrade()
+                .addMigrations(*getMigrations(sharedPrefProvider))
                 .build()
         }
     }
@@ -78,11 +167,31 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeSummaryDao: GradeSummaryDao
 
+    abstract val gradeStatistics: GradeStatisticsDao
+
+    abstract val gradePointsStatistics: GradePointsStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
+    abstract val messageAttachmentDao: MessageAttachmentDao
+
     abstract val noteDao: NoteDao
 
     abstract val homeworkDao: HomeworkDao
 
     abstract val subjectDao: SubjectDao
+
+    abstract val luckyNumberDao: LuckyNumberDao
+
+    abstract val completedLessonsDao: CompletedLessonsDao
+
+    abstract val reportingUnitDao: ReportingUnitDao
+
+    abstract val recipientDao: RecipientDao
+
+    abstract val mobileDeviceDao: MobileDeviceDao
+
+    abstract val teacherDao: TeacherDao
+
+    abstract val schoolDao: SchoolDao
 }

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

@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import org.threeten.bp.DateTimeUtils
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDate
@@ -36,4 +38,24 @@ class Converters {
 
     @TypeConverter
     fun intToMonth(value: Int?) = value?.let { Month.of(it) }
+
+    @TypeConverter
+    fun intListToGson(list: List<Int>): String {
+        return Gson().toJson(list)
+    }
+
+    @TypeConverter
+    fun gsonToIntList(value: String): List<Int> {
+        return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
+    }
+
+    @TypeConverter
+    fun stringPairListToGson(list: List<Pair<String, String>>): String {
+        return Gson().toJson(list)
+    }
+
+    @TypeConverter
+    fun gsonToStringPairList(value: String): List<Pair<String, String>> {
+        return Gson().fromJson(value, object : TypeToken<List<Pair<String, String>>>() {}.type)
+    }
 }

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

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

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

@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
+
+    companion object {
+        const val APP_VERSION_CODE_KEY = "app_version_code"
+    }
+
+    fun putLong(key: String, value: Long, sync: Boolean = false) {
+        sharedPref.edit(sync) { putLong(key, value) }
+    }
+
+    fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
+
+    fun getString(key: String, defaultValue: String): String = sharedPref.getString(key, defaultValue) ?: defaultValue
+
+    fun putString(key: String, value: String, sync: Boolean = false) {
+        sharedPref.edit(sync) { putString(key, value) }
+    }
+
+    fun delete(key: String) {
+        sharedPref.edit().remove(key).apply()
+    }
+}

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

@@ -1,8 +1,6 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.reactivex.Maybe
@@ -11,13 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface AttendanceDao {
-
-    @Insert
-    fun insertAll(exams: List<Attendance>): List<Long>
-
-    @Delete
-    fun deleteAll(exams: List<Attendance>)
+interface AttendanceDao : BaseDao<Attendance> {
 
     @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>