Merge branch 'release/0.11.0'

Version 0.10.2

.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 publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2

.gitignore

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

@@ -2,7 +2,7 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
     </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
@@ -21,38 +21,10 @@
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
+    <MarkdownNavigatorCodeStyleSettings>
-      <file>
+      <option name="RIGHT_MARGIN" value="72" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+    </MarkdownNavigatorCodeStyleSettings>
-        <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>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -63,6 +35,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -73,6 +46,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -84,6 +58,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -94,6 +69,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -104,6 +80,7 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -114,6 +91,7 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -124,6 +102,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -135,6 +114,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -146,6 +126,7 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -163,7 +144,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,18 +3,18 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=28
+    - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
 
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-#branches:
+branches:
-#  only:
+  only:
-#  - master
+    - develop
-#  - 0.7.x
+    - 0.11.0
 
 android:
  licenses:
@@ -34,12 +34,12 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-19
+    - android-22
-    - sys-img-armeabi-v7a-android-19
+    - 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 &
@@ -48,20 +48,20 @@ before_script:
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
-  - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
+  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
   - ./gradlew 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 publish -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 student and parent
+
+## Features
+
+* logging in using the email and password
+* functions from the register website:
+    * grades
+    * grade statistics
+    * attendance
+    * percentage of attendance
+    * exams
+    * timetable
+    * completed lessons
+    * messages
+    * homework
+    * notes
+    * lucky number
+* calculation of the average
+* notifications, e.g. about a new grade
+* dark and black (AMOLED) theme
+* offline mode
+* no ads
+
+## Download
+
+You can download the current beta from the Google Play or Fdroid store
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Get it on Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on Fdroid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+    
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release
+
+## Built With
+
+
+* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Contributing
+
+Please contribute to the project either by creating a PR or submitting an issue on GitHub.
+
+## License
+
+This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details

README.md

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

app/.gitignore

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

app/build.gradle

@@ -6,28 +6,32 @@ apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
+apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 15
+        minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
-        versionCode 31
+        versionCode 46
-        versionName "0.7.5"
+        versionName "0.11.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         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()]
+                arguments = [
+                        "room.schemaLocation": "$projectDir/schemas".toString(),
+                        "room.incremental"   : "true"
+                ]
             }
         }
     }
@@ -59,7 +63,19 @@ android {
             versionNameSuffix "-dev"
             testCoverageEnabled = true
             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"
         }
     }
 
@@ -71,6 +87,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    packagingOptions {
+        exclude 'META-INF/library_release.kotlin_module'
+        exclude 'META-INF/library-core_release.kotlin_module'
+    }
 }
 
 androidExtensions {
@@ -80,74 +105,97 @@ androidExtensions {
 play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
-    defaultToAppBundles = true
+    defaultToAppBundles = false
     track = 'alpha'
 }
 
+ext {
+    work_manager = "2.2.0"
+    room = "2.2.0-rc01"
+    dagger = "2.24"
+    chucker = "2.0.4"
+    mockk = "1.9.2"
+}
+
+configurations.all {
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
+    resolutionStrategy.force "com.google.android.material:material:1.1.0-alpha07"
+}
+
 dependencies {
+    implementation "io.github.wulkanowy:api:0.11.0"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation('io.github.wulkanowy:api:0.7.5') { exclude module: "threetenbp" }
+    implementation "androidx.core:core-ktx:1.1.0"
+    implementation "androidx.activity:activity-ktx:1.0.0"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.1.0"
+    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.preference:preference-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.0.2"
+    implementation "androidx.recyclerview:recyclerview:1.1.0-beta04"
-    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "com.google.android.material:material:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-beta01"
+    implementation "com.google.android.material:material:1.1.0-alpha07"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
+    implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
+    implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
-    implementation "android.arch.work:work-runtime:1.0.0"
+    implementation "androidx.work:work-runtime-ktx:$work_manager"
-    implementation "android.arch.work:work-rxjava2:1.0.0"
+    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.room:room-runtime:2.1.0-alpha06"
+    implementation "androidx.room:room-runtime:$room"
-    implementation "androidx.room:room-rxjava2:2.1.0-alpha06"
+    implementation "androidx.room:room-rxjava2:$room"
-    kapt "androidx.room:room-compiler:2.1.0-alpha06"
+    implementation "androidx.room:room-ktx:$room"
+    kapt "androidx.room:room-compiler:$room"
 
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+    implementation "com.google.dagger:dagger-android-support:$dagger"
-
+    kapt "com.google.dagger:dagger-compiler:$dagger"
-    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.3.3'
+    kapt "com.google.dagger:dagger-android-processor:$dagger"
-    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3'
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
-
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
-    implementation "com.google.dagger:dagger-android-support:2.21"
-    kapt "com.google.dagger:dagger-compiler:2.21"
-    kapt "com.google.dagger:dagger-android-processor:2.21"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation 'com.ncapdevi:frag-nav:3.2.0'
+    implementation "com.ncapdevi:frag-nav:3.3.0"
 
-    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.13"
 
-    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
+    implementation "com.google.code.gson:gson:2.8.6"
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.7"
-
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.0"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.mikepenz:aboutlibraries:6.2.3"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
+    implementation "com.mikepenz:aboutlibraries:7.0.3"
 
-    implementation 'com.google.firebase:firebase-core:16.0.8'
+    playImplementation "com.google.firebase:firebase-core:17.2.0"
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
-    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.4'
+    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
 
-    debugImplementation 'fr.o80.chucker:library:2.0.4'
+    debugImplementation "fr.o80.chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.9.2"
+    testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.mockito:mockito-inline:2.25.1"
+    testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation 'org.threeten:threetenbp:1.3.8'
+    testImplementation "org.mockito:mockito-inline:3.1.0"
 
-    androidTestImplementation 'androidx.test:core:1.1.0'
+    androidTestImplementation "androidx.test:core:1.2.0"
-    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation "androidx.test:runner:1.2.0"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
-    androidTestImplementation "io.mockk:mockk-android:1.9.2"
+    androidTestImplementation "io.mockk:mockk-android:$mockk"
-    androidTestImplementation 'org.mockito:mockito-android:2.25.1'
+    androidTestImplementation "androidx.room:room-testing:$room"
-    androidTestImplementation "androidx.room:room-testing:2.1.0-alpha06"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    androidTestImplementation "org.mockito:mockito-android:3.1.0"
 }
 
 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.3"
+    toolVersion "0.8.4"
     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")
+    sourceDirectories.setFrom(files([
-    executionData = fileTree(
+            "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

@@ -11,6 +11,10 @@
 -verbose
 
 
+#Keep all wulkanowy files
+-keep class io.github.wulkanowy.** {*;}
+
+
 #Config for anallitycs
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
@@ -32,8 +36,10 @@
 -dontwarn rx.internal.util.**
 -dontwarn sun.misc.Unsafe
 
+
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }
 
-#Config for API
+
--keep class io.github.wulkanowy.api.** {*;}
+#Config for Material Components
+-keep class com.google.android.material.tabs.** { *; }

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

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

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

@@ -3,10 +3,14 @@ package io.github.wulkanowy.data.db.migrations
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.wulkanowy.data.db.Converters
+import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Test
+import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.of
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class Migration13Test : AbstractMigrationTest() {
@@ -97,11 +101,9 @@ class Migration13Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
+        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
-        val db = getMigratedRoomDatabase()
+        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-
-        val semesters1 = db.semesterDao.loadAll(1, 5).blockingGet()
         assertTrue { semesters1.single { it.isCurrent }.isCurrent }
         semesters1[0].run {
             assertFalse(isCurrent)
@@ -119,7 +121,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, diaryId)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertEquals(1970, it[0].schoolYear)
             assertEquals(of(1970, 1, 1), it[0].end)
@@ -130,7 +132,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertTrue(it[3].isCurrent)
         }
 
-        db.semesterDao.loadAll(2, 5).blockingGet().let {
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
             assertTrue { it.single { it.isCurrent }.isCurrent }
             assertFalse(it[0].isCurrent)
             assertFalse(it[1].isCurrent)
@@ -139,6 +141,30 @@ class Migration13Test : AbstractMigrationTest() {
         }
     }
 
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
+        val semesters = mutableListOf<Semester>()
+
+        val cursor = db.query(query)
+        if (cursor.moveToFirst()) {
+            do {
+                semesters.add(Semester(
+                    studentId = cursor.getInt(1),
+                    diaryId = cursor.getInt(2),
+                    diaryName = cursor.getString(3),
+                    semesterId = cursor.getInt(4),
+                    semesterName = cursor.getInt(5),
+                    isCurrent = cursor.getInt(6) == 1,
+                    classId = cursor.getInt(7),
+                    unitId = cursor.getInt(8),
+                    schoolYear = cursor.getInt(9),
+                    start = Converters().timestampToDate(cursor.getLong(10))!!,
+                    end = Converters().timestampToDate(cursor.getLong(11))!!
+                ))
+            } while (cursor.moveToNext())
+        }
+        return semesters.toList()
+    }
+
     private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, schoolName: String = "", classId: Int = -1, schoolId: Int = 123) {
         db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
             put("endpoint", "https://fakelog.cf")

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

@@ -22,6 +22,7 @@ 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
 import io.github.wulkanowy.api.grades.Grade as GradeApi
@@ -109,4 +110,73 @@ class GradeRepositoryTest {
         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 { mockApi.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 { mockApi.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 { mockApi.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 { mockApi.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/gradestatistics/GradeStatisticsLocalTest.kt

@@ -4,6 +4,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import org.junit.After
@@ -24,7 +25,7 @@ class GradeStatisticsLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics)
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
     }
 
     @After
@@ -63,7 +64,52 @@ class GradeStatisticsLocalTest {
         assertEquals(stats[0].subject, "Wszystkie")
     }
 
+    @Test
+    fun saveAndRead_points() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+            getGradePointsStatistics("Matematyka", 2, 1),
+            getGradePointsStatistics("Chemia", 2, 1),
+            getGradePointsStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        with(stats) {
+            assertEquals(subject, "Matematyka")
+            assertEquals(others, 5.0)
+            assertEquals(student, 5.0)
+        }
+    }
+
+    @Test
+    fun saveAndRead_subjectEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        assertEquals(null, stats)
+    }
+
+    @Test
+    fun saveAndRead_allEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(null, stats)
+    }
+
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
         return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
     }
+
+    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
+        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
+    }
 }

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

