.circleci/config.yml

@@ -7,11 +7,11 @@ references:
 
   container_config: &container_config
     docker:
-      - image: circleci/android@sha256:5cdc8626cc6f13efe5ed982cdcdb432b0472f8740fed8743a6461e025ad6cdfc
+      - image: circleci/android:api-28-alpha
     working_directory: *workspace_root
     environment:
       environment:
-        _JAVA_OPTS: -Xmx3072m
+        JVM_OPTS: -Xmx3200m
 
   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 fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease -x packageRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -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 fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew lint -x fabricGenerateResourcesRelease --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 fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew :app:test :app:jacocoTestReport -x fabricGenerateResourcesRelease --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,12 +93,9 @@ 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-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a"
+          command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a"
       - run:
           name: Launch emulator
           command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on
@@ -116,7 +113,7 @@ jobs:
             adb shell input keyevent 82
       - run:
           name: Run instrumented tests
-          command: ./gradlew clean createFdroidDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew clean createDebugCoverageReport jacocoTestReport --no-daemon --stacktrace --console=plain -PdisablePreDex
       - run:
           name: Collect logs from emulator
           command: adb logcat -d > ./app/build/reports/logcat_emulator.txt
@@ -162,7 +159,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
+          command: ./gradlew publish --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2

.gitignore

@@ -1,90 +1,39 @@
-# Created by https://www.gitignore.io
+/captures
+.externalNativeBuild
+
+## https://gist.github.com/iainconnor/8605514
 
 # Built application files