@@ -5,7 +5,7 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
@@ -21,14 +21,14 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedHelper: SharedPrefHelper
+    private lateinit var sharedProvider: SharedPrefProvider
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
@@ -39,7 +39,7 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = ""))
+        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
             .blockingGet()
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()

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

@@ -7,7 +7,7 @@ import org.threeten.bp.LocalDateTime.now
 import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
 
-fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = ""): TimetableLocal {
+fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
         studentId = 1,
         diaryId = 2,
@@ -20,15 +20,15 @@ fun createTimetableLocal(number: Int, start: LocalDateTime, room: String = "", s
         group = "",
         room = room,
         roomOld = "",
-        teacher = "",
+        teacher = teacher,
         teacherOld = "",
         info = "",
-        changes = false,
+        changes = changes,
         canceled = false
     )
 }
 
-fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = ""): TimetableRemote {
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
     return TimetableRemote(
         number = number,
         start = start.toDate(),
@@ -37,9 +37,9 @@ fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subje
         subject = subject,
         group = "",
         room = room,
-        teacher = "",
+        teacher = teacher,
         info = "",
-        changes = false,
+        changes = changes,
         canceled = false
     )
 }

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

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

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

@@ -1,58 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="1926.9231"
-        android:viewportHeight="1926.9231">
-    <group android:translateX="462.46155"
-            android:translateY="462.46155">
-      <path
-          android:pathData="M2000,1440.1V2002H1240.1L238.1,1000v0l-120,-120c0.2,-0.2 -0.7,-1.6 -0.6,-1.8 1.6,-3.1 3.4,-6 5,-9.1 0.4,-0.8 0.6,-1.6 0.6,-2.5 9.2,-15.1 20.2,-28.9 31.4,-42.6 0.1,-0.2 0.3,-0.3 0.4,-0.5 5.1,-6.3 10.3,-12.6 15.3,-18.9 1,-1.2 1.9,-2.4 2.9,-3.7 0.2,-0.2 0.3,-0.4 0.5,-0.6 7.6,-9.7 14.8,-19.7 21.2,-30.2 1,-1.7 2,-3.4 2.9,-5.1 0.1,-0.2 0.2,-0.3 0.3,-0.5 6.2,-11.4 11.3,-23.3 17.7,-34.6 4.5,-8 9.3,-15.9 13.8,-23.9 0.1,-0.2 0.2,-0.3 0.3,-0.5 0.8,-1.5 1.6,-3 2.4,-4.4 0.2,-0.3 0.3,-0.6 0.5,-0.9 2,-3.7 3.8,-7.4 5.6,-11.2 6.2,-13.4 10.2,-27.7 14,-41.9 0,-0.2 0.1,-0.3 0.1,-0.5 0.3,-1 0.5,-2 0.8,-2.9 4,-15.3 7.3,-31.4 13.5,-45.9 1.4,-3.3 3,-6.5 4.6,-9.6 0.1,-0.2 0.2,-0.3 0.3,-0.5 5,-9.7 10.6,-19.1 13.5,-29.7 2.6,-9.2 3.5,-19 3.6,-28.8 0,-0.2 0,-0.3 0,-0.5 0.1,-7.2 -0.1,-14.4 -0.4,-21.3 0.9,-5.6 1.9,-11.3 3,-16.9 0.2,-0.9 0.3,-1.7 0.5,-2.6 1.2,-5.9 2.5,-11.7 4.2,-17.4 0,-0.1 0.1,-0.3 0.1,-0.4 0,-0.2 0.1,-0.3 0.1,-0.5 0.2,-2.1 -0.8,-3.7 -2.4,-4.5l7.7,-7.6c1.2,0.9 2.7,1.3 4.3,0.9 12.8,-3.9 24.9,-9.9 36.3,-16.8 2.8,-1.7 5.6,-3.4 8.3,-5.2 0.2,-0.1 0.3,-0.2 0.5,-0.3 7.7,-4.9 15.2,-10.2 22.1,-16 3.1,-2.7 5.9,-5.6 8.3,-8.9 0.1,-0.2 0.2,-0.3 0.4,-0.5 2.3,-3.4 4.2,-7.2 5.3,-11.4 2.4,-9.2 1.9,-19 1.9,-28.4 0,-0.2 0,-0.4 0,-0.6l5.7,-5.6 -0.3,0.1 4.1,1.3 45.3,45 9.6,9.6 14.3,14.3 100.8,100.8 17.2,17.2 16.3,16.3 30.3,-30.3 -192.9,-191.5c0.5,-0.5 1.1,-1.6 1.4,-2.3 0.3,-0.6 0.5,-1.2 0.4,-1.9 0,-0.8 -0.2,-1.6 -0.6,-2.3 -0.1,-0.3 -0.3,-0.7 -0.4,-1 -0.2,-0.4 -0.5,-0.7 -0.9,-1.1l27.8,-27.8 191.1,-191.1c0.7,0.4 1.5,0.6 2.5,0.7 4.1,0 8.2,0.1 11.9,1.9 0.5,0.3 1.3,0.7 2.1,1.1 1.7,2.3 3.5,4.5 5.7,6.2 2.7,2.1 8.2,3 9.4,0.3z"
-          android:fillColor="#AD2A2A"/>
-      <path
-          android:pathData="m616.3,796.7c0.4,1.2 0.5,2.4 0.5,3.7l-5.8,73.3c-0.4,5.2 -5,9.3 -10.6,9.3h-187.2c-4,0 -7.7,-2.3 -9.5,-5.6l-30.9,-57.4c-0.2,-0.3 -0.3,-0.6 -0.4,-0.9l-29.1,-70.5c-1.1,-2.5 -0.9,-5.4 0.3,-7.8l48.3,-94.5c1.2,-2.3 1.4,-5 0.5,-7.4l-23.6,-65.4c-0.8,-2.3 -0.7,-4.9 0.3,-7.1l39.4,-83.9c4,-8.4 17.1,-7.7 19.9,1.1l12.3,38.2 37.5,100.4c1,2.8 3.4,5 6.4,6l80,27.3c3.1,1.1 5.5,3.4 6.5,6.3z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m386.7,253.5c0,-22.9 14.5,-42.6 35.3,-51.8 -1.5,-2.5 -2.4,-5.2 -2.4,-8.1 0,-11.1 12.8,-20.1 28.5,-20.1 0.4,0 0.7,0 1.1,0 6.5,-10.8 18.9,-18.1 33.1,-18.1 1,0 2,0 3,0.1 1.3,0.1 2.6,-0.5 3.3,-1.5 10.5,-16 37.1,-27.4 68.2,-27.4 11.5,0 22.4,1.6 32.1,4.3 2.3,-3.8 7.4,-6.4 13.3,-6.4 6.7,0 12.4,3.4 14.1,8.1 8.2,-9.5 22.1,-15.7 37.9,-15.7 25.2,0 45.6,15.9 45.6,35.5 0,2.4 -0.3,4.7 -0.9,7 -0.4,1.6 0.5,3.2 2.2,3.8 16.1,5.9 27,17.1 27,29.9 0,14.6 -14.1,27.1 -34,32 -1.6,0.4 -2.6,1.8 -2.6,3.3 0,0.1 0,0.2 0,0.3 0,11.3 -11.2,20.6 -25.6,21.6 0.1,0.5 0.1,1 0.1,1.6 0,21.7 -41.3,39.2 -92.2,39.2 -11,0 -21.5,-0.8 -31.2,-2.3 0,0.2 0,0.3 0,0.5 0,9 -11.6,16.3 -25.8,16.3 -0.8,0 -1.5,0 -2.2,-0.1 1,2.2 1.5,4.5 1.5,6.9 0,14 -17.7,25.3 -39.6,25.3 -2.4,0 -4.7,-0.1 -7,-0.4 -1.8,-0.2 -3.5,0.9 -3.9,2.6 -1.9,7 -8,12.1 -15.3,12.1 -8.8,0 -15.8,-7.5 -15.8,-16.7 0,-4.3 1.5,-8.2 4,-11.1 0.9,-1 1.2,-2.4 0.6,-3.6 -1.4,-2.6 -2,-5.3 -2,-8.2v0c0,-1.6 -1.3,-2.9 -2.9,-3.3 -27.1,-6 -47.5,-28.6 -47.5,-55.6z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m870.4,883h-124.4c-3.6,0 -6.9,-1.8 -8.9,-4.6l-83.7,-117.7c-0.5,-0.8 -1,-1.6 -1.3,-2.5l-41.5,-121.2c-0.8,-2.4 -2.7,-4.5 -5.1,-5.7l-101.6,-51.3c-2.8,-1.4 -4.8,-4 -5.4,-6.9l-15,-74.4c-0.2,-1.2 -0.7,-2.4 -1.5,-3.5l-34.5,-50.7c-1.9,-2.8 -2.2,-6.2 -0.8,-9.2l21,-44.9c1.6,-3.4 5.1,-5.7 9.1,-5.9l39,-2.3c2.3,-0.1 4.4,-0.9 6.1,-2.3l28.7,-22.3c5.4,-4.2 13.6,-2.4 16.5,3.5l98.9,201.2c0.4,0.9 0.7,1.8 0.9,2.7l12.2,80.9c0.3,1.9 1.1,3.6 2.4,5l197,215.6c5.8,6.4 0.9,16.5 -8.1,16.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m335.8,838.9c0.8,2.6 0.4,5.4 -1,7.7l-19.3,31.3c-1.9,3.1 -5.4,5.1 -9.2,5.1h-180.6c-8.4,0 -13.5,-8.8 -9,-15.4l116.3,-171.3c0.7,-1 1.1,-2.1 1.4,-3.2l53.3,-227.6c0.6,-2.7 2.4,-5 5,-6.4l72.2,-39.6c2.6,-1.4 4.4,-3.7 5,-6.5l9.7,-42.3c2,-8.8 14.6,-10.7 19.6,-3l3.5,5.6c1.5,2.4 1.9,5.4 0.9,8.1l-65.8,190.2c-0.5,1.5 -0.7,3.1 -0.4,4.7l16.4,91c0.3,1.8 0.1,3.7 -0.7,5.4l-39.1,87.8c-0.9,2.1 -1.1,4.4 -0.4,6.5z"
-          android:fillColor="#FFFFFF"/>
-      <path
-          android:pathData="m424.22,657.05 l1580.54,-0.05c0.54,0 0,292 0,292l-1580.54,-0.03c-10.78,0 -19.46,-8.68 -19.46,-19.46l0,-252.99c0,-10.78 8.68,-19.46 19.46,-19.46z"
-          android:strokeAlpha="0.49803922"
-          android:strokeLineJoin="round"
-          android:strokeWidth="4"
-          android:fillColor="#3f3f3f"
-          android:strokeColor="#00000000"
-          android:fillType="nonZero"
-          android:fillAlpha="1"
-          android:strokeLineCap="square"/>
-      <path
-          android:pathData="m728.71,710.91l0,19.89l-88.7,0l0,59.3l77.04,0L717.05,810l-77.04,0l0,65.39l89.84,0l0,19.9L616.56,895.29L616.56,791.16l-52.35,-52.35 -0.77,-0.18c5.41,6.64 9.65,14.32 12.69,23.09 3.72,10.39 5.62,21.92 5.7,34.6L581.84,809.87c-0.08,12.67 -1.98,24.25 -5.7,34.72 -3.63,10.39 -8.95,19.35 -15.97,26.87 -6.93,7.43 -15.46,13.26 -25.6,17.49 -7.54,3.1 -15.86,5.07 -24.97,5.89 -3.04,0.27 -6.16,0.42 -9.37,0.45L457.53,895.29l0,-6.55l-0.37,6.82 53.8,53.45l415.85,0c0.24,0 0.47,-0.02 0.69,-0.05L1132.91,948.97L953.5,769.55l-58.39,-58.39 -0.28,0.06 -58.03,184.06l-20.4,0l-44.66,-141.34zM783.29,711.07 L826.41,857.52 850.08,777.86zM509.6,711.29c1.52,0.15 3.01,0.33 4.49,0.54 -1.47,-0.21 -2.97,-0.39 -4.49,-0.54zM481.35,730.04l0,146.11l18.88,0c9.97,-0.08 18.59,-1.81 25.85,-5.19 7.27,-3.46 13.26,-8.15 17.99,-14.07 4.82,-5.91 8.36,-12.88 10.64,-20.91 2.37,-8.03 3.59,-16.73 3.68,-26.11l0,-13.81c-0.08,-9.38 -1.31,-18.04 -3.68,-25.98 -2.37,-8.03 -5.91,-14.95 -10.64,-20.78 -4.73,-5.91 -10.73,-10.56 -17.99,-13.94 -7.27,-3.38 -15.88,-5.15 -25.85,-5.32zM560.17,734.86c0.65,0.69 1.26,1.4 1.88,2.11 -0.61,-0.72 -1.23,-1.42 -1.88,-2.11z"
-          android:strokeAlpha="1"
-          android:strokeLineJoin="miter"
-          android:strokeWidth="1.94642854"
-          android:fillColor="#000000"
-          android:strokeColor="#00000000"
-          android:fillAlpha="0.18431373"
-          android:strokeLineCap="butt"/>
-      <path
-          android:pathData="m457.53,895.28l0,-184.51l42.7,0q19.26,0.25 34.34,6.59 15.21,6.21 25.6,17.49 10.52,11.15 15.97,26.86 5.58,15.59 5.7,34.59l0,13.56q-0.13,19.01 -5.7,34.72 -5.45,15.59 -15.97,26.86 -10.39,11.15 -25.6,17.49 -15.08,6.21 -34.34,6.34zM481.35,730.04l0,146.11l18.88,0q14.95,-0.13 25.85,-5.2 10.9,-5.2 17.99,-14.07 7.22,-8.87 10.64,-20.91 3.55,-12.04 3.67,-26.1l0,-13.81q-0.13,-14.07 -3.67,-25.98 -3.55,-12.04 -10.64,-20.78 -7.1,-8.87 -17.99,-13.94 -10.9,-5.07 -25.85,-5.32z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="M717.05,810L640.01,810l0,65.39l89.84,0l0,19.9l-113.29,0l0,-184.51l112.15,0l0,20.02L640.01,730.8l0,59.31l77.05,0z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-      <path
-          android:pathData="m826.41,857.52 l43.59,-146.74l24.96,0l-58.16,184.51L816.4,895.28l-58.29,-184.51l25.09,0z"
-          android:fillColor="#ffffff"
-          android:strokeColor="#00000000"
-          android:fillAlpha="1"/>
-    </group>
-</vector>

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

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

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

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

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

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

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

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

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

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

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

@@ -4,8 +4,6 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
-    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -34,6 +32,7 @@
             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"
@@ -44,14 +43,33 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
+        <activity
+            android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </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>
@@ -61,6 +79,16 @@
                 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"

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

@@ -1,39 +1,40 @@
 package io.github.wulkanowy
 
 import android.content.Context
-import androidx.appcompat.app.AppCompatDelegate
+import android.util.Log.INFO
+import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
-import androidx.work.WorkManager
-import com.crashlytics.android.Crashlytics
-import com.crashlytics.android.core.CrashlyticsCore
 import com.jakewharton.threetenabp.AndroidThreeTen
 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.preferences.PreferencesRepository
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import io.github.wulkanowy.ui.base.ThemeManager
+import io.github.wulkanowy.utils.ActivityLifecycleLogger
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.CrashlyticsTree
 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 java.lang.Exception
 import javax.inject.Inject
 
-class WulkanowyApp : DaggerApplication() {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
-
-    @Inject
-    lateinit var prefRepository: PreferencesRepository
 
     @Inject
     lateinit var workerFactory: SyncWorkerFactory
 
+    @Inject
+    lateinit var themeManager: ThemeManager
+
+    @Inject
+    lateinit var appInfo: AppInfo
+
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         MultiDex.install(this)
@@ -42,32 +43,37 @@ class WulkanowyApp : DaggerApplication() {
     override fun onCreate() {
         super.onCreate()
         AndroidThreeTen.init(this)
-        initializeFabric()
-        if (DEBUG) enableDebugLog()
-        AppCompatDelegate.setDefaultNightMode(prefRepository.currentTheme)
-        WorkManager.initialize(this, Configuration.Builder().setWorkerFactory(workerFactory).build())
         RxJavaPlugins.setErrorHandler(::onError)
+        themeManager.applyDefaultTheme()
+
+        initLogging()
+        initCrashlytics(this, appInfo)
     }
 
-    private fun enableDebugLog() {
+    private fun initLogging() {
-        Timber.plant(DebugLogTree())
+        if (appInfo.isDebug) {
-        FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+            Timber.plant(DebugLogTree())
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+        } else {
+            Timber.plant(CrashlyticsTree())
+        }
+        registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun initializeFabric() {
+    private fun onError(error: Throwable) {
-        Fabric.with(Fabric.Builder(this).kits(
+        //RxJava's too deep stack traces may cause SOE on older android devices
-            Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!BuildConfig.CRASHLYTICS_ENABLED).build()).build()
+        val cause = error.cause
-        ).debuggable(BuildConfig.DEBUG).build())
+        if (error is UndeliverableException && cause is IOException || cause is InterruptedException || cause is StackOverflowError) {
-        Timber.plant(CrashlyticsTree())
+            Timber.e(cause, "An undeliverable error occurred")
-    }
+        } else throw error
-
-    private fun onError(t: Throwable) {
-        if (t is UndeliverableException && t.cause is IOException || t.cause is InterruptedException) {
-            Timber.e(t.cause, "An undeliverable error occurred")
-        } else throw t
     }
 
     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/RepositoryModule.kt

@@ -85,6 +85,10 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
 
+    @Singleton
+    @Provides
+    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
+
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -132,4 +136,12 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideRecipientDao(database: AppDatabase) = database.recipientDao
+
+    @Singleton
+    @Provides
+    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
+
+    @Singleton
+    @Provides
+    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
 }

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

@@ -6,44 +6,55 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 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.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
+import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
+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.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.Migration2
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
@@ -66,6 +77,7 @@ import javax.inject.Singleton
         Grade::class,
         GradeSummary::class,
         GradeStatistics::class,
+        GradePointsStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
@@ -73,7 +85,9 @@ import javax.inject.Singleton
         LuckyNumber::class,
         CompletedLesson::class,
         ReportingUnit::class,
-        Recipient::class
+        Recipient::class,
+        MobileDevice::class,
+        Teacher::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -82,27 +96,35 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 13
+        const val VERSION_SCHEMA = 17
+
+        fun getMigrations(): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17()
+            )
+        }
 
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
                 .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
                 .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(
+                .addMigrations(*getMigrations())
-                    Migration2(),
-                    Migration3(),
-                    Migration4(),
-                    Migration5(),
-                    Migration6(),
-                    Migration7(),
-                    Migration8(),
-                    Migration9(),
-                    Migration10(),
-                    Migration11(),
-                    Migration12(),
-                    Migration13()
-                )
                 .build()
         }
     }