-*.apk
+/build
-*.ap_
+/*/build/
-*.aab
 
-# Files for the ART/Dalvik VM
+# Crashlytics configuations
-*.dex
+com_crashlytics_export_strings.xml
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
+# Gradle generated files
-proguard/
+.gradle/
 
-# Log Files
+# Signing files
-*.log
+.signing/
 
-# Android Studio Navigation editor temp files
+# User-specific configurations
-.navigation/
+.idea/copyright/profiles_settings.xml
-
-# 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/shelf/
+.idea/inspectionProfiles/
 .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/jsLibraryMappings.xml
+.idea/workspace.xml
-.idea/datasources.xml
+.idea/caches/
-.idea/dataSources.ids
+*.iml
-.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
@@ -94,21 +43,8 @@ output.json
 .Trashes
 ehthumbs.db
 Thumbs.db
-
+.idea/caches/
-# Legacy Eclipse project files
+app/key.p12
-.classpath
+app/upload-key.jks
-.project
+*.log
-.cproject
+.idea/assetWizardSettings.xml
-.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/fdroid/debug/app-fdroid-debug.apk .
+    - mv app/build/outputs/apk/debug/app-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 fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease test
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease test
   artifacts:
     paths:
     - app/build/reports/tests
@@ -39,7 +39,7 @@ lint:
      - .gradle
     policy: pull
   script:
-    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesFdroidRelease -x fabricGenerateResourcesPlayRelease lint
+    - ./gradlew --no-daemon --stacktrace -x fabricGenerateResourcesRelease 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="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
     </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
@@ -19,12 +19,40 @@
       <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
       <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
-      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
+      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </JetCodeStyleSettings>
-    <MarkdownNavigatorCodeStyleSettings>
+    <Objective-C-extensions>
-      <option name="RIGHT_MARGIN" value="72" />
+      <file>
-    </MarkdownNavigatorCodeStyleSettings>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <XML>
+      <option name="XML_KEEP_LINE_BREAKS" value="false" />
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
@@ -35,7 +63,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -46,7 +73,6 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -58,7 +84,6 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -69,7 +94,6 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -80,7 +104,6 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -91,7 +114,6 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -102,7 +124,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -114,7 +135,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -126,7 +146,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -144,6 +163,7 @@
       <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

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

@@ -0,0 +1,12 @@
+<?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,17 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=29
+    - ANDROID_API_LEVEL=28
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
 
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-branches:
+#branches:
-  only:
+#  only:
-    - develop
+#  - master
-    - 0.12.0
 
 android:
  licenses:
@@ -34,34 +33,34 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
     # Android emulator
-    - android-22
+    - android-19
-    - sys-img-armeabi-v7a-android-22
+    - sys-img-armeabi-v7a-android-19
 
 before_script:
     # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+    - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
     - emulator -avd test -no-audio -no-window &
     - android-wait-for-emulator
     - adb shell input keyevent 82 &
     - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
-  - ./gradlew dependencies --stacktrace --daemon
+  - ./gradlew build -x test -x lint -x fabricGenerateResourcesRelease -x packageRelease --stacktrace --daemon
   - fossa --no-ansi || true
-  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew lint -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew test -x fabricGenerateResourcesRelease --stacktrace --daemon
-  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew createDebugCoverageReport --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 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;
+      ./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;
     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 publishPlayRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publish -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 2019 Wulkanowy
+   Copyright 2017 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

@@ -1,61 +0,0 @@
-[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,62 +1,22 @@
-[English version of README](README.en.md)
-
 # Wulkanowy
+
+[![CircleCI](https://img.shields.io/circleci/project/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/wulkanowy)
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
+[![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
+[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
+[![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
+[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=shield)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_shield)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
 
-Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
+[Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&utm_source=vcs)
 
-## Funkcje
+[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/daeff1893f3c8128/builds/master/artifacts/0)
+[(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
 
-* logowanie za pomocą e-maila i hasła
+Androidowy klient dziennika VULCAN UONET+.
-* 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/)
 
 
-Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
+## License
 
-
+[![FOSSA Status](https://app.fossa.io/api/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git.svg?type=large)](https://app.fossa.io/projects/custom%2B5644%2Fgit%40github.com%3Awulkanowy%2Fwulkanowy.git?ref=badge_large)
-## 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

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

app/build.gradle

@@ -6,38 +6,25 @@ apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
-apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 28
-    buildToolsVersion '29.0.2'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 16
+        minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 28
-        versionCode 47
+        versionCode 25
-        versionName "0.12.0"
+        versionName "0.6.6"
         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(),
-                        "room.incremental"   : "true"
-                ]
-            }
-        }
-    }
-
-    sourceSets {
-        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -63,39 +50,13 @@ 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"
         }
     }
 
     lintOptions {
         disable 'HardwareIds'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    packagingOptions {
-        exclude 'META-INF/library_release.kotlin_module'
-        exclude 'META-INF/library-core_release.kotlin_module'
-    }
 }
 
 androidExtensions {
@@ -105,97 +66,66 @@ androidExtensions {
 play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
-    defaultToAppBundles = false
+    defaultToAppBundles = true
     track = 'alpha'
 }
 
-ext {
-    work_manager = "2.3.0-alpha03"
-    room = "2.2.1"
-    dagger = "2.25.2"
-    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.12.0"
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0-beta01"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation "androidx.activity:activity-ktx:1.1.0-rc01"
+    implementation('io.github.wulkanowy:api:0.6.6') { exclude module: "threetenbp" }
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.0-rc01"
-    implementation "androidx.annotation:annotation:1.1.0"
-    implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.1.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
+    implementation "com.google.android.material:material:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0-rc01"
-    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 "androidx.work:work-runtime-ktx:$work_manager"
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
-    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "com.mikepenz:aboutlibraries:6.2.0"
-    implementation "androidx.work:work-gcm:$work_manager"
+    implementation "com.firebase:firebase-jobdispatcher:0.8.5"
 
-    implementation "androidx.room:room-runtime:$room"
+    implementation "com.google.dagger:dagger-android-support:2.21"
-    implementation "androidx.room:room-rxjava2:$room"
+    kapt "com.google.dagger:dagger-compiler:2.21"
-    implementation "androidx.room:room-ktx:$room"
+    kapt "com.google.dagger:dagger-android-processor:2.21"
-    kapt "androidx.room:room-compiler:$room"
 
-    implementation "com.google.dagger:dagger-android-support:$dagger"
+    implementation "androidx.room:room-runtime:2.1.0-alpha03"
-    kapt "com.google.dagger:dagger-compiler:$dagger"
+    implementation "androidx.room:room-rxjava2:2.1.0-alpha03"
-    kapt "com.google.dagger:dagger-android-processor:$dagger"
+    kapt "androidx.room:room-compiler:2.1.0-alpha03"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
+
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation 'com.ncapdevi:frag-nav:3.1.0'
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
+    implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.13"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.5"
+
+    implementation "com.jakewharton.threetenabp:threetenabp:1.1.1"
 
-    implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
-    implementation "com.mikepenz:aboutlibraries:7.0.4"
 
-    playImplementation "com.google.firebase:firebase-core:17.2.1"
+    implementation 'com.google.firebase:firebase-core:16.0.6'
-    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
 
-    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+    releaseImplementation 'fr.o80.chucker:library-no-op:2.0.3'
+    debugImplementation 'fr.o80.chucker:library:2.0.3'
 
-    debugImplementation "fr.o80.chucker:library:$chucker"
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.4"
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:$mockk"
+    testImplementation "io.mockk:mockk:1.9"
-    testImplementation "org.threeten:threetenbp:1.4.0"
+    testImplementation "org.mockito:mockito-inline:2.23.4"
-    testImplementation "org.mockito:mockito-inline:3.1.0"
+    testImplementation 'org.threeten:threetenbp:1.3.8'
 
-    androidTestImplementation "androidx.test:core:1.2.0"
+    androidTestImplementation 'androidx.test:core:1.1.0'
-    androidTestImplementation "androidx.test:runner:1.2.0"
+    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation "androidx.test.ext:junit:1.1.1"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation "io.mockk:mockk-android:$mockk"
+    androidTestImplementation 'org.mockito:mockito-android:2.23.4'
-    androidTestImplementation "androidx.room:room-testing:$room"
     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

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

app/play-publish-lint.sh

@@ -1,7 +0,0 @@
-#!/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

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

app/proguard-rules.pro

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

app/sonarqube.gradle

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

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

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

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

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

@@ -1,197 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import io.github.wulkanowy.data.db.Converters
-import io.github.wulkanowy.data.db.entities.Semester
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-class Migration13Test : AbstractMigrationTest() {
-
-    @Test
-    fun studentsWithSchoolNameWithClassName() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "Klasa A - Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1, 1)
-            createStudent(this, 2, "Klasa B - Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 2, 1)
-            createStudent(this, 2, "Klasa C - Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", 1, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(3, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals("A", className)
-            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals("B", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[2].run {
-            assertEquals(2, studentId)
-            assertEquals("C", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", schoolName)
-        }
-    }
-
-    @Test
-    fun studentsWithSchoolNameWithoutClassName() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", 1)
-            createStudent(this, 2, "Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", 1)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
-
-        assertEquals(2, students.size)
-
-        students[0].run {
-            assertEquals(1, studentId)
-            assertEquals("", className)
-            assertEquals("Publiczna szkoła Wulkanowego nr 1 w fakelog.cf", schoolName)
-        }
-
-        students[1].run {
-            assertEquals(2, studentId)
-            assertEquals("", className)
-            assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
-        }
-    }
-
-    @Test
-    fun markAtLeastAndOnlyOneSemesterAtCurrent() {
-        helper.createDatabase(dbName, 12).apply {
-            createStudent(this, 1, "", 5)
-            createSemester(this, 1, 5, 1, 1, false)
-            createSemester(this, 1, 5, 2, 1, false)
-            createSemester(this, 1, 5, 3, 2, false)
-            createSemester(this, 1, 5, 4, 2, false)
-
-            createStudent(this, 2, "", 5)
-            createSemester(this, 2, 5, 5, 5, true)
-            createSemester(this, 2, 5, 6, 5, true)
-            createSemester(this, 2, 5, 7, 55, true)
-            createSemester(this, 2, 5, 8, 55, true)
-
-            createStudent(this, 3, "", 5)
-            createSemester(this, 3, 5, 11, 99, false)
-            createSemester(this, 3, 5, 12, 99, false)
-            createSemester(this, 3, 5, 13, 100, false)
-            createSemester(this, 3, 5, 14, 100, true)
-            close()
-        }
-
-        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
-
-        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
-        semesters1[0].run {
-            assertFalse(isCurrent)
-            assertEquals(1, semesterId)
-            assertEquals(1, diaryId)
-        }
-        semesters1[2].run {
-            assertFalse(isCurrent)
-            assertEquals(3, semesterId)
-            assertEquals(2, diaryId)
-        }
-        semesters1[3].run {
-            assertTrue(isCurrent)
-            assertEquals(4, semesterId)
-            assertEquals(2, diaryId)
-        }
-
-        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)
-            assertEquals(of(1970, 1, 1), it[0].start)
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
-        }
-
-        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)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
-        }
-    }
-
-    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")
-            put("loginType", "STANDARD")
-            put("email", "jan@fakelog.cf")
-            put("password", "******")
-            put("symbol", "Default")
-            put("student_id", studentId)
-            put("class_id", classId)
-            put("student_name", "Jan Kowalski")
-            put("school_id", schoolId)
-            put("school_name", schoolName)
-            put("is_current", false)
-            put("registration_date", "0")
-        })
-    }
-
-    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, classId: Int, semesterId: Int, diaryId: Int, isCurrent: Boolean = false) {
-        db.insert("Semesters", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-            put("student_id", studentId)
-            put("diary_id", diaryId)
-            put("diary_name", "IA")
-            put("semester_id", semesterId)
-            put("semester_name", "1")
-            put("is_current", isCurrent)
-            put("class_id", classId)
-            put("unit_id", "99")
-        })
-    }
-}

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

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

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

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

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

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

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

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

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

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

@@ -1,115 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class GradeStatisticsLocalTest {
-
-    private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
-            .build()
-        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun saveAndRead_subject() {
-        gradeStatisticsLocal.saveGradesStatistics(listOf(
-            getGradeStatistics("Matematyka", 2, 1),
-            getGradeStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Matematyka"
-        ).blockingGet()
-        assertEquals(1, stats.size)
-        assertEquals(stats[0].subject, "Matematyka")
-    }
-
-    @Test
-    fun saveAndRead_all() {
-        gradeStatisticsLocal.saveGradesStatistics(listOf(
-            getGradeStatistics("Matematyka", 2, 1),
-            getGradeStatistics("Chemia", 2, 1),
-            getGradeStatistics("Fizyka", 1, 2)
-        ))
-
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(1, stats.size)
-        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/local/AttendanceLocalTest.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.attendance
+package io.github.wulkanowy.data.repositories.local
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -11,7 +11,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,13 +34,13 @@ class AttendanceLocalTest {
     @Test
     fun saveAndReadTest() {
         attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", ""),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
+                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "")
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+                .getAttendance(Semester(1, 1, 2, "", 3, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )

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

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.exam
+package io.github.wulkanowy.data.repositories.local
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
@@ -40,7 +40,7 @@ class ExamLocalTest {
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                .getExams(Semester(1, 1, 2, "", 3, 1),
                         LocalDate.of(2018, 9, 10),
                         LocalDate.of(2018, 9, 14)
                 )

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

@@ -1,17 +1,16 @@
-package io.github.wulkanowy.data.repositories.student
+package io.github.wulkanowy.data.repositories.local
 
 import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.SharedPrefHelper
 import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -21,15 +20,15 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedProvider: SharedPrefProvider
+    private lateinit var sharedHelper: SharedPrefHelper
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        sharedHelper = SharedPrefHelper(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
-        studentLocal = StudentLocal(testDb.studentDao, context)
+        studentLocal = StudentLocal(testDb.studentDao, sharedHelper, context)
     }
 
     @After
@@ -39,8 +38,9 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        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 = "")))
+        studentLocal.saveStudent(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true))
             .blockingGet()
+        assert(studentLocal.isStudentSaved)
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)

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

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

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

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

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

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

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

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

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

@@ -1,114 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import android.os.Build.VERSION_CODES.P
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.api.Api
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
-import io.reactivex.Single
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.of
-import kotlin.test.assertEquals
-
-@SdkSuppress(minSdkVersion = P)
-@RunWith(AndroidJUnit4::class)
-class TimetableRepositoryTest {
-
-    @SpyK
-    private var mockApi = Api()
-
-    private val settings = InternetObservingSettings.builder()
-        .strategy(TestInternetObservingStrategy())
-        .build()
-
-    @MockK
-    private lateinit var semesterMock: Semester
-
-    private lateinit var timetableRemote: TimetableRemote
-
-    private lateinit var timetableLocal: TimetableLocal
-
-    private lateinit var testDb: AppDatabase
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        timetableLocal = TimetableLocal(testDb.timetableDao)
-        timetableRemote = TimetableRemote(mockApi)
-
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.diaryId } returns 2
-    }
-
-    @After
-    fun closeDb() {
-        testDb.close()
-    }
-
-    @Test
-    fun copyRoomToCompletedFromPrevious() {
-        timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
-            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
-            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(2, of(2019, 3, 5, 8, 50), "", "Religia"),
-            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(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

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

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

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

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

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

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

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

@@ -1,13 +0,0 @@
-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,6 +4,8 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
+    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck"/>
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -18,13 +20,14 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -32,45 +35,26 @@
             android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
             android:theme="@style/WulkanowyTheme.NoActionBar" />
-        <activity
-            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.job.SyncWorker"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
+            </intent-filter>
+        </service>
         <service
             android:name=".services.widgets.TimetableWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver
-            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
+            android:name=".ui.widgets.timetable.TimetableWidgetProvider"
-            android:exported="true"
             android:label="@string/timetable_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -79,22 +63,6 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/provider_widget_timetable" />
         </receiver>
-        <receiver
-            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider"
-            android:label="@string/lucky_number_title">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/provider_widget_lucky_number" />
-        </receiver>
-
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            android:exported="false"
-            tools:node="remove" />
 
         <meta-data
             android:name="io.fabric.ApiKey"

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

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

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

@@ -14,22 +14,14 @@ class ApiHelper @Inject constructor(private val api: Api) {
             symbol = student.symbol
             schoolSymbol = student.schoolSymbol
             studentId = student.studentId
-            classId = student.classId
+            useNewStudent = false
             host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
             ssl = student.endpoint.startsWith("https")
             loginType = Api.LoginType.valueOf(student.loginType)
-            useNewStudent = true
         }
     }
 
     fun initApi(email: String, password: String, symbol: String, endpoint: String) {
-        api.apply {
+        initApi(Student(email = email, password = password, symbol = symbol, endpoint = endpoint, loginType = "AUTO"))
-            this.email = email
-            this.password = password
-            this.symbol = symbol
-            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
-            ssl = endpoint.startsWith("https")
-            useNewStudent = true
-        }
     }
 }

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

@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.SocketInternetObservingStrategy
 import com.readystatesoftware.chuck.api.ChuckCollector
 import com.readystatesoftware.chuck.api.ChuckInterceptor
 import com.readystatesoftware.chuck.api.RetentionManager
@@ -13,7 +13,7 @@ import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.api.Api
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
 import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
@@ -27,7 +27,8 @@ internal class RepositoryModule {
     @Provides
     fun provideInternetObservingSettings(): InternetObservingSettings {
         return InternetObservingSettings.builder()
-            .strategy(WalledGardenInternetObservingStrategy())
+            .strategy(SocketInternetObservingStrategy())
+            .host("www.google.com")
             .build()
     }
 
@@ -49,7 +50,7 @@ internal class RepositoryModule {
     @Provides
     fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
         return ChuckCollector(context)
-            .showNotification(prefRepository.isDebugNotificationEnable)
+            .showNotification(prefRepository.isShowChuckerNotification)
             .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
     }
 
@@ -81,14 +82,6 @@ internal class RepositoryModule {
     @Provides
     fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
 
-    @Singleton
-    @Provides
-    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
-
-    @Singleton
-    @Provides
-    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
-
     @Singleton
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
@@ -120,32 +113,4 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSubjectDao(database: AppDatabase) = database.subjectDao
-
-    @Singleton
-    @Provides
-    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
-
-    @Singleton
-    @Provides
-    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
-
-    @Singleton
-    @Provides
-    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
-
-    @Singleton
-    @Provides
-    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
-
-    @Singleton
-    @Provides
-    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
-
-    @Singleton
-    @Provides
-    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
-
-    @Singleton
-    @Provides
-    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
 }

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

@@ -6,66 +6,30 @@ 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.HomeworkDao
 import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Homework
-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.Homework
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.migrations.Migration10
-import io.github.wulkanowy.data.db.migrations.Migration11
-import io.github.wulkanowy.data.db.migrations.Migration12
-import io.github.wulkanowy.data.db.migrations.Migration13
-import io.github.wulkanowy.data.db.migrations.Migration14
-import io.github.wulkanowy.data.db.migrations.Migration15
-import io.github.wulkanowy.data.db.migrations.Migration16
-import io.github.wulkanowy.data.db.migrations.Migration17
-import io.github.wulkanowy.data.db.migrations.Migration18
-import io.github.wulkanowy.data.db.migrations.Migration2
-import io.github.wulkanowy.data.db.migrations.Migration3
-import io.github.wulkanowy.data.db.migrations.Migration4
-import io.github.wulkanowy.data.db.migrations.Migration5
-import io.github.wulkanowy.data.db.migrations.Migration6
-import io.github.wulkanowy.data.db.migrations.Migration7
-import io.github.wulkanowy.data.db.migrations.Migration8
-import io.github.wulkanowy.data.db.migrations.Migration9
 import javax.inject.Singleton
 
 @Singleton
@@ -79,57 +43,21 @@ import javax.inject.Singleton
         AttendanceSummary::class,
         Grade::class,
         GradeSummary::class,
-        GradeStatistics::class,
-        GradePointsStatistics::class,
         Message::class,
         Note::class,
         Homework::class,
-        Subject::class,
+        Subject::class
-        LuckyNumber::class,
-        CompletedLesson::class,
-        ReportingUnit::class,
-        Recipient::class,
-        MobileDevice::class,
-        Teacher::class,
-        School::class
     ],
-    version = AppDatabase.VERSION_SCHEMA,
+    version = 1,
-    exportSchema = true
+    exportSchema = false
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 18
-
-        fun getMigrations(): Array<Migration> {
-            return arrayOf(
-                Migration2(),
-                Migration3(),
-                Migration4(),
-                Migration5(),
-                Migration6(),
-                Migration7(),
-                Migration8(),
-                Migration9(),
-                Migration10(),
-                Migration11(),
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15(),
-                Migration16(),
-                Migration17(),
-                Migration18()
-            )
-        }
-
         fun newInstance(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
                 .setJournalMode(TRUNCATE)
-                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
-                .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(*getMigrations())
                 .build()
         }
     }
@@ -150,10 +78,6 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeSummaryDao: GradeSummaryDao
 
-    abstract val gradeStatistics: GradeStatisticsDao
-
-    abstract val gradePointsStatistics: GradePointsStatisticsDao
-
     abstract val messagesDao: MessagesDao
 
     abstract val noteDao: NoteDao
@@ -161,18 +85,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val homeworkDao: HomeworkDao
 
     abstract val subjectDao: SubjectDao
-
-    abstract val luckyNumberDao: LuckyNumberDao
-
-    abstract val completedLessonsDao: CompletedLessonsDao
-
-    abstract val reportingUnitDao: ReportingUnitDao
-
-    abstract val recipientDao: RecipientDao
-
-    abstract val mobileDeviceDao: MobileDeviceDao
-
-    abstract val teacherDao: TeacherDao
-
-    abstract val schoolDao: SchoolDao
 }

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

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

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

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

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

@@ -1,20 +0,0 @@
-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/CompletedLessonsDao.kt

@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface CompletedLessonsDao {
-
-    @Insert
-    fun insertAll(exams: List<CompletedLesson>)
-
-    @Delete
-    fun deleteAll(exams: List<CompletedLesson>)
-
-    @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
-}

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

@@ -16,6 +16,9 @@ interface GradeDao {
     @Insert
     fun insertAll(grades: List<Grade>)
 
+    @Update
+    fun update(grade: Grade)
+
     @Update
     fun updateAll(grade: List<Grade>)
 
@@ -25,4 +28,6 @@ interface GradeDao {
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 
+    @Query("SELECT * FROM Grades WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
+    fun loadAllNew(semesterId: Int, studentId: Int): Maybe<List<Grade>>
 }

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

@@ -1,26 +0,0 @@
-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/GradeStatisticsDao.kt

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

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

@@ -18,6 +18,6 @@ interface GradeSummaryDao {
     @Delete
     fun deleteAll(gradesSummary: List<GradeSummary>)
 
-    @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
+    @Query("SELECT * FROM grades_summary WHERE student_id = :studentId AND semester_id = :semesterId")
     fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
 }

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

@@ -19,6 +19,6 @@ interface HomeworkDao {
     @Delete
     fun deleteAll(homework: List<Homework>)
 
-    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
+    @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date = :date")
-    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
+    fun loadAll(semesterId: Int, studentId: Int, date: LocalDate): Maybe<List<Homework>>
 }

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

@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Update
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface LuckyNumberDao {
-
-    @Insert
-    fun insert(luckyNumber: LuckyNumber)
-
-    @Update
-    fun update(luckyNumber: LuckyNumber)
-
-    @Delete
-    fun delete(luckyNumber: LuckyNumber)
-
-    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
-    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
-
-}

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

@@ -12,20 +12,26 @@ import io.reactivex.Maybe
 interface MessagesDao {
 
     @Insert
-    fun insertAll(messages: List<Message>)
+    fun insertAll(messages: List<Message>): List<Long>
 
     @Delete
     fun deleteAll(messages: List<Message>)
 
+    @Update
+    fun update(message: Message)
+
     @Update
     fun updateAll(messages: List<Message>)
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND real_id = :id")
-    fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
+    fun loadOne(studentId: Int, id: Int): Maybe<Message>
 
-    @Query("SELECT * FROM Messages WHERE id = :id")
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun load(id: Long): Maybe<Message>
+    fun load(studentId: Int, folder: Int): Maybe<List<Message>>
 
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>
+
+    @Query("SELECT * FROM Messages WHERE unread = 1 AND student_id = :studentId")
+    fun loadNewMessages(studentId: Int): Maybe<List<Message>>
 }

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

@@ -1,21 +0,0 @@
-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/NoteDao.kt

@@ -16,13 +16,18 @@ interface NoteDao {
     @Insert
     fun insertAll(notes: List<Note>)
 
+    @Update
+    fun update(note: Note)
+
     @Update
     fun updateAll(notes: List<Note>)
 
     @Delete
     fun deleteAll(notes: List<Note>)
 
-    @Query("SELECT * FROM Notes WHERE student_id = :studentId")
+    @Query("SELECT * FROM Notes WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(studentId: Int): Maybe<List<Note>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Note>>
 
+    @Query("SELECT * FROM Notes WHERE is_read = 0 AND semester_id = :semesterId AND student_id = :studentId")
+    fun loadNew(semesterId: Int, studentId: Int): Maybe<List<Note>>
 }

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

@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface RecipientDao {
-
-    @Insert
-    fun insertAll(messages: List<Recipient>)
-
-    @Delete
-    fun deleteAll(messages: List<Recipient>)
-
-    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
-    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
-}

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

@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface ReportingUnitDao {
-
-    @Insert
-    fun insertAll(reportingUnits: List<ReportingUnit>)
-
-    @Delete
-    fun deleteAll(reportingUnits: List<ReportingUnit>)
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    fun load(studentId: Int): Maybe<List<ReportingUnit>>
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
-}

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

@@ -1,23 +0,0 @@
-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.School
-import io.reactivex.Maybe
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface SchoolDao {
-
-    @Insert
-    fun insert(school: School)
-
-    @Delete
-    fun delete(school: School)
-
-    @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Maybe<School>
-}

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

@@ -1,8 +1,8 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
-import androidx.room.Delete
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy.IGNORE
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
@@ -12,12 +12,15 @@ import javax.inject.Singleton
 @Dao
 interface SemesterDao {
 
-    @Insert
+    @Insert(onConflict = IGNORE)
     fun insertAll(semester: List<Semester>)
 
-    @Delete
+    @Query("SELECT * FROM Semesters WHERE student_id = :studentId")
-    fun deleteAll(semester: List<Semester>)
+    fun loadAll(studentId: Int): Maybe<List<Semester>>
 
-    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
+    @Query("UPDATE Semesters SET is_current = 1 WHERE semester_id = :semesterId AND diary_id = :diaryId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
+    fun updateCurrent(semesterId: Int, diaryId: Int)
+
+    @Query("UPDATE Semesters SET is_current = 0 WHERE student_id = :studentId")
+    fun resetCurrent(studentId: Int)
 }

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

@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy.ABORT
+import androidx.room.OnConflictStrategy.FAIL
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Student
 import io.reactivex.Maybe
@@ -13,8 +13,8 @@ import javax.inject.Singleton
 @Dao
 interface StudentDao {
 
-    @Insert(onConflict = ABORT)
+    @Insert(onConflict = FAIL)
-    fun insertAll(student: List<Student>): List<Long>
+    fun insert(student: Student): Long
 
     @Delete
     fun delete(student: Student)
@@ -25,8 +25,8 @@ interface StudentDao {
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 
-    @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
+    @Query("UPDATE Students SET is_current = 1 WHERE student_id = :studentId")
-    fun updateCurrent(id: Long)
+    fun updateCurrent(studentId: Int)
 
     @Query("UPDATE Students SET is_current = 0")
     fun resetCurrent()

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

@@ -1,23 +0,0 @@
-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(teachers: List<Teacher>)
-
-    @Delete
-    fun deleteAll(teachers: 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/Attendance.kt

@@ -10,30 +10,30 @@ import java.io.Serializable
 data class Attendance(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
-    val number: Int,
+    var number: Int,
 
-    val subject: String,
+    var subject: String,
 
-    val name: String,
+    var name: String,
 
-    val presence: Boolean,
+    var presence: Boolean = false,
 
-    val absence: Boolean,
+    var absence: Boolean = false,
 
-    val exemption: Boolean,
+    var exemption: Boolean = false,
 
-    val lateness: Boolean,
+    var lateness: Boolean = false,
 
-    val excused: Boolean,
+    var excused: Boolean = false,
 
-    val deleted: Boolean
+    var deleted: Boolean = false
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -10,13 +10,13 @@ import java.io.Serializable
 data class AttendanceSummary(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
     @ColumnInfo(name = "subject_id")
-    val subjectId: Int,
+    var subjectId: Int = 0,
 
     val month: Month,
 

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

@@ -1,40 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
-import java.io.Serializable
-
-@Entity(tableName = "CompletedLesson")
-data class CompletedLesson(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
-
-    val date: LocalDate,
-
-    val number: Int,
-
-    val subject: String,
-
-    val topic: String,
-
-    val teacher: String,
-
-    @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String,
-
-    val substitution: String,
-
-    val absence: String,
-
-    val resources: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -9,29 +9,29 @@ import java.io.Serializable
 @Entity(tableName = "Exams")
 data class Exam(
 
-    @ColumnInfo(name = "student_id")
+        @ColumnInfo(name = "student_id")
-    val studentId: Int,
+        var studentId: Int,
 
-    @ColumnInfo(name = "diary_id")
+        @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+        var diaryId: Int,
 
-    val date: LocalDate,
+        var date: LocalDate,
 
-    @ColumnInfo(name = "entry_date")
+        @ColumnInfo(name = "entry_date")
-    val entryDate: LocalDate,
+        var entryDate: LocalDate = LocalDate.now(),
 
-    val subject: String,
+        var subject: String,
 
-    val group: String,
+        var group: String,
 
-    val type: String,
+        var type: String,
 
-    val description: String,
+        var description: String,
 
-    val teacher: String,
+        var teacher: String,
 
-    @ColumnInfo(name = "teacher_symbol")
+        @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+        var teacherSymbol: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -10,35 +10,35 @@ import java.io.Serializable
 data class Grade(
 
     @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+    var semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
-    val subject: String,
+    var subject: String,
 
-    val entry: String,
+    var entry: String,
 
-    val value: Int,
+    var value: Int,
 
-    val modifier: Double,
+    var modifier: Double,
 
-    val comment: String,
+    var comment: String,
 
-    val color: String,
+    var color: String,
 
     @ColumnInfo(name = "grade_symbol")
-    val gradeSymbol: String,
+    var gradeSymbol: String,
 
-    val description: String,
+    var description: String,
 
-    val weight: String,
+    var weight: String,
 
-    val weightValue: Double,
+    var weightValue: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
-    val teacher: String
+    var teacher: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -1,24 +0,0 @@
-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/GradeStatistics.kt

@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "GradesStatistics")
-data class GradeStatistics(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    val subject: String,
-
-    val grade: Int,
-
-    val amount: Int,
-
-    @ColumnInfo(name = "is_semester")
-    val semester: Boolean
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -4,36 +4,22 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "GradesSummary")
+@Entity(tableName = "Grades_Summary")
 data class GradeSummary(
 
-    @ColumnInfo(name = "semester_id")
+        @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+        var semesterId: Int,
 
-    @ColumnInfo(name = "student_id")
+        @ColumnInfo(name = "student_id")
-    val studentId: Int,
+        var studentId: Int,
 
-    val position: Int,
+        var subject: String,
 
-    val subject: String,
+        var predictedGrade: String,
 
-    @ColumnInfo(name = "predicted_grade")
+        var finalGrade: String
-    val predictedGrade: 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/Homework.kt

@@ -10,24 +10,24 @@ import java.io.Serializable
 data class Homework(
 
     @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+    var semesterId: Int,
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
     @ColumnInfo(name = "entry_date")
-    val entryDate: LocalDate,
+    var entryDate: LocalDate,
 
-    val subject: String,
+    var subject: String,
 
-    val content: String,
+    var content: String,
 
-    val teacher: String,
+    var teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+    var teacherSymbol: String
 
 ) : Serializable {
 

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

@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
-import java.io.Serializable
-
-@Entity(tableName = "LuckyNumbers")
-data class LuckyNumber (
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    val date: LocalDate,
-
-    @ColumnInfo(name = "lucky_number")
-    val luckyNumber: Int
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-
-    @ColumnInfo(name = "is_notified")
-    var isNotified: Boolean = true
-}

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

@@ -10,39 +10,40 @@ import java.io.Serializable
 data class Message(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int? = null,
 
     @ColumnInfo(name = "real_id")
-    val realId: Int,
+    val realId: Int? = null,
 
     @ColumnInfo(name = "message_id")
-    val messageId: Int,
+    val messageId: Int? = null,
 
     @ColumnInfo(name = "sender_name")
-    val sender: String,
+    val sender: String? = null,
 
     @ColumnInfo(name = "sender_id")
-    val senderId: Int,
+    val senderId: Int? = null,
+
+    @ColumnInfo(name = "recipient_id")
+    val recipientId: Int? = null,
 
     @ColumnInfo(name = "recipient_name")
-    val recipient: String,
+    val recipient: String? = "",
 
-    val subject: String,
+    val subject: String = "",
 
-    val date: LocalDateTime,
+    val date: LocalDateTime? = null,
 
     @ColumnInfo(name = "folder_id")
-    val folderId: Int,
+    val folderId: Int = 0,
 
-    var unread: Boolean,
+    var unread: Boolean? = false,
 
-    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int? = 0,
-    val unreadBy: Int,
 
-    @ColumnInfo(name = "read_by")
+    val readBy: Int? = 0,
-    val readBy: Int,
 
-    val removed: Boolean
+    val removed: Boolean = false
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -1,25 +0,0 @@
-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/Note.kt

@@ -9,23 +9,26 @@ import java.io.Serializable
 @Entity(tableName = "Notes")
 data class Note(
 
+    @ColumnInfo(name = "semester_id")
+    var semesterId: Int,
+
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
-    val date: LocalDate,
+    var date: LocalDate,
 
-    val teacher: String,
+    var teacher: String,
 
-    val category: String,
+    var category: String,
 
-    val content: String
+    var content: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
     @ColumnInfo(name = "is_read")
-    var isRead: Boolean = true
+    var isRead: Boolean = false
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true

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

@@ -1,38 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "Recipients")
-data class Recipient(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val realId: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "real_name")
-    val realName: String,
-
-    @ColumnInfo(name = "login_id")
-    val loginId: Int,
-
-    @ColumnInfo(name = "unit_id")
-    val unitId: Int,
-
-    val role: Int,
-
-    val hash: String
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-
-    override fun toString() = name
-}

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

@@ -1,32 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "ReportingUnits")
-data class ReportingUnit(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
-
-    @ColumnInfo(name = "short")
-    val shortName: String,
-
-    @ColumnInfo(name = "sender_id")
-    val senderId: Int,
-
-    @ColumnInfo(name = "sender_name")
-    val senderName: String,
-
-    val roles: List<Int>
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "School")
-data class School(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    val name: String,
-
-    val address: String,
-
-    val contact: String,
-
-    val headmaster: String,
-
-    val pedagogue: String
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -4,43 +4,28 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
 
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
+
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
     @ColumnInfo(name = "diary_name")
-    val diaryName: String,
+    var diaryName: String,
-
-    @ColumnInfo(name = "school_year")
-    val schoolYear: Int,
 
     @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
+    var semesterId: Int,
 
     @ColumnInfo(name = "semester_name")
-    val semesterName: Int,
+    var semesterName: Int,
 
     @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
+    var isCurrent: Boolean = false
-
+)
-    val start: LocalDate,
-
-    val end: LocalDate,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
-
-    @ColumnInfo(name = "unit_id")
-    val unitId: Int
-) {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -4,47 +4,35 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDateTime
-import java.io.Serializable
 
-@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
+@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id"], unique = true)])
 data class Student(
 
-    val endpoint: String,
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0,
 
-    val loginType: String,
+    var endpoint: String,
 
-    val email: String,
+    var loginType: String,
+
+    var email: String,
 
     var password: String,
 
-    val symbol: String,
+    var symbol: String = "",
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int = 0,
 
     @ColumnInfo(name = "student_name")
-    val studentName: String,
+    var studentName: String = "",
 
     @ColumnInfo(name = "school_id")
-    val schoolSymbol: String,
+    var schoolSymbol: String = "",
 
     @ColumnInfo(name = "school_name")
-    val schoolName: String,
+    var schoolName: String = "",
-
-    @ColumnInfo(name = "class_name")
-    val className: String,
-
-    @ColumnInfo(name = "class_id")
-    val classId: Int,
 
     @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
+    var isCurrent: Boolean = false
-
+)
-    @ColumnInfo(name = "registration_date")
-    val registrationDate: LocalDateTime
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}

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

@@ -9,15 +9,15 @@ import java.io.Serializable
 data class Subject(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    var studentId: Int,
 
     @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+    var diaryId: Int,
 
     @ColumnInfo(name = "real_id")
-    val realId: Int,
+    var realId: Int,
 
-    val name: String
+    var name: String
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -1,27 +0,0 @@
-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/entities/Timetable.kt

@@ -10,39 +10,33 @@ import java.io.Serializable
 @Entity(tableName = "Timetable")
 data class Timetable(
 
-    @ColumnInfo(name = "student_id")
+        @ColumnInfo(name = "student_id")
-    val studentId: Int,
+        var studentId: Int,
 
-    @ColumnInfo(name = "diary_id")
+        @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
+        var diaryId: Int,
 
-    val number: Int,
+        val number: Int = 0,
 
-    val start: LocalDateTime,
+        val start: LocalDateTime = LocalDateTime.now(),
 
-    val end: LocalDateTime,
+        val end: LocalDateTime = LocalDateTime.now(),
 
-    val date: LocalDate,
+        val date: LocalDate,
 
-    val subject: String,
+        val subject: String,
 
-    val subjectOld: String,
+        val group: String,
 
-    val group: String,
+        val room: String,
 
-    val room: String,
+        val teacher: String,
 
-    val roomOld: String,
+        val info: String,
 
-    val teacher: String,
+        val changes: Boolean = false,
 
-    val teacherOld: String,
+        val canceled: Boolean = false
-
-    val info: String,
-
-    val changes: Boolean,
-
-    val canceled: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration10 : Migration(9, 10) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Grades_Summary RENAME TO GradesSummary")
-    }
-}

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

@@ -1,34 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration11 : Migration(10, 11) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Grades_temp (
-                id INTEGER PRIMARY KEY NOT NULL,
-                is_read INTEGER NOT NULL,
-                is_notified INTEGER NOT NULL,
-                semester_id INTEGER NOT NULL,
-                student_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                entry TEXT NOT NULL,
-                value INTEGER NOT NULL,
-                modifier REAL NOT NULL,
-                comment TEXT NOT NULL,
-                color TEXT NOT NULL,
-                grade_symbol TEXT NOT NULL,
-                description TEXT NOT NULL,
-                weight TEXT NOT NULL,
-                weightValue REAL NOT NULL,
-                date INTEGER NOT NULL,
-                teacher TEXT NOT NULL
-            )
-        """)
-        database.execSQL("INSERT INTO Grades_temp SELECT * FROM Grades")
-        database.execSQL("DROP TABLE Grades")
-        database.execSQL("ALTER TABLE Grades_temp RENAME TO Grades")
-    }
-}

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

@@ -1,69 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration12 : Migration(11, 12) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        createTempStudentsTable(database)
-        replaceStudentTable(database)
-        updateStudentsWithClassId(database, getStudentsIds(database))
-        removeStudentsWithNoClassId(database)
-        ensureThereIsOnlyOneCurrentStudent(database)
-    }
-
-    private fun createTempStudentsTable(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Students_tmp (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                endpoint TEXT NOT NULL,
-                loginType TEXT NOT NULL,
-                email TEXT NOT NULL,
-                password TEXT NOT NULL,
-                symbol TEXT NOT NULL,
-                student_id INTEGER NOT NULL,
-                student_name TEXT NOT NULL,
-                school_id TEXT NOT NULL,
-                school_name TEXT NOT NULL,
-                is_current INTEGER NOT NULL,
-                registration_date INTEGER NOT NULL,
-                class_id INTEGER NOT NULL
-            )
-        """)
-        database.execSQL("CREATE UNIQUE INDEX index_Students_email_symbol_student_id_school_id_class_id ON Students_tmp (email, symbol, student_id, school_id, class_id)")
-    }
-
-    private fun replaceStudentTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_id INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("INSERT INTO Students_tmp SELECT * FROM Students")
-        database.execSQL("DROP TABLE Students")
-        database.execSQL("ALTER TABLE Students_tmp RENAME TO Students")
-    }
-
-    private fun getStudentsIds(database: SupportSQLiteDatabase): List<Int> {
-        val students = mutableListOf<Int>()
-        val studentsCursor = database.query("SELECT student_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun updateStudentsWithClassId(database: SupportSQLiteDatabase, students: List<Int>) {
-        students.forEach {
-            database.execSQL("UPDATE Students SET class_id = IFNULL((SELECT class_id FROM Semesters WHERE student_id = $it), 0) WHERE student_id = $it")
-        }
-    }
-
-    private fun removeStudentsWithNoClassId(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Students WHERE class_id = 0")
-    }
-
-    private fun ensureThereIsOnlyOneCurrentStudent(database: SupportSQLiteDatabase) {
-        database.execSQL("UPDATE Students SET is_current = 0")
-        database.execSQL("UPDATE Students SET is_current = 1 WHERE id = (SELECT MAX(id) FROM Students)")
-    }
-}

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

@@ -1,64 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration13 : Migration(12, 13) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        addClassNameToStudents(database, getStudentsIds(database))
-        updateSemestersTable(database)
-        markAtLeastAndOnlyOneSemesterAtCurrent(database, getStudentsAndClassIds(database))
-        clearMessagesTable(database)
-    }
-
-    private fun addClassNameToStudents(database: SupportSQLiteDatabase, students: List<Pair<Int, String>>) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN class_name TEXT DEFAULT \"\" NOT NULL")
-
-        students.forEach { (id, name) ->
-            val schoolName = name.substringAfter(" - ")
-            val className = name.substringBefore(" - ", "").replace("Klasa ", "")
-            database.execSQL("UPDATE Students SET class_name = '$className' WHERE id = '$id'")
-            database.execSQL("UPDATE Students SET school_name = '$schoolName' WHERE id = '$id'")
-        }
-    }
-
-    private fun getStudentsIds(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
-        val students = mutableListOf<Pair<Int, String>>()
-        val studentsCursor = database.query("SELECT id, school_name FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getString(1))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun updateSemestersTable(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN school_year INTEGER DEFAULT 1970 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN start INTEGER DEFAULT 0 NOT NULL")
-        database.execSQL("ALTER TABLE Semesters ADD COLUMN `end` INTEGER DEFAULT 0 NOT NULL")
-    }
-
-    private fun getStudentsAndClassIds(database: SupportSQLiteDatabase): List<Pair<Int, Int>> {
-        val students = mutableListOf<Pair<Int, Int>>()
-        val studentsCursor = database.query("SELECT student_id, class_id FROM Students")
-        if (studentsCursor.moveToFirst()) {
-            do {
-                students.add(studentsCursor.getInt(0) to studentsCursor.getInt(1))
-            } while (studentsCursor.moveToNext())
-        }
-        return students
-    }
-
-    private fun markAtLeastAndOnlyOneSemesterAtCurrent(database: SupportSQLiteDatabase, students: List<Pair<Int, Int>>) {
-        students.forEach { (studentId, classId) ->
-            database.execSQL("UPDATE Semesters SET is_current = 0 WHERE student_id = '$studentId' AND class_id = '$classId'")
-            database.execSQL("UPDATE Semesters SET is_current = 1 WHERE id = (SELECT id FROM Semesters WHERE student_id = '$studentId' AND class_id = '$classId' ORDER BY semester_id DESC)")
-        }
-    }
-
-    private fun clearMessagesTable(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM Messages")
-    }
-}