@@ -125,6 +147,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeStatistics: GradeStatisticsDao
 
+    abstract val gradePointsStatistics: GradePointsStatisticsDao
+
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -140,4 +164,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val reportingUnitDao: ReportingUnitDao
 
     abstract val recipientDao: RecipientDao
+
+    abstract val mobileDeviceDao: MobileDeviceDao
+
+    abstract val teacherDao: TeacherDao
 }

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

@@ -1,25 +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 delete(key: String) {
-        sharedPref.edit().remove(key).apply()
-    }
-}

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

@@ -0,0 +1,20 @@
+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) {
+
+    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 delete(key: String) {
+        sharedPref.edit().remove(key).apply()
+    }
+}

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

@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface GradePointsStatisticsDao {
+
+    @Insert
+    fun insertAll(gradesStatistics: List<GradePointsStatistics>)
+
+    @Delete
+    fun deleteAll(gradesStatistics: List<GradePointsStatistics>)
+
+    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<GradePointsStatistics>
+
+    @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
+}

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

@@ -23,8 +23,8 @@ interface MessagesDao {
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
     fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
+    @Query("SELECT * FROM Messages WHERE id = :id")
-    fun load(studentId: Int, id: Int): Maybe<Message>
+    fun load(id: Long): Maybe<Message>
 
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>

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

@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.reactivex.Maybe
+
+@Dao
+interface MobileDeviceDao {
+
+    @Insert
+    fun insertAll(devices: List<MobileDevice>)
+
+    @Delete
+    fun deleteAll(devices: List<MobileDevice>)
+
+    @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
+    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
+}

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

@@ -14,7 +14,7 @@ import javax.inject.Singleton
 interface StudentDao {
 
     @Insert(onConflict = ABORT)
-    fun insert(student: Student): Long
+    fun insertAll(student: List<Student>): List<Long>
 
     @Delete
     fun delete(student: Student)

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

@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.reactivex.Maybe
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface TeacherDao {
+
+    @Insert
+    fun insertAll(devices: List<Teacher>)
+
+    @Delete
+    fun deleteAll(devices: List<Teacher>)
+
+    @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
+}

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

@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "GradesPointsStatistics")
+data class GradePointsStatistics(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "semester_id")
+    val semesterId: Int,
+
+    val subject: String,
+
+    val others: Double,
+
+    val student: Double
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -13,11 +13,26 @@ data class GradeSummary(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
+    val position: Int,
+
     val subject: String,
 
+    @ColumnInfo(name = "predicted_grade")
     val predictedGrade: String,
 
-    val finalGrade: String
+    @ColumnInfo(name = "final_grade")
+    val finalGrade: String,
+
+    @ColumnInfo(name = "proposed_points")
+    val proposedPoints: String,
+
+    @ColumnInfo(name = "final_points")
+    val finalPoints: String,
+
+    @ColumnInfo(name = "points_sum")
+    val pointsSum: String,
+
+    val average: Double
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0

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

@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
+import java.io.Serializable
+
+@Entity(tableName = "MobileDevices")
+data class MobileDevice(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "device_id")
+    val deviceId: Int,
+
+    val name: String,
+
+    val date: LocalDateTime
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "Teachers")
+data class Teacher(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "class_id")
+    val classId: Int,
+
+    val subject: String,
+
+    val name: String,
+
+    @ColumnInfo(name = "short_name")
+    val shortName: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -8,7 +8,7 @@ class Migration11 : Migration(10, 11) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("""
             CREATE TABLE IF NOT EXISTS Grades_temp (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                id INTEGER PRIMARY KEY NOT NULL,
                 is_read INTEGER NOT NULL,
                 is_notified INTEGER NOT NULL,
                 semester_id INTEGER NOT NULL,

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

@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration14 : Migration(13, 14) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS GradesSummary")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS GradesSummary (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                semester_id INTEGER NOT NULL,
+                student_id INTEGER NOT NULL,
+                position INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                predicted_grade TEXT NOT NULL,
+                final_grade TEXT NOT NULL,
+                proposed_points TEXT NOT NULL,
+                final_points TEXT NOT NULL,
+                points_sum TEXT NOT NULL,
+                average REAL NOT NULL
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration15 : Migration(14, 15) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS MobileDevices (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                device_id INTEGER NOT NULL,
+                name TEXT NOT NULL,
+                date INTEGER NOT NULL
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration16 : Migration(15, 16) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS Teachers (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                class_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                name TEXT NOT NULL,
+                short_name TEXT NOT NULL
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration17 : Migration(16, 17) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        createGradesPointsStatisticsTable(database)
+        truncateSemestersTable(database)
+    }
+
+    private fun createGradesPointsStatisticsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS GradesPointsStatistics(
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                semester_id INTEGER NOT NULL,
+                subject TEXT NOT NULL,
+                others REAL NOT NULL,
+                student REAL NOT NULL
+            )
+        """)
+    }
+
+    private fun truncateSemestersTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Semesters")
+    }
+}

app/src/main/java/io/github/wulkanowy/data/pojos/MobileDeviceToken.kt

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.pojos
+
+data class MobileDeviceToken(
+
+    val token: String,
+
+    val symbol: String,
+
+    val pin: String,
+
+    val qr: String
+)

app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -31,8 +32,8 @@ class AttendanceRepository @Inject constructor(
                         local.getAttendance(semester, dates.first, dates.second)
                             .toSingle(emptyList())
                             .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance - newAttendance)
+                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                                local.saveAttendance(newAttendance - oldAttendance)
+                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
                             }
                     }.flatMap {
                         local.getAttendance(semester, dates.first, dates.second)

app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt

@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -25,8 +26,8 @@ class AttendanceSummaryRepository @Inject constructor(
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteAttendanceSummary(old - new)
+                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
-                            local.saveAttendanceSummary(new - old)
+                            local.saveAttendanceSummary(new.uniqueSubtract(old))
                         }
                 }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
     }

app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -31,8 +32,8 @@ class CompletedLessonsRepository @Inject constructor(
                             local.getCompletedLessons(semester, dates.first, dates.second)
                                 .toSingle(emptyList())
                                 .doOnSuccess { old ->
-                                    local.deleteCompleteLessons(old - new)
+                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
-                                    local.saveCompletedLessons(new - old)
+                                    local.saveCompletedLessons(new.uniqueSubtract(old))
                                 }
                         }.flatMap {
                             local.getCompletedLessons(semester, dates.first, dates.second)

app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -27,12 +28,12 @@ class ExamRepository @Inject constructor(
                         .flatMap {
                             if (it) remote.getExams(semester, dates.first, dates.second)
                             else Single.error(UnknownHostException())
-                        }.flatMap { newExams ->
+                        }.flatMap { new ->
                             local.getExams(semester, dates.first, dates.second)
                                 .toSingle(emptyList())
-                                .doOnSuccess { oldExams ->
+                                .doOnSuccess { old ->
-                                    local.deleteExams(oldExams - newExams)
+                                    local.deleteExams(old.uniqueSubtract(new))
-                                    local.saveExams(newExams - oldExams)
+                                    local.saveExams(new.uniqueSubtract(old))
                                 }
                         }.flatMap {
                             local.getExams(semester, dates.first, dates.second)

app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt

@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -24,13 +25,12 @@ class GradeRepository @Inject constructor(
                 .flatMap {
                     if (it) remote.getGrades(semester)
                     else Single.error(UnknownHostException())
-                }.flatMap { newGrades ->
+                }.flatMap { new ->
                     local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { oldGrades ->
+                        .doOnSuccess { old ->
-                            val notifyBreakDate = oldGrades.maxBy { it.date }?.date
+                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                                ?: student.registrationDate.toLocalDate()
+                            local.deleteGrades(old.uniqueSubtract(new))
-                            local.deleteGrades(oldGrades - newGrades)
+                            local.saveGrades(new.uniqueSubtract(old)
-                            local.saveGrades((newGrades - oldGrades)
                                 .onEach {
                                     if (it.date >= notifyBreakDate) it.apply {
                                         isRead = false

app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt

@@ -18,9 +18,14 @@ class GradeSummaryRemote @Inject constructor(private val api: Api) {
                     GradeSummary(
                         semesterId = semester.semesterId,
                         studentId = semester.studentId,
+                        position = it.order,
                         subject = it.name,
                         predictedGrade = it.predicted,
-                        finalGrade = it.final
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
                     )
                 }
             }

app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt

@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -22,11 +23,11 @@ class GradeSummaryRepository @Inject constructor(
                 .flatMap {
                     if (it) remote.getGradeSummary(semester)
                     else Single.error(UnknownHostException())
-                }.flatMap { newGradesSummary ->
+                }.flatMap { new ->
                     local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { oldGradesSummary ->
+                        .doOnSuccess { old ->
-                            local.deleteGradesSummary(oldGradesSummary - newGradesSummary)
+                            local.deleteGradesSummary(old.uniqueSubtract(new))
-                            local.saveGradesSummary(newGradesSummary - oldGradesSummary)
+                            local.saveGradesSummary(new.uniqueSubtract(old))
                         }
                 }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
     }

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

@@ -1,6 +1,8 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -8,27 +10,57 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeStatisticsLocal @Inject constructor(private val gradeStatisticsDb: GradeStatisticsDao) {
+class GradeStatisticsLocal @Inject constructor(
+    private val gradeStatisticsDb: GradeStatisticsDao,
+    private val gradePointsStatisticsDb: GradePointsStatisticsDao
+) {
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
-            .filter { !it.isEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
+        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
 
     fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
-        return (if ("Wszystkie" == subjectName) gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
+        return when (subjectName) {
-            list.groupBy { it.grade }.map {
+            "Wszystkie" -> gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
-                GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key, it.value.fold(0) { acc, e -> acc + e.amount }, false)
+                list.groupBy { it.grade }.map {
+                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
+                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
+                }
             }
+            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
+        return when (subjectName) {
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
+                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
+                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
+                    list.fold(.0) { acc, e -> acc + e.others },
+                    list.fold(.0) { acc, e -> acc + e.student })
+                )
+            }
+            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
         }
-        else gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)).filter { !it.isEmpty() }
     }
 
     fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.insertAll(gradesStatistics)
     }
 
+    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
+        gradePointsStatisticsDb.insertAll(gradePointsStatistics)
+    }
+
     fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.deleteAll(gradesStatistics)
     }
+
+    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
+        gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
+    }
 }

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

@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
 import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Single
@@ -12,7 +13,10 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {
 
     fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
         return Single.just(api.apply { diaryId = semester.diaryId })
-            .flatMap { it.getGradesStatistics(semester.semesterId, isSemester) }
+            .flatMap {
+                if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
+                else it.getGradesPartialStatistics(semester.semesterId)
+            }
             .map { gradeStatistics ->
                 gradeStatistics.map {
                     GradeStatistics(
@@ -26,4 +30,20 @@ class GradeStatisticsRemote @Inject constructor(private val api: Api) {
                 }
             }
     }
+
+    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { it.getGradesPointsStatistics(semester.semesterId) }
+            .map { gradePointsStatistics ->
+                gradePointsStatistics.map {
+                    GradePointsStatistics(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        subject = it.subject,
+                        others = it.others,
+                        student = it.student
+                    )
+                }
+            }
+    }
 }

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

@@ -2,8 +2,11 @@ package io.github.wulkanowy.data.repositories.gradestatistics
 
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -22,12 +25,27 @@ class GradeStatisticsRepository @Inject constructor(
                 .flatMap {
                     if (it) remote.getGradeStatistics(semester, isSemester)
                     else Single.error(UnknownHostException())
-                }.flatMap { newGradesStats ->
+                }.flatMap { new ->
                     local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
-                        .doOnSuccess { oldGradesStats ->
+                        .doOnSuccess { old ->
-                            local.deleteGradesStatistics(oldGradesStats - newGradesStats)
+                            local.deleteGradesStatistics(old.uniqueSubtract(new))
-                            local.saveGradesStatistics(newGradesStats - oldGradesStats)
+                            local.saveGradesStatistics(new.uniqueSubtract(old))
                         }
                 }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
     }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
+        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMapMaybe {
+                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
+                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
+    }
 }

app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -26,11 +27,11 @@ class HomeworkRepository @Inject constructor(
                     .flatMap {
                         if (it) remote.getHomework(semester, monday, friday)
                         else Single.error(UnknownHostException())
-                    }.flatMap { newGrades ->
+                    }.flatMap { new ->
                         local.getHomework(semester, monday, friday).toSingle(emptyList())
-                            .doOnSuccess { oldGrades ->
+                            .doOnSuccess { old ->
-                                local.deleteHomework(oldGrades - newGrades)
+                                local.deleteHomework(old.uniqueSubtract(new))
-                                local.saveHomework(newGrades - oldGrades)
+                                local.saveHomework(new.uniqueSubtract(old))
                             }
                     }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
         }

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

@@ -23,8 +23,8 @@ class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessage(student: Student, id: Int): Maybe<Message> {
+    fun getMessage(id: Long): Maybe<Message> {
-        return messagesDb.load(student.id.toInt(), id)
+        return messagesDb.load(id)
     }
 
     fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {

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

@@ -59,4 +59,8 @@ class MessageRemote @Inject constructor(private val api: Api) {
             }
         )
     }
+
+    fun deleteMessage(message: Message): Single<Boolean> {
+        return api.deleteMessages(listOf(Pair(message.realId, message.folderId)))
+    }
 }

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

@@ -8,7 +8,9 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
+import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -33,8 +35,8 @@ class MessageRepository @Inject constructor(
                         }.flatMap { new ->
                             local.getMessages(student, folder).toSingle(emptyList())
                                 .doOnSuccess { old ->
-                                    local.deleteMessages(old - new)
+                                    local.deleteMessages(old.uniqueSubtract(new))
-                                    local.saveMessages((new - old)
+                                    local.saveMessages(new.uniqueSubtract(old)
                                         .onEach {
                                             it.isNotified = !notify
                                         })
@@ -44,14 +46,14 @@ class MessageRepository @Inject constructor(
             }
     }
 
-    fun getMessage(student: Student, messageId: Int, markAsRead: Boolean = false): Single<Message> {
+    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
         return Single.just(apiHelper.initApi(student))
             .flatMap { _ ->
-                local.getMessage(student, messageId)
+                local.getMessage(messageDbId)
                     .filter { !it.content.isNullOrEmpty() }
                     .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                         .flatMap {
-                            if (it) local.getMessage(student, messageId).toSingle()
+                            if (it) local.getMessage(messageDbId).toSingle()
                             else Single.error(UnknownHostException())
                         }
                         .flatMap { dbMessage ->
@@ -62,7 +64,7 @@ class MessageRepository @Inject constructor(
                                 }))
                             }
                         }.flatMap {
-                            local.getMessage(student, messageId).toSingle()
+                            local.getMessage(messageDbId).toSingle()
                         }
                     )
             }
@@ -89,4 +91,20 @@ class MessageRepository @Inject constructor(
                 else Single.error(UnknownHostException())
             }
     }
+
+    fun deleteMessage(message: Message): Maybe<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.deleteMessage(message)
+                else Single.error(UnknownHostException())
+            }
+            .filter { it }
+            .doOnSuccess {
+                if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
+                    id = message.id
+                    content = message.content
+                }))
+                else local.deleteMessages(listOf(message))
+            }
+    }
 }

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

@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.mobiledevice
+
+import io.github.wulkanowy.data.db.dao.MobileDeviceDao
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
+
+    fun saveDevices(devices: List<MobileDevice>) {
+        mobileDb.insertAll(devices)
+    }
+
+    fun deleteDevices(devices: List<MobileDevice>) {
+        mobileDb.deleteAll(devices)
+    }
+
+    fun getDevices(semester: Semester): Maybe<List<MobileDevice>> {
+        return mobileDb.loadAll(semester.studentId).filter { it.isNotEmpty() }
+    }
+}

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

@@ -0,0 +1,47 @@
+package io.github.wulkanowy.data.repositories.mobiledevice
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobileDeviceRemote @Inject constructor(private val api: Api) {
+
+    fun getDevices(semester: Semester): Single<List<MobileDevice>> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { api.getRegisteredDevices() }
+            .map { devices ->
+                devices.map {
+                    MobileDevice(
+                        studentId = semester.studentId,
+                        date = it.date.toLocalDateTime(),
+                        deviceId = it.id,
+                        name = it.name
+                    )
+                }
+            }
+    }
+
+    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { api.unregisterDevice(device.deviceId) }
+    }
+
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { api.getToken() }
+            .map {
+                MobileDeviceToken(
+                    token = it.token,
+                    symbol = it.symbol,
+                    pin = it.pin,
+                    qr = it.qrCodeImage
+                )
+            }
+    }
+}

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

@@ -0,0 +1,52 @@
+package io.github.wulkanowy.data.repositories.mobiledevice
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobileDeviceRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: MobileDeviceLocal,
+    private val remote: MobileDeviceRemote
+) {
+
+    fun getDevices(semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+        return local.getDevices(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getDevices(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getDevices(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteDevices(old uniqueSubtract new)
+                            local.saveDevices(new uniqueSubtract old)
+                        }
+                }
+            ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
+    }
+
+    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.unregisterDevice(semester, device)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun getToken(semester: Semester): Single<MobileDeviceToken> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getToken(semester)
+                else Single.error(UnknownHostException())
+            }
+    }
+}

app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt

@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -27,8 +28,8 @@ class NoteRepository @Inject constructor(
                 }.flatMap { new ->
                     local.getNotes(student).toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteNotes(old - new)
+                            local.deleteNotes(old.uniqueSubtract(new))
-                            local.saveNotes((new - old)
+                            local.saveNotes(new.uniqueSubtract(old)
                                 .onEach {
                                     if (it.date >= student.registrationDate.toLocalDate()) it.apply {
                                         isRead = false

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

@@ -17,12 +17,18 @@ class PreferencesRepository @Inject constructor(
     val isShowPresent: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_attendance_present), true)
 
+    val gradeAverageMode: String
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_average_mode), "only_one_semester") ?: "only_one_semester"
+
+    val gradeAverageForceCalc: Boolean
+        get() = sharedPref.getBoolean(context.getString(R.string.pref_key_grade_average_force_calc), false)
+
     val isGradeExpandable: Boolean
         get() = !sharedPref.getBoolean(context.getString(R.string.pref_key_expand_grade), false)
 
-    val currentThemeKey: String = context.getString(R.string.pref_key_theme)
+    val appThemeKey: String = context.getString(R.string.pref_key_app_theme)
-    val currentTheme: Int
+    val appTheme: String
-        get() = sharedPref.getString(currentThemeKey, "1")?.toIntOrNull() ?: 1
+        get() = sharedPref.getString(appThemeKey, "light") ?: "light"
 
     val gradeColorTheme: String
         get() = sharedPref.getString(context.getString(R.string.pref_key_grade_color_scheme), "vulcan") ?: "vulcan"
@@ -37,7 +43,7 @@ class PreferencesRepository @Inject constructor(
 
     val servicesOnlyWifiKey: String = context.getString(R.string.pref_key_services_wifi_only)
     val isServicesOnlyWifi: Boolean
-        get() = sharedPref.getBoolean(servicesOnlyWifiKey, true)
+        get() = sharedPref.getBoolean(servicesOnlyWifiKey, false)
 
     val isNotificationsEnable: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_notifications_enable), true)
@@ -50,8 +56,7 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_plus), "0.0")?.toDouble() ?: 0.0
 
     val gradeMinusModifier: Double
-        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble()
+        get() = sharedPref.getString(context.getString(R.string.pref_key_grade_modifier_minus), "0.0")?.toDouble() ?: 0.0
-            ?: 0.0
 
     val fillMessageContent: Boolean
         get() = sharedPref.getBoolean(context.getString(R.string.pref_key_fill_message_content), true)

app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt

@@ -7,6 +7,7 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -31,8 +32,8 @@ class RecipientRepository @Inject constructor(
                         }.flatMap { new ->
                             local.getRecipients(student, role, unit).toSingle(emptyList())
                                 .doOnSuccess { old ->
-                                    local.deleteRecipients(old - new)
+                                    local.deleteRecipients(old.uniqueSubtract(new))
-                                    local.saveRecipients(new - old)
+                                    local.saveRecipients(new.uniqueSubtract(old))
                                 }
                         }.flatMap {
                             local.getRecipients(student, role, unit).toSingle(emptyList())

app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt

@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Maybe
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -30,8 +31,8 @@ class ReportingUnitRepository @Inject constructor(
                         }.flatMap { new ->
                             local.getReportingUnits(student).toSingle(emptyList())
                                 .doOnSuccess { old ->
-                                    local.deleteReportingUnits(old - new)
+                                    local.deleteReportingUnits(old.uniqueSubtract(new))
-                                    local.saveReportingUnits(new - old)
+                                    local.saveReportingUnits(new.uniqueSubtract(old))
                                 }
                         }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
                     )

app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt

@@ -5,6 +5,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.Inter
 import io.github.wulkanowy.data.ApiHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Maybe
 import io.reactivex.Single
 import timber.log.Timber
@@ -31,8 +32,8 @@ class SemesterRepository @Inject constructor(
                     if (currentSemesters.size == 1) {
                         local.getSemesters(student).toSingle(emptyList())
                             .doOnSuccess { old ->
-                                local.deleteSemesters(old - new)
+                                local.deleteSemesters(old.uniqueSubtract(new))
-                                local.saveSemesters(new - old)
+                                local.saveSemesters(new.uniqueSubtract(old))
                             }
                     } else {
                         Timber.i("Current semesters list:\n${currentSemesters.joinToString(separator = "\n")}")

app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt

@@ -17,8 +17,8 @@ class StudentLocal @Inject constructor(
     private val context: Context
 ) {
 
-    fun saveStudent(student: Student): Single<Long> {
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return Single.fromCallable { studentDb.insert(student.copy(password = encrypt(student.password, context))) }
+        return Single.fromCallable { studentDb.insertAll(students.map { it.copy(password = encrypt(it.password, context)) }) }
     }
 
     fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {

app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt

@@ -22,6 +22,8 @@ class StudentRepository @Inject constructor(
 
     fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
 
+    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
+
     fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
         return ReactiveNetwork.checkInternetConnectivity(settings)
             .flatMap {
@@ -41,8 +43,8 @@ class StudentRepository @Inject constructor(
             .toSingle()
     }
 
-    fun saveStudent(student: Student): Single<Long> {
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return local.saveStudent(student)
+        return local.saveStudents(students)
     }
 
     fun switchStudent(student: Student): Completable {

app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt

@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
 import javax.inject.Inject
@@ -26,8 +27,8 @@ class SubjectRepository @Inject constructor(
                     local.getSubjects(semester)
                         .toSingle(emptyList())
                         .doOnSuccess { old ->
-                            local.deleteSubjects(old - new)
+                            local.deleteSubjects(old.uniqueSubtract(new))
-                            local.saveSubjects(new - old)
+                            local.saveSubjects(new.uniqueSubtract(old))
                         }
                 }.flatMap {
                     local.getSubjects(semester).toSingle(emptyList())

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

@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import io.github.wulkanowy.data.db.dao.TeacherDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.reactivex.Maybe
+import javax.inject.Inject
+
+class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao)  {
+    fun saveTeachers(teachers: List<Teacher>) {
+        teacherDb.insertAll(teachers)
+    }
+
+    fun deleteTeachers(teachers: List<Teacher>) {
+        teacherDb.deleteAll(teachers)
+    }
+
+    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
+        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
+    }
+}

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

@@ -0,0 +1,28 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRemote @Inject constructor(private val api: Api) {
+
+    fun getTeachers(semester: Semester): Single<List<Teacher>> {
+        return Single.just(api.apply { diaryId = semester.diaryId })
+            .flatMap { it.getTeachers() }
+            .map { teachers ->
+                teachers.map {
+                    Teacher(
+                        studentId = semester.studentId,
+                        name = it.name,
+                        subject = it.subject,
+                        shortName = it.short,
+                        classId = semester.classId
+                    )
+                }
+            }
+    }
+}

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

@@ -0,0 +1,33 @@
+package io.github.wulkanowy.data.repositories.teacher
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRepository @Inject constructor(
+    private val settings: InternetObservingSettings,
+    private val local: TeacherLocal,
+    private val remote: TeacherRemote
+) {
+    fun getTeachers(semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+        return local.getTeachers(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getTeachers(semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTeachers(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteTeachers(old.uniqueSubtract(new))
+                            local.saveTeachers(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getTeachers(semester).toSingle(emptyList()) })
+    }
+}

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

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import java.net.UnknownHostException
@@ -25,17 +26,17 @@ class TimetableRepository @Inject constructor(
                 .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
                     if (it) remote.getTimetable(semester, monday, friday)
                     else Single.error(UnknownHostException())
-                }.flatMap { newTimetable ->
+                }.flatMap { new ->
                     local.getTimetable(semester, monday, friday)
                         .toSingle(emptyList())
-                        .doOnSuccess { oldTimetable ->
+                        .doOnSuccess { old ->
-                            local.deleteTimetable(oldTimetable - newTimetable)
+                            local.deleteTimetable(old.uniqueSubtract(new))
-                            local.saveTimetable((newTimetable - oldTimetable).map { item ->
+                            local.saveTimetable(new.uniqueSubtract(old).map { item ->
-                                item.apply {
+                                item.also { new ->
-                                    oldTimetable.singleOrNull { this.start == it.start }?.let {
+                                    old.singleOrNull { new.start == it.start }?.let { old ->
-                                        return@map copy(
+                                        return@map new.copy(
-                                            room = if (room.isEmpty()) it.room else room,
+                                            room = if (new.room.isEmpty()) old.room else new.room,
-                                            teacher = if (teacher.isEmpty()) it.teacher else teacher
+                                            teacher = if (new.teacher.isEmpty() && !new.changes) old.teacher else new.teacher
                                         )
                                     }
                                 }

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

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

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

@@ -2,16 +2,13 @@ package io.github.wulkanowy.di
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
-import com.google.firebase.analytics.FirebaseAnalytics
 import dagger.Module
 import dagger.Provides
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.SchedulersProvider
-import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -30,14 +27,9 @@ internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideFirebaseAnalyticsHelper(context: Context) = FirebaseAnalyticsHelper(FirebaseAnalytics.getInstance(context))
+    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
 
     @Singleton
     @Provides
-    fun provideAppWidgetManager(context: Context) = AppWidgetManager.getInstance(context)
+    fun provideAppInfo() = AppInfo()
-
-    @Singleton
-    @Named("isDebug")
-    @Provides
-    fun provideIsDebug() = DEBUG
 }

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

@@ -5,14 +5,18 @@ import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
 
+@Suppress("unused")
 @Module
-internal abstract class BuilderModule {
+internal abstract class BindingModule {
 
     @PerActivity
     @ContributesAndroidInjector
@@ -29,6 +33,15 @@ internal abstract class BuilderModule {
     @ContributesAndroidInjector
     abstract fun bindMessageSendActivity(): SendMessageActivity
 
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
+
     @ContributesAndroidInjector
     abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
+
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
 }

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

@@ -1,8 +1,6 @@
 package io.github.wulkanowy.services
 
-import android.app.NotificationManager
 import android.content.Context
-import android.content.Context.NOTIFICATION_SERVICE
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.WorkManager
 import com.squareup.inject.assisted.dagger2.AssistedModule
@@ -23,11 +21,13 @@ import io.github.wulkanowy.services.sync.works.LuckyNumberWork
 import io.github.wulkanowy.services.sync.works.MessageWork
 import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
+import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
+@Suppress("unused")
 @AssistedModule
 @Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
@@ -37,17 +37,12 @@ abstract class ServicesModule {
 
         @JvmStatic
         @Provides
-        fun provideWorkManager() = WorkManager.getInstance()
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
         @JvmStatic
         @Singleton
         @Provides
-        fun provideNotificationManagerCompat(context: Context) = NotificationManagerCompat.from(context)
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
-
-        @JvmStatic
-        @Singleton
-        @Provides
-        fun provideNotificationManager(context: Context) = context.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
     }
 
     @ContributesAndroidInjector
@@ -81,6 +76,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideTimetableWork(work: TimetableWork): Work
 
+    @Binds
+    @IntoSet
+    abstract fun provideTeacherWork(work: TeacherWork): Work
+
     @Binds
     @IntoSet
     abstract fun provideLuckyNumberWork(work: LuckyNumberWork): Work

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

@@ -6,44 +6,59 @@ import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
-import androidx.work.NetworkType.METERED
+import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
-import androidx.work.PeriodicWorkRequest
+import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
 import org.threeten.bp.LocalDate.now
 import timber.log.Timber
 import java.util.concurrent.TimeUnit.MINUTES
 import javax.inject.Inject
-import javax.inject.Named
 import javax.inject.Singleton
 
 @Singleton
 class SyncManager @Inject constructor(
     private val workManager: WorkManager,
     private val preferencesRepository: PreferencesRepository,
+    sharedPrefProvider: SharedPrefProvider,
     newEntriesChannel: NewEntriesChannel,
     debugChannel: DebugChannel,
-    @Named("isDebug") isDebug: Boolean
+    appInfo: AppInfo
 ) {
 
+    companion object {
+        private const val APP_VERSION_CODE_KEY = "app_version_code"
+    }
+
     init {
-        if (SDK_INT >= O) newEntriesChannel.create()
-        if (SDK_INT >= O && isDebug) debugChannel.create()
         if (now().isHolidays) stopSyncWorker()
+
+        if (SDK_INT > O) {
+            newEntriesChannel.create()
+            if (appInfo.isDebug) debugChannel.create()
+        }
+
+        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
+            startSyncWorker(true)
+            sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
+        }
         Timber.i("SyncManager was initialized")
     }
 
     fun startSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
-                PeriodicWorkRequest.Builder(SyncWorker::class.java, preferencesRepository.servicesInterval, MINUTES, 10, MINUTES)
+                PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
+                    .setInitialDelay(10, MINUTES)
                     .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
                     .setConstraints(Constraints.Builder()
-                        .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) METERED else UNMETERED)
+                        .setRequiredNetworkType(if (preferencesRepository.isServicesOnlyWifi) UNMETERED else CONNECTED)
                         .build())
                     .build())
         }

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

@@ -35,7 +35,7 @@ class SyncWorker @AssistedInject constructor(
 
     override fun createWork(): Single<Result> {
         Timber.i("SyncWorker is starting")
-        return studentRepository.isStudentSaved()
+        return studentRepository.isCurrentStudentSet()
             .filter { true }
             .flatMap { studentRepository.getCurrentStudent().toMaybe() }
             .flatMapCompletable { student ->
@@ -64,7 +64,7 @@ class SyncWorker @AssistedInject constructor(
     private fun notify(result: Result) {
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
             .setContentTitle("Debug notification")
-            .setSmallIcon(R.drawable.ic_more_settings_24dp)
+            .setSmallIcon(R.drawable.ic_more_settings)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))

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

@@ -3,15 +3,15 @@ package io.github.wulkanowy.services.sync.channels
 import android.annotation.TargetApi
 import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
+import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class DebugChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
 ) {
 
@@ -21,8 +21,9 @@ class DebugChannel @Inject constructor(
 
     fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT).apply {
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
-                lockscreenVisibility = VISIBILITY_PUBLIC
+                .apply {
-            })
+                    lockscreenVisibility = VISIBILITY_PUBLIC
+                })
     }
 }

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

@@ -3,15 +3,15 @@ package io.github.wulkanowy.services.sync.channels
 import android.annotation.TargetApi
 import android.app.Notification.VISIBILITY_PUBLIC
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_HIGH
 import android.content.Context
+import androidx.core.app.NotificationManagerCompat
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
 class NewEntriesChannel @Inject constructor(
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
     private val context: Context
 ) {
 
@@ -21,10 +21,11 @@ class NewEntriesChannel @Inject constructor(
 
     fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH).apply {
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH)
-                enableLights(true)
+                .apply {
-                enableVibration(true)
+                    enableLights(true)
-                lockscreenVisibility = VISIBILITY_PUBLIC
+                    enableVibration(true)
-            })
+                    lockscreenVisibility = VISIBILITY_PUBLIC
+                })
     }
 }

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

@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,14 +41,14 @@ class GradeWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
             .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_grade)
+            .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
             .setDefaults(DEFAULT_ALL)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, 0,
+                PendingIntent.getActivity(context, MainView.Section.GRADE.id,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0), FLAG_UPDATE_CURRENT))
+                    MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
                 grades.forEach { addLine("${it.subject}: ${it.entry}") }

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

@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,15 +41,14 @@ class LuckyNumberWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
             .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
-            .setSmallIcon(R.drawable.ic_stat_notify_lucky_number)
+            .setSmallIcon(R.drawable.ic_stat_luckynumber)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, 0,
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+                    MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
-            )
             .build())
     }
 }

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

@@ -16,7 +16,7 @@ import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -42,14 +42,14 @@ class MessageWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
             .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_message)
+            .setSmallIcon(R.drawable.ic_stat_message)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, 0,
+                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+                    MainActivity.getStartIntent(context, MainView.Section.MESSAGE, true), FLAG_UPDATE_CURRENT)
             )
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))

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

@@ -15,7 +15,7 @@ import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
 import io.reactivex.Completable
 import javax.inject.Inject
@@ -41,15 +41,14 @@ class NoteWork @Inject constructor(
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size))
             .setContentText(context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size))
-            .setSmallIcon(R.drawable.ic_stat_notify_note)
+            .setSmallIcon(R.drawable.ic_stat_note)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
             .setPriority(PRIORITY_HIGH)
             .setColor(context.getCompatColor(R.color.colorPrimary))
             .setContentIntent(
-                PendingIntent.getActivity(context, 0,
+                PendingIntent.getActivity(context, MainView.Section.NOTE.id,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 4), FLAG_UPDATE_CURRENT)
+                    MainActivity.getStartIntent(context, MainView.Section.NOTE, true), FLAG_UPDATE_CURRENT))
-            )
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
                 notes.forEach { addLine("${it.teacher}: ${it.category}") }

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

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.services.sync.works
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
+import io.reactivex.Completable
+import javax.inject.Inject
+
+class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
+
+    override fun create(student: Student, semester: Semester): Completable {
+        return teacherRepository.getTeachers(semester, true).ignoreElement()
+    }
+}