Merge branch 'release/0.19.0'

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>

.bettercodehub.yml

@@ -1,3 +1,3 @@
-component_depth: 8
+component_depth: 10
 languages:
 - kotlin

.gitignore

@@ -63,6 +63,7 @@ captures/
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
+.idea/discord.xml
 
 # Keystore files
 *.jks

.idea/codeStyles/Project.xml

@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>

.travis.yml

@@ -4,7 +4,7 @@ jdk: oraclejdk8
 env:
  global:
     - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.14.1
+    - 0.19.0
 
 android:
  licenses:
@@ -48,20 +48,15 @@ before_script:
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
-  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
-  - ./gradlew jacocoTestReport --stacktrace --daemon
-  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
-      git fetch --unshallow;
-      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
-    fi
+  - ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
+  - ./gradlew -Pcoverage createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
   - |
     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 publishPlayRelease -PenableFirebase --stacktrace;
     fi
 
 after_success:

app/build.gradle

@@ -1,30 +1,30 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 16
+        minSdkVersion 17
         targetSdkVersion 29
-        versionCode 50
-        versionName "0.14.1"
+        versionCode 63
+        versionName "0.19.0"
         multiDexEnabled true
+        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
-                crashlytics_enabled: project.hasProperty("enableCrashlytics")
+                firebase_enabled: project.hasProperty("enableFirebase")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
@@ -51,18 +51,17 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
+            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = true
-            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
+            testCoverageEnabled = project.hasProperty('coverage')
+            ext.enableCrashlytics = project.hasProperty("enableFirebase")
         }
     }
 
@@ -74,11 +73,14 @@ android {
         }
 
         fdroid {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
             dimension "platform"
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     lintOptions {
         disable 'HardwareIds'
     }
@@ -96,10 +98,10 @@ android {
         exclude 'META-INF/library_release.kotlin_module'
         exclude 'META-INF/library-core_release.kotlin_module'
     }
-}
 
-androidExtensions {
-    experimental = true
+    aboutLibraries {
+        configPath = "app/src/main/res/raw"
+    }
 }
 
 play {
@@ -110,10 +112,10 @@ play {
 }
 
 ext {
-    work_manager = "2.3.0-rc01"
-    room = "2.2.3"
-    dagger = "2.25.4"
-    chucker = "2.0.4"
+    work_manager = "2.3.4"
+    room = "2.2.5"
+    dagger = "2.28"
+    chucker = "3.2.0"
     mockk = "1.9.2"
 }
 
@@ -122,25 +124,25 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.14.1"
+    implementation "io.github.wulkanowy:sdk:0.19.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0-rc01"
-    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
     implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.0-rc05"
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.1.0-rc01"
-    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
+    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.github.wulkanowy:material-chips-input:2.1.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
@@ -148,6 +150,8 @@ dependencies {
     implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.0'
+
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -159,36 +163,41 @@ dependencies {
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
     kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
 
-    implementation "eu.davidea:flexible-adapter:5.1.0"
-    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.1.0"
+    implementation "com.github.YarikSOffice:lingver:1.2.2"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.8"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.16"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
 
     implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.4"
     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.7"
-    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
+    implementation "fr.bipi.treessence:treessence:0.3.2"
+    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "io.coil-kt:coil:0.11.0"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
+    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
 
-    playImplementation "com.google.firebase:firebase-core:17.2.1"
-    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    playImplementation 'com.google.firebase:firebase-analytics:17.4.3'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.7'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.7"
+    playImplementation 'com.google.firebase:firebase-messaging:20.2.0'
+    playImplementation 'com.google.firebase:firebase-crashlytics:17.0.1'
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
-    debugImplementation "fr.o80.chucker:library:$chucker"
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-inline:3.2.4"
+    testImplementation "org.threeten:threetenbp:1.4.4"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
 
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
@@ -196,7 +205,7 @@ dependencies {
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-android:3.2.4"
+    androidTestImplementation "org.mockito:mockito-android:3.3.3"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/jacoco.gradle

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

app/proguard-rules.pro

@@ -43,3 +43,10 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
+
+
+#Config for About Libraries
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}

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

@@ -8,7 +8,6 @@ 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
@@ -104,45 +103,45 @@ class Migration13Test : AbstractMigrationTest() {
         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 }
+        assertTrue { semesters1.single { it.second }.second }
         semesters1[0].run {
-            assertFalse(isCurrent)
-            assertEquals(1, semesterId)
-            assertEquals(1, diaryId)
+            assertFalse(second)
+            assertEquals(1, first.semesterId)
+            assertEquals(1, first.diaryId)
         }
         semesters1[2].run {
-            assertFalse(isCurrent)
-            assertEquals(3, semesterId)
-            assertEquals(2, diaryId)
+            assertFalse(second)
+            assertEquals(3, first.semesterId)
+            assertEquals(2, first.diaryId)
         }
         semesters1[3].run {
-            assertTrue(isCurrent)
-            assertEquals(4, semesterId)
-            assertEquals(2, diaryId)
+            assertTrue(second)
+            assertEquals(4, first.semesterId)
+            assertEquals(2, first.diaryId)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.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 { semesters ->
+            assertTrue { semesters.single { it.second }.second }
+            assertEquals(1970, semesters[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), semesters[0].first.end)
+            assertEquals(of(1970, 1, 1), semesters[0].first.start)
+            assertFalse(semesters[0].second)
+            assertFalse(semesters[1].second)
+            assertFalse(semesters[2].second)
+            assertTrue(semesters[3].second)
         }
 
-        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)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
+            assertTrue { semesters.single { it.second }.second }
+            assertFalse(semesters[0].second)
+            assertFalse(semesters[1].second)
+            assertFalse(semesters[2].second)
+            assertTrue(semesters[3].second)
         }
     }
 
-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
-        val semesters = mutableListOf<Semester>()
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
+        val semesters = mutableListOf<Pair<Semester, Boolean>>()
 
         val cursor = db.query(query)
         if (cursor.moveToFirst()) {
@@ -153,13 +152,12 @@ class Migration13Test : AbstractMigrationTest() {
                     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))!!
-                ))
+                ) to (cursor.getInt(6) == 1))
             } while (cursor.moveToNext())
         }
         return semesters.toList()

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

@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.entities.Student
+import org.threeten.bp.LocalDateTime
+
+fun getStudent(): Student {
+    return Student(
+        email = "test",
+        password = "test123",
+        schoolSymbol = "23",
+        scrapperBaseUrl = "fakelog.cf",
+        loginType = "AUTO",
+        isCurrent = true,
+        studentName = "",
+        schoolShortName = "",
+        schoolName = "",
+        studentId = 0,
+        classId = 1,
+        symbol = "",
+        registrationDate = LocalDateTime.now(),
+        className = "",
+        loginMode = "API",
+        certificateKey = "",
+        privateKey = "",
+        mobileBaseUrl = "",
+        userLoginId = 0,
+        isParent = false
+    )
+}

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

@@ -12,6 +12,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,19 +36,49 @@ 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, 14), 0, "", "", false, false, false, false, false, false),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
+            getAttendanceEntity(
+                of(2018, 9, 10),
+                SentExcuseStatus.ACCEPTED
+            ),
+            getAttendanceEntity(
+                of(2018, 9, 14),
+                SentExcuseStatus.WAITING
+            ),
+            getAttendanceEntity(
+                of(2018, 9, 17),
+                SentExcuseStatus.ACCEPTED
+            )
         ))
 
         val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, attendance.size)
-        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(attendance[0].date, of(2018, 9, 10))
+        assertEquals(attendance[1].date, of(2018, 9, 14))
     }
+
+    private fun getAttendanceEntity(
+        date: LocalDate,
+        excuseStatus: SentExcuseStatus
+    ) = Attendance(
+        studentId = 1,
+        diaryId = 2,
+        timeId = 3,
+        date = date,
+        number = 0,
+        subject = "",
+        name = "",
+        presence = false,
+        absence = false,
+        exemption = false,
+        lateness = false,
+        excused = false,
+        deleted = false,
+        excusable = false,
+        excuseStatus = excuseStatus.name
+    )
 }

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

@@ -11,6 +11,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,20 +37,20 @@ class CompletedLessonsLocalTest {
     @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)
+            getCompletedLesson(of(2018, 9, 10), 1),
+            getCompletedLesson(of(2018, 9, 14), 2),
+            getCompletedLesson(of(2018, 9, 17), 3)
         ))
 
         val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
             )
             .blockingGet()
         assertEquals(2, completed.size)
-        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(completed[0].date, of(2018, 9, 10))
+        assertEquals(completed[1].date, of(2018, 9, 14))
     }
 
     private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {

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

@@ -10,7 +10,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,19 +35,19 @@ class ExamLocalTest {
     @Test
     fun saveAndReadTest() {
         examLocal.saveExams(listOf(
-                Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
+            Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
         ))
 
         val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
         assertEquals(2, exams.size)
-        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(exams[0].date, of(2018, 9, 10))
+        assertEquals(exams[1].date, of(2018, 9, 14))
     }
 }

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

@@ -24,7 +24,7 @@ class GradeLocalTest {
     fun createDb() {
         testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
     }
 
     @After
@@ -40,10 +40,10 @@ class GradeLocalTest {
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
         ))
 
-        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
+        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
 
         val grades = gradeLocal
-            .getGrades(semester)
+            .getGradesDetails(semester)
             .blockingGet()
 
         assertEquals(2, grades.size)

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

@@ -6,18 +6,15 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Grade
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
-import io.mockk.just
-import io.mockk.runs
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -56,7 +53,7 @@ class GradeRepositoryTest {
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
         gradeRemote = GradeRemote(mockSdk)
 
         every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
@@ -79,10 +76,10 @@ class GradeRepositoryTest {
             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")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -103,10 +100,10 @@ class GradeRepositoryTest {
             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")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -125,12 +122,12 @@ class GradeRepositoryTest {
         every { mockSdk.getGrades(1) } returns Single.just(listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(2, grades.size)
+        assertEquals(2, grades.first.size)
     }
 
     @Test
@@ -144,12 +141,12 @@ class GradeRepositoryTest {
             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")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.size)
+        assertEquals(3, grades.first.size)
     }
 
     @Test
@@ -160,12 +157,12 @@ class GradeRepositoryTest {
             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")
-        ))
+        ) to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(3, grades.size)
+        assertEquals(3, grades.first.size)
     }
 
     @Test
@@ -175,11 +172,11 @@ class GradeRepositoryTest {
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         ))
 
-        every { mockSdk.getGrades(1) } returns Single.just(listOf())
+        every { mockSdk.getGrades(1) } returns Single.just(emptyList<Grade>() to emptyList())
 
         val grades = GradeRepository(settings, gradeLocal, gradeRemote)
             .getGrades(studentMock, semesterMock, true).blockingGet()
 
-        assertEquals(0, grades.size)
+        assertEquals(0, grades.first.size)
     }
 }

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

@@ -11,7 +11,7 @@ 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)
@@ -40,10 +40,7 @@ class GradeStatisticsLocalTest {
             getGradeStatistics("Fizyka", 1, 2)
         ))
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Matematyka"
-        ).blockingGet()
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
@@ -56,12 +53,11 @@ class GradeStatisticsLocalTest {
             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)
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
+        assertEquals(3, stats.size)
         assertEquals(stats[0].subject, "Wszystkie")
+        assertEquals(stats[1].subject, "Matematyka")
+        assertEquals(stats[2].subject, "Chemia")
     }
 
     @Test
@@ -72,11 +68,8 @@ class GradeStatisticsLocalTest {
             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) {
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        with(stats[0]) {
             assertEquals(subject, "Matematyka")
             assertEquals(others, 5.0)
             assertEquals(student, 5.0)
@@ -87,10 +80,7 @@ class GradeStatisticsLocalTest {
     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()
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
         assertEquals(null, stats)
     }
 
@@ -98,13 +88,14 @@ class GradeStatisticsLocalTest {
     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()
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
         assertEquals(null, stats)
     }
 
+    private fun getSemester(): Semester {
+        return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
+    }
+
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
         return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
     }

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

@@ -5,12 +5,13 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -36,7 +37,7 @@ class LuckyNumberLocalTest {
     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),
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
             LocalDate.of(2019, 1, 20)
         ).blockingGet()
 

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

@@ -42,7 +42,7 @@ class RecipientLocalTest {
         ))
 
         val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", 1, true, LocalDateTime.now()),
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
             2,
             ReportingUnit(1, 4, "", 0, "", emptyList())
         ).blockingGet()

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

@@ -5,13 +5,11 @@ 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.entities.Student
+import io.github.wulkanowy.data.repositories.getStudent
 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,14 +19,13 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedProvider: SharedPrefProvider
+    private val student = getStudent()
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
         studentLocal = StudentLocal(testDb.studentDao, context)
     }
 
@@ -39,8 +36,7 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", scrapperBaseUrl = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "", loginMode = "API", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 0, isParent = false)))
-            .blockingGet()
+        studentLocal.saveStudents(listOf(student)).blockingGet()
 
         val student = studentLocal.getCurrentStudent(true).blockingGet()
         assertEquals("23", student.schoolSymbol)

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

@@ -2,8 +2,8 @@ package io.github.wulkanowy.data.repositories.timetable
 
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.LocalDateTime.now
-import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
 
 fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
@@ -21,6 +21,7 @@ fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
+        isStudentPlan = true,
         changes = changes,
         canceled = false
     )

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

@@ -41,7 +41,7 @@ class TimetableLocalTest {
         ))
 
         val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
             LocalDate.of(2018, 9, 10),
             LocalDate.of(2018, 9, 14)
         ).blockingGet()

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

@@ -8,11 +8,15 @@ import androidx.test.filters.SdkSuppress
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+import io.github.wulkanowy.data.repositories.getStudent
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
 import io.reactivex.Single
 import org.junit.After
 import org.junit.Before
@@ -33,9 +37,17 @@ class TimetableRepositoryTest {
         .strategy(TestInternetObservingStrategy())
         .build()
 
+    @MockK
+    private lateinit var studentMock: Student
+
+    private val student = getStudent()
+
     @MockK
     private lateinit var semesterMock: Semester
 
+    @MockK
+    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
+
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
@@ -49,10 +61,17 @@ class TimetableRepositoryTest {
         timetableLocal = TimetableLocal(testDb.timetableDao)
         timetableRemote = TimetableRemote(mockSdk)
 
+        every { timetableNotificationSchedulerHelper.scheduleNotifications(any(), any()) } returns mockk()
+        every { timetableNotificationSchedulerHelper.cancelScheduled(any(), any()) } returns mockk()
+
+        every { studentMock.studentId } returns 1
+        every { studentMock.studentName } returns "Jan Kowalski"
+
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 2
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
+
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
@@ -77,8 +96,8 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
             .blockingGet()
 
         assertEquals(4, lessons.size)
@@ -123,8 +142,8 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
         ))
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
             .blockingGet()
 
         assertEquals(12, lessons.size)

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,16 +2,12 @@
 
 package io.github.wulkanowy.utils
 
-import android.content.Context
 import timber.log.Timber
 
-fun initCrashlytics(context: Context, appInfo: AppInfo) {
-    // do nothing
+open class TimberTreeNoOp : Timber.Tree() {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
 }
 
-class CrashlyticsTree : Timber.Tree() {
+class CrashlyticsTree : TimberTreeNoOp()
 
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        // do nothing
-    }
-}
+class CrashlyticsExceptionTree : TimberTreeNoOp()

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

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

app/src/main/AndroidManifest.xml

@@ -18,11 +18,13 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        tools:replace="android:supportsRtl,android:allowBackup">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen">
+            android:theme="@style/WulkanowyTheme.SplashScreen"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -38,13 +40,14 @@
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar" />
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
         <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" />
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
             android:excludeFromRecents="true"
@@ -90,17 +93,58 @@
                 android:resource="@xml/provider_widget_lucky_number" />
         </receiver>
 
+        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
+
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
             android:exported="false"
             tools:node="remove" />
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
+        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            android:enabled="${firebase_enabled}"
+            android:exported="false" />
+
         <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="${fabric_api_key}" />
+            android:name="firebase_analytics_collection_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="${firebase_enabled}" />
+
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${crashlytics_enabled}" />
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="firebase_messaging_auto_init_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_stat_push" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="push_channel" />
     </application>
 </manifest>

app/src/main/assets/contributors.json

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

app/src/main/assets/message-print-page.html

@@ -0,0 +1,94 @@
+<!doctype html>
+<html lang="pl">
+<head>
+    <meta charset="UTF-8">
+    <title>%SUBJECT% | Wulkanowy</title>
+    <style>
+        @page {
+            margin: 2.5cm;
+            size: A4;
+        }
+
+        body {
+            margin: 0;
+            font-family: sans-serif;
+        }
+
+        .title {
+            line-height: 1.5;
+            letter-spacing: 1pt;
+            font-size: 24pt;
+            font-weight: 200;
+            margin: 0 0 0.5cm;
+        }
+
+        .info {
+            margin: 0.5cm 0;
+        }
+
+        .info div {
+            font-size: 14pt;
+            font-weight: 400;
+            margin: 0.5cm 0;
+        }
+
+        h4 {
+            font-weight: 200;
+            text-transform: uppercase;
+            letter-spacing: 1pt;
+            font-size: 10pt;
+            margin: 0;
+            margin-bottom: 0.25cm;
+            font-family: sans-serif;
+        }
+
+        .content {
+            margin-top: 0.5cm;
+            font-size: 14pt;
+            font-weight: 400;
+            text-align: justify;
+            font-family: serif;
+            line-height: 1.5;
+        }
+
+        .content p {
+            page-break-after: auto;
+            page-break-inside: auto;
+            margin-bottom: 0.6cm;
+        }
+
+        .footer {
+            font-size: 11pt;
+            font-weight: 200;
+            display: flex;
+            align-items: center;
+            color: rgba(0, 0, 0, 0.5)
+            margin: 0;
+            margin-bottom: 0.5cm;
+        }
+        
+        .footer .logo {
+            height: 0.5cm;
+            width: 0.5cm;
+            display: block;
+            margin-right: 0.2cm;
+        }
+    </style>
+</head>
+<body>
+<h1 class="title">%SUBJECT%</h1>
+<hr>
+<div class="info">
+    %INFO%
+</div>
+<div class="footer">
+    <img src="wulkanowy-logo-black.svg" class="logo">
+    Wulkanowy Dzienniczek
+</div>
+<hr>
+<div class="content">
+    <h4>Treść wiadomości</h4>
+    %CONTENT%
+</div>
+</body>
+</html>

app/src/main/assets/wulkanowy-logo-black.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 1024 1024"
+   xml:space="preserve"
+   width="1024"
+   height="1024"><metadata
+     id="metadata15"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs13" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#D32F2F;}
+	.st1{fill:#AD2A2A;}
+	.st2{fill:#FFFFFF;}
+</style><g
+     id="layer4"
+     style="display:none;fill:#808080"><rect
+       id="XMLID_57_"
+       x="0"
+       y="0"
+       class="st0"
+       width="3584"
+       height="1024"
+       style="display:inline;fill:#808080;stroke-width:1.02195609" /></g><g
+     id="layer3"
+     style="display:none;fill:#808080"><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 3046.8164,390.66602 3134.3164,542 v 91.33398 L 3524.9824,1024 H 3584 V 732.18359 L 3242.4824,390.66602 h -23.666 l -53.0352,94.63086 -94.6308,-94.63086 z"
+       id="path18992" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 2746.9824,390.66602 62,242.66796 L 3199.6484,1024 H 3584 V 940.68359 L 3033.9824,390.66602 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
+       id="path18990" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 2620.8164,387.33398 c -18.6667,0 -35.1667,4.60982 -49.5,13.83204 -14.3333,9.11111 -25.4451,22.22287 -33.334,39.33398 -7.7778,17 -11.666,36.5549 -11.666,58.66602 v 25 c 0,34.44444 8.7216,61.83463 26.166,82.16796 L 2970.1484,1024 h 323.168 l -623.166,-623.16602 c -14.2222,-9 -30.6673,-13.5 -49.334,-13.5 z"
+       id="path18988" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 2293.4824,390.66602 V 633.33398 L 2684.1484,1024 h 423.336 l -633.334,-633.33398 h -20.334 v 139.66601 l -139.666,-139.66601 z"
+       id="path18984" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 1864.8164,390.66602 V 633.33398 L 2255.4824,1024 h 413.334 l -633.334,-633.33398 h -25.832 l -60.584,63.75 -63.75,-63.75 z"
+       id="path18978" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 1684.8164,390.66602 V 633.33398 L 2075.4824,1024 h 263.334 l -633.334,-633.33398 z"
+       id="path18976" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 1133.6504,390.66602 62,242.66796 L 1586.3164,1024 h 467.668 l -633.334,-633.33398 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
+       id="path19059" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 1456.4824,390.66602 v 167.16796 c 0.5556,24.66667 8.5007,44 23.834,58 L 1888.4824,1024 h 372.168 l -633.334,-633.33398 h -20.666 V 520.5 l -129.834,-129.83398 z"
+       id="path18966" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 2146.3164,390.66602 2054.4824,633.33398 2445.1484,1024 h 354.002 l -633.334,-633.33398 z"
+       id="path18982" /><path
+       style="display:inline;fill:#808080;stroke-width:0.78179646"
+       d="M 637.15234,214.95703 487.75,364.35742 466.01562,386.0918 c 0.31273,0.31271 0.54872,0.54666 0.70508,0.85937 0.0782,0.23454 0.23432,0.54671 0.3125,0.78125 0.31272,0.54726 0.47071,1.17339 0.47071,1.79883 0.0782,0.54726 -0.0799,1.01725 -0.31446,1.48633 -0.23454,0.54725 -0.70285,1.40597 -1.09375,1.79687 l 150.8086,149.71485 -23.68946,23.6875 -12.74414,-12.74219 -13.44726,-13.44727 -78.80469,-78.80664 -11.17969,-11.17968 -7.5039,-7.50391 -35.41602,-35.17969 -3.08984,-0.98047 -4.33594,4.26367 v 0.46876 c 0,7.34888 0.38998,15.00865 -1.48633,22.20117 -0.85998,3.28355 -2.34444,6.25595 -4.14258,8.91406 -0.15636,0.15636 -0.23627,0.23426 -0.31445,0.39062 -1.87631,2.57993 -4.06471,4.84619 -6.48828,6.95704 -5.3944,4.53442 -11.25752,8.67896 -17.27734,12.50976 -0.15637,0.0782 -0.23427,0.1562 -0.39063,0.23438 -2.11085,1.40723 -4.3012,2.7354 -6.49023,4.06445 -8.91248,5.39439 -18.37192,10.08772 -28.37891,13.13672 -1.25087,0.31272 -2.42317,-0.001 -3.36133,-0.70508 l -6.01953,5.94141 c 1.25087,0.62543 2.03136,1.87776 1.875,3.51953 -10e-6,0.15636 -0.0762,0.23231 -0.0762,0.38867 0,0.0782 -0.0781,0.23628 -0.0781,0.31445 -1.32905,4.45624 -2.34505,8.98897 -3.2832,13.60156 -0.15636,0.70363 -0.23622,1.33154 -0.39258,2.03516 -0.85997,4.37806 -1.64209,8.83288 -2.3457,13.21094 0.23453,5.3944 0.39263,11.0234 0.31445,16.65234 v 0.39258 c -0.0782,7.66161 -0.78373,15.32114 -2.8164,22.51367 -2.26721,8.28704 -6.64376,15.63728 -10.55274,23.22071 -0.0782,0.15636 -0.15815,0.23426 -0.23633,0.39062 -1.25088,2.42357 -2.49924,4.92399 -3.59375,7.50391 -4.84714,11.33605 -7.42749,23.92328 -10.55468,35.88476 -0.23454,0.70362 -0.39046,1.48578 -0.625,2.26758 0,0.15636 -0.0801,0.23427 -0.0801,0.39063 -2.97082,11.10151 -6.09819,22.28173 -10.94532,32.75781 -1.40724,2.97082 -2.81531,5.86322 -4.3789,8.75586 -0.15636,0.23454 -0.23231,0.46858 -0.38867,0.70312 -0.62544,1.09451 -1.25152,2.26871 -1.87696,3.44141 -0.0782,0.15636 -0.15619,0.23426 -0.23437,0.39062 -3.51809,6.25438 -7.27098,12.43118 -10.78906,18.68555 -5.0035,8.8343 -8.99075,18.13635 -13.83789,27.04883 -0.0782,0.15636 -0.1562,0.23426 -0.23438,0.39062 -0.70362,1.32905 -1.48579,2.65728 -2.26758,3.98633 -5.0035,8.20887 -10.63256,16.0279 -16.57422,23.61133 -0.15635,0.15636 -0.23426,0.3124 -0.39062,0.46875 -0.7818,1.01634 -1.48578,1.95443 -2.26758,2.89258 -3.90898,4.92532 -7.97378,9.85009 -11.96094,14.77539 -0.0782,0.15637 -0.23432,0.23622 -0.3125,0.39258 -8.75612,10.71061 -17.35628,21.49761 -24.54883,33.30273 0,0.70362 -0.15602,1.33159 -0.46874,1.95703 -1.25087,2.42357 -2.65734,4.68971 -3.90821,7.11328 -0.0782,0.15636 0.62511,1.24989 0.46875,1.40625 L 429.86133,1024 H 1463.0215 L 661.85547,222.92969 c -0.93816,2.11087 -5.23681,1.40935 -7.34766,-0.23242 -1.71995,-1.32906 -3.12603,-3.05147 -4.45508,-4.84961 -0.62544,-0.31271 -1.25168,-0.62288 -1.64257,-0.85743 -2.89265,-1.40723 -6.09933,-1.48632 -9.30469,-1.48632 -0.7818,-0.0782 -1.40588,-0.23416 -1.95313,-0.54688 z m -206.12304,191.41992 0.11914,-0.11523 -0.23438,0.0781 z"
+       id="XMLID_64_" /></g><g
+     id="layer2"
+     style="display:inline;fill:#000000;fill-opacity:0.49803922"><path
+       id="XMLID_42_"
+       d="m 295.17362,965.05417 c 1.0692,3.47527 0.5346,7.21786 -1.3367,10.29214 l -25.7972,41.83679 c -2.5396,4.1436 -7.2178,6.8169 -12.297,6.8169 H 14.345318 C 3.1176178,1024 -3.6991822,1012.2376 2.3157178,1003.4158 L 157.76692,774.44928 c 0.9356,-1.33663 1.4704,-2.80694 1.8713,-4.27723 l 71.2428,-304.21933 c 0.8021,-3.60893 3.2081,-6.6832 6.6833,-8.55449 l 96.5054,-52.93096 c 3.4753,-1.8713 5.8812,-4.94557 6.6832,-8.68816 l 12.9654,-56.53988 c 2.6733,-11.76242 19.5151,-14.30205 26.1981,-4.00991 l 4.6783,7.48519 c 2.0049,3.20793 2.5396,7.21785 1.2031,10.82678 l -87.9511,254.22895 c -0.6683,2.00497 -0.9355,4.1436 -0.5346,6.28223 l 21.9209,121.63426 c 0.401,2.40595 0.1334,4.94556 -0.9357,7.21785 l -52.2625,117.357 c -1.203,2.80696 -1.4704,5.88123 -0.5347,8.68817 z M 1009.7413,1024 H 843.46322 c -4.8117,0 -9.2228,-2.4059 -11.8959,-6.1485 L 719.69042,860.52891 c -0.6683,-1.0693 -1.3366,-2.13861 -1.7375,-3.3416 l -55.4707,-162.00078 c -1.0692,-3.20793 -3.6088,-6.01489 -6.8169,-7.61886 l -135.8026,-68.56965 c -3.7426,-1.87127 -6.4159,-5.34655 -7.2179,-9.22281 l -20.0495,-99.44603 c -0.2674,-1.60396 -0.9357,-3.20793 -2.005,-4.67824 l -46.1141,-67.76766 c -2.5396,-3.74259 -2.9405,-8.28717 -1.0693,-12.2971 l 28.0694,-60.01513 c 2.1387,-4.54457 6.817,-7.61886 12.1634,-7.88619 l 52.129,-3.07427 c 3.0742,-0.1337 5.8812,-1.20296 8.1536,-3.07427 l 38.3615,-29.80707 c 7.2178,-5.61388 18.1784,-3.20794 22.0546,4.67824 l 132.1937,268.93201 c 0.5346,1.20297 0.9357,2.40595 1.2029,3.60894 l 16.3072,108.13418 c 0.4009,2.53963 1.4701,4.8119 3.2079,6.6832 l 263.31808,288.17958 c 7.7525,8.5545 1.203,22.0546 -10.8269,22.0546 z M 363.20852,182.58501 c 0,-30.60907 19.3812,-56.94088 47.1834,-69.23798 -2.005,-3.3416 -3.2079,-6.95052 -3.2079,-10.82678 0,-14.836705 17.109,-26.866465 38.0942,-26.866465 0.5346,0 0.9356,0 1.4704,0 8.688,-14.43572 25.2624,-24.19318 44.2426,-24.19318 1.3367,0 2.6733,0 4.01,0.1337 1.7377,0.13369 3.4753,-0.66833 4.4109,-2.00497 14.0347,-21.38624 49.5894,-36.62394 91.159,-36.62394 15.3712,0 29.9406,2.13863 42.906,5.74756 3.0744,-5.07924 9.8911,-8.5545 17.7773,-8.5545 8.9556,0 16.5744,4.54458 18.8466,10.82678 10.9606,-12.69809 29.5398,-20.98524 50.6587,-20.98524 33.6834,0 60.9508,21.25257 60.9508,47.45072 0,3.20793 -0.401,6.2822 -1.203,9.35647 -0.5346,2.13864 0.6683,4.27725 2.9407,5.07924 21.5199,7.88618 36.0893,22.85655 36.0893,39.965535 0,19.51495 -18.8466,36.22296 -45.4458,42.77249 -2.1387,0.53466 -3.4753,2.40595 -3.4753,4.41092 0,0.1337 0,0.26731 0,0.40098 0,15.10404 -14.9704,27.5348 -34.218,28.87144 0.1333,0.66833 0.1333,1.33663 0.1333,2.13862 0,29.00509 -55.2031,52.3963 -123.2382,52.3963 -14.7029,0 -28.7377,-1.06932 -41.7031,-3.07427 0,0.26733 0,0.40099 0,0.66832 0,12.02975 -15.5051,21.78723 -34.4854,21.78723 -1.0692,0 -2.0049,0 -2.9405,-0.13369 1.3367,2.9406 2.005,6.01487 2.005,9.22281 0,18.71296 -23.6586,33.81699 -52.9311,33.81699 -3.2079,0 -6.2821,-0.1337 -9.3563,-0.53466 -2.4061,-0.26731 -4.6783,1.20299 -5.2131,3.47529 -2.5396,9.35647 -10.693,16.17333 -20.4504,16.17333 -11.7625,0 -21.119,-10.0248 -21.119,-22.32189 0,-5.74755 2.005,-10.96045 5.3466,-14.83671 1.203,-1.33663 1.6039,-3.20793 0.8019,-4.81191 -1.8713,-3.47526 -2.6733,-7.08419 -2.6733,-10.96044 v 0 c 0,-2.13862 -1.7376,-3.87626 -3.8763,-4.4109 -36.2228,-8.01985 -63.4903,-38.22792 -63.4903,-74.3172 z m 306.8925,726.06294 c 0.5348,1.60398 0.6683,3.20796 0.6683,4.94558 l -7.7525,97.97577 c -0.5346,6.9505 -6.6832,12.4307 -14.1683,12.4307 h -250.219 c -5.3466,0 -10.2921,-3.0743 -12.6982,-7.4852 l -41.3021,-76.72312 c -0.2673,-0.401 -0.401,-0.80199 -0.5347,-1.20298 l -38.8962,-94.23313 c -1.4702,-3.3416 -1.203,-7.21785 0.4011,-10.42581 l 64.5596,-126.31249 c 1.604,-3.07427 1.8712,-6.6832 0.6683,-9.89114 l -31.5447,-87.41626 c -1.0693,-3.07428 -0.9356,-6.54955 0.4011,-9.49015 l 52.6636,-112.14412 c 5.3464,-11.22778 22.8565,-10.29212 26.5991,1.47031 l 16.4407,51.05965 50.124,134.19868 c 1.3367,3.7426 4.5446,6.6832 8.5545,8.01985 l 106.9312,36.49027 c 4.1435,1.47032 7.3516,4.54458 8.6881,8.42084 z"
+       style="fill:#000000;stroke-width:0.78179646;fill-opacity:0.49803922" /><g
+       aria-label="WULKANOWY"
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:0.49803922;stroke:none"
+       id="text4752" /></g></svg>

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

@@ -1,6 +1,7 @@
 package io.github.wulkanowy
 
 import android.content.Context
+import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import androidx.multidex.MultiDex
@@ -9,16 +10,15 @@ import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
 import dagger.android.AndroidInjector
 import dagger.android.support.DaggerApplication
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.utils.Log
+import fr.bipi.tressence.file.FileLoggerTree
 import io.github.wulkanowy.di.DaggerAppComponent
 import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
-import io.github.wulkanowy.utils.initCrashlytics
 import io.reactivex.exceptions.UndeliverableException
 import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
@@ -49,14 +49,20 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
         themeManager.applyDefaultTheme()
 
         initLogging()
-        initCrashlytics(this, appInfo)
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
-            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+            Timber.plant(FileLoggerTree.Builder()
+                .withFileName("wulkanowy.%g.log")
+                .withDirName(applicationContext.filesDir.absolutePath)
+                .withFileLimit(10)
+                .withMinPriority(DEBUG)
+                .build()
+            )
         } else {
+            Timber.plant(CrashlyticsExceptionTree())
             Timber.plant(CrashlyticsTree())
         }
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())

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

@@ -2,13 +2,14 @@ package io.github.wulkanowy.data
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.AssetManager
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
+import com.chuckerteam.chucker.api.ChuckerCollector
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.chuckerteam.chucker.api.RetentionManager
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
-import com.readystatesoftware.chuck.api.ChuckCollector
-import com.readystatesoftware.chuck.api.ChuckInterceptor
-import com.readystatesoftware.chuck.api.RetentionManager
 import dagger.Module
 import dagger.Provides
 import io.github.wulkanowy.data.db.AppDatabase
@@ -31,23 +32,25 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckCollector: ChuckCollector, context: Context): Sdk {
+    fun provideSdk(chuckerCollector: ChuckerCollector, context: Context): Sdk {
         return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
             setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
-            addInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true)
+            addInterceptor(ChuckerInterceptor(context, chuckerCollector), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
-        return ChuckCollector(context)
-            .showNotification(prefRepository.isDebugNotificationEnable)
-            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
+    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
+        return ChuckerCollector(
+            context = context,
+            showNotification = prefRepository.isDebugNotificationEnable,
+            retentionPeriod = RetentionManager.Period.ONE_HOUR
+        )
     }
 
     @Singleton
@@ -58,6 +61,10 @@ internal class RepositoryModule {
     @Provides
     fun provideResources(context: Context): Resources = context.resources
 
+    @Singleton
+    @Provides
+    fun provideAssets(context: Context): AssetManager = context.assets
+
     @Singleton
     @Provides
     fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
@@ -90,6 +97,10 @@ internal class RepositoryModule {
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
 
+    @Singleton
+    @Provides
+    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
+
     @Singleton
     @Provides
     fun provideExamDao(database: AppDatabase) = database.examsDao

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

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

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

@@ -17,6 +17,7 @@ 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.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
@@ -39,6 +40,7 @@ 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.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
@@ -60,6 +62,13 @@ import io.github.wulkanowy.data.db.migrations.Migration17
 import io.github.wulkanowy.data.db.migrations.Migration18
 import io.github.wulkanowy.data.db.migrations.Migration19
 import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration20
+import io.github.wulkanowy.data.db.migrations.Migration21
+import io.github.wulkanowy.data.db.migrations.Migration22
+import io.github.wulkanowy.data.db.migrations.Migration23
+import io.github.wulkanowy.data.db.migrations.Migration24
+import io.github.wulkanowy.data.db.migrations.Migration25
+import io.github.wulkanowy.data.db.migrations.Migration26
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -83,6 +92,7 @@ import javax.inject.Singleton
         GradeStatistics::class,
         GradePointsStatistics::class,
         Message::class,
+        MessageAttachment::class,
         Note::class,
         Homework::class,
         Subject::class,
@@ -101,7 +111,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 19
+        const val VERSION_SCHEMA = 26
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
             return arrayOf(
@@ -122,7 +132,14 @@ abstract class AppDatabase : RoomDatabase() {
                 Migration16(),
                 Migration17(),
                 Migration18(),
-                Migration19(sharedPrefProvider)
+                Migration19(sharedPrefProvider),
+                Migration20(),
+                Migration21(),
+                Migration22(),
+                Migration23(),
+                Migration24(),
+                Migration25(),
+                Migration26()
             )
         }
 
@@ -158,6 +175,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val messagesDao: MessagesDao
 
+    abstract val messageAttachmentDao: MessageAttachmentDao
+
     abstract val noteDao: NoteDao
 
     abstract val homeworkDao: HomeworkDao

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

@@ -48,4 +48,14 @@ class Converters {
     fun gsonToIntList(value: String): List<Int> {
         return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
     }
+
+    @TypeConverter
+    fun stringPairListToGson(list: List<Pair<String, String>>): String {
+        return Gson().toJson(list)
+    }
+
+    @TypeConverter
+    fun gsonToStringPairList(value: String): List<Pair<String, String>> {
+        return Gson().fromJson(value, object : TypeToken<List<Pair<String, String>>>() {}.type)
+    }
 }

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

@@ -11,7 +11,7 @@ import javax.inject.Singleton
 interface GradePointsStatisticsDao : BaseDao<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>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<List<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/MessageAttachmentDao.kt

@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+
+@Dao
+interface MessageAttachmentDao : BaseDao<MessageAttachment> {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAttachments(items: List<MessageAttachment>): List<Long>
+}

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

@@ -2,18 +2,22 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
+import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.reactivex.Maybe
+import io.reactivex.Single
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
+
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
     fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
 
-    @Query("SELECT * FROM Messages WHERE id = :id")
-    fun load(id: Long): Maybe<Message>
-
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
     fun loadDeleted(studentId: Int): Maybe<List<Message>>
 }

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

@@ -22,6 +22,9 @@ interface StudentDao {
     @Query("SELECT * FROM Students WHERE is_current = 1")
     fun loadCurrent(): Maybe<Student>
 
+    @Query("SELECT * FROM Students WHERE id = :id")
+    fun loadById(id: Int): Maybe<Student>
+
     @Query("SELECT * FROM Students")
     fun loadAll(): Maybe<List<Student>>
 

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

@@ -15,6 +15,9 @@ data class Attendance(
     @ColumnInfo(name = "diary_id")
     val diaryId: Int,
 
+    @ColumnInfo(name = "time_id")
+    val timeId: Int,
+
     val date: LocalDate,
 
     val number: Int,
@@ -33,7 +36,13 @@ data class Attendance(
 
     val excused: Boolean,
 
-    val deleted: Boolean
+    val deleted: Boolean,
+
+    val excusable: Boolean,
+
+    @ColumnInfo(name = "excuse_status")
+    val excuseStatus: String?
+
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.threeten.bp.LocalDateTime
 
 @Entity(tableName = "GradesSummary")
 data class GradeSummary(
@@ -36,4 +37,16 @@ data class GradeSummary(
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_predicted_grade_notified")
+    var isPredictedGradeNotified: Boolean = true
+
+    @ColumnInfo(name = "is_final_grade_notified")
+    var isFinalGradeNotified: Boolean = true
+
+    @ColumnInfo(name = "predicted_grade_last_change")
+    var predictedGradeLastChange: LocalDateTime = LocalDateTime.now()
+
+    @ColumnInfo(name = "final_grade_last_change")
+    var finalGradeLastChange: LocalDateTime = LocalDateTime.now()
 }

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

@@ -27,10 +27,14 @@ data class Homework(
     val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+    val teacherSymbol: String,
 
+    val attachments: List<Pair<String, String>>
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_done")
+    var isDone: Boolean = false
 }

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

@@ -44,7 +44,10 @@ data class Message(
     @ColumnInfo(name = "read_by")
     val readBy: Int,
 
-    val removed: Boolean
+    val removed: Boolean,
+
+    @ColumnInfo(name = "has_attachments")
+    val hasAttachments: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)

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

@@ -0,0 +1,26 @@
+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 = "MessageAttachments")
+data class MessageAttachment(
+
+    @PrimaryKey
+    @ColumnInfo(name = "real_id")
+    val realId: Int,
+
+    @ColumnInfo(name = "message_id")
+    val messageId: Int,
+
+    @ColumnInfo(name = "one_drive_id")
+    val oneDriveId: String,
+
+    @ColumnInfo(name = "url")
+    val url: String,
+
+    @ColumnInfo(name = "filename")
+    val filename: String
+) : Serializable

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

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class MessageWithAttachment(
+    @Embedded
+    val message: Message,
+
+    @Relation(parentColumn = "message_id", entityColumn = "message_id")
+    val attachments: List<MessageAttachment>
+)

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

@@ -16,8 +16,19 @@ data class Note(
 
     val teacher: String,
 
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String,
+
     val category: String,
 
+    @ColumnInfo(name = "category_type")
+    val categoryType: Int,
+
+    @ColumnInfo(name = "is_points_show")
+    val isPointsShow: Boolean,
+
+    val points: Int,
+
     val content: String
 ) : Serializable {
 

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

@@ -27,9 +27,6 @@ data class Semester(
     @ColumnInfo(name = "semester_name")
     val semesterName: Int,
 
-    @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
-
     val start: LocalDate,
 
     val end: LocalDate,
@@ -43,4 +40,8 @@ data class Semester(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+
+    @ColumnInfo(name = "is_current")
+    var current: Boolean = false
 }

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

@@ -49,6 +49,9 @@ data class Student(
     @ColumnInfo(name = "school_id")
     val schoolSymbol: String,
 
+    @ColumnInfo(name ="school_short")
+    val schoolShortName: String,
+
     @ColumnInfo(name = "school_name")
     val schoolName: String,
 

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

@@ -40,6 +40,9 @@ data class Timetable(
 
     val info: String,
 
+    @ColumnInfo(name = "student_plan")
+    val isStudentPlan: Boolean,
+
     val changes: Boolean,
 
     val canceled: Boolean

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

@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration20 : Migration(19, 20) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateTimetable(database)
+        truncateSubjects(database)
+    }
+
+    private fun migrateTimetable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Timetable")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS `Timetable` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `student_id` INTEGER NOT NULL,
+                `diary_id` INTEGER NOT NULL,
+                `number` INTEGER NOT NULL,
+                `start` INTEGER NOT NULL,
+                `end` INTEGER NOT NULL,
+                `date` INTEGER NOT NULL,
+                `subject` TEXT NOT NULL,
+                `subjectOld` TEXT NOT NULL,
+                `group` TEXT NOT NULL,
+                `room` TEXT NOT NULL,
+                `roomOld` TEXT NOT NULL,
+                `teacher` TEXT NOT NULL,
+                `teacherOld` TEXT NOT NULL,
+                `info` TEXT NOT NULL,
+                `student_plan` INTEGER NOT NULL,
+                `changes` INTEGER NOT NULL,
+                `canceled` INTEGER NOT NULL
+            )
+        """)
+    }
+
+    private fun truncateSubjects(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Subjects")
+    }
+}

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration21 : Migration(20, 21) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN excusable INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN time_id INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN excuse_status TEXT DEFAULT NULL")
+
+        database.execSQL("DELETE FROM Semesters")
+    }
+}

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

@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration22 : Migration(21, 22) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
+    }
+}

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

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration23 : Migration(22, 23) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
+    }
+}

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

@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration24 : Migration(23, 24) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS MessageAttachments (
+                real_id INTEGER NOT NULL,
+                message_id INTEGER NOT NULL,
+                one_drive_id TEXT NOT NULL,
+                url TEXT NOT NULL,
+                filename TEXT NOT NULL,
+                PRIMARY KEY(real_id)
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration25 : Migration(24, 25) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
+    }
+}

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

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration26 : Migration(25, 26) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_predicted_grade_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_final_grade_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN predicted_grade_last_change INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN final_grade_last_change INTEGER NOT NULL DEFAULT 0")
+    }
+}

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

@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.pojos
+
+class Contributor(val displayName: String, val githubUsername: String)

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

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
+
+data class GradeStatisticsItem(
+
+    val type: ViewType,
+
+    val partial: List<GradeStatistics>,
+
+    val points: GradePointsStatistics?
+)

app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.repositories.appcreator
+
+import android.content.res.AssetManager
+import com.google.gson.Gson
+import io.github.wulkanowy.data.pojos.Contributor
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
+    fun getAppCreators(): Single<List<Contributor>> {
+        return Single.fromCallable {
+            Gson().fromJson(
+                assets.open("contributors.json").bufferedReader().use { it.readText() },
+                Array<Contributor>::class.java
+            ).toList()
+        }
+    }
+}

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

@@ -2,23 +2,30 @@ package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Absent
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendance(startDate, endDate, semester.semesterId)
+    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendance(startDate, endDate, semester.semesterId)
             .map { attendance ->
                 attendance.map {
                     Attendance(
                         studentId = semester.studentId,
                         diaryId = semester.diaryId,
                         date = it.date,
+                        timeId = it.timeId,
                         number = it.number,
                         subject = it.subject,
                         name = it.name,
@@ -27,9 +34,20 @@ class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
                         exemption = it.exemption,
                         lateness = it.lateness,
                         excused = it.excused,
-                        deleted = it.deleted
+                        deleted = it.deleted,
+                        excusable = it.excusable,
+                        excuseStatus = it.excuseStatus?.name
                     )
                 }
             }
     }
+
+    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<Boolean> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
+            Absent(
+                date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
+                timeId = attendance.timeId
+            )
+        }, reason)
+    }
 }

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

@@ -4,7 +4,8 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -20,25 +21,25 @@ class AttendanceRepository @Inject constructor(
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean)
-        : Single<List<Attendance>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getAttendance(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                        if (it) remote.getAttendance(semester, dates.first, dates.second)
-                        else Single.error(UnknownHostException())
-                    }.flatMap { newAttendance ->
-                        local.getAttendance(semester, dates.first, dates.second)
-                            .toSingle(emptyList())
-                            .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
-                            }
-                    }.flatMap {
-                        local.getAttendance(semester, dates.first, dates.second)
-                            .toSingle(emptyList())
-                    }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
+        return local.getAttendance(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getAttendance(student, semester, start.monday, end.sunday)
+                else Single.error(UnknownHostException())
+            }.flatMap { newAttendance ->
+                local.getAttendance(semester, start.monday, end.sunday)
+                    .toSingle(emptyList())
+                    .doOnSuccess { oldAttendance ->
+                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                    }
+            }.flatMap {
+                local.getAttendance(semester, start.monday, end.sunday)
+                    .toSingle(emptyList())
+            }).map { list -> list.filter { it.date in start..end } }
+    }
+
+    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(student, semester, attendanceList, reason)
     }
 }

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

@@ -0,0 +1,7 @@
+package io.github.wulkanowy.data.repositories.attendance
+
+enum class SentExcuseStatus(val id: Int = 0) {
+    WAITING,
+    ACCEPTED,
+    DENIED
+}

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

@@ -2,7 +2,9 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -10,8 +12,9 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendanceSummary(subjectId)
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendanceSummary(subjectId)
             .map { attendance ->
                 attendance.map {
                     AttendanceSummary(

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

@@ -4,6 +4,7 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
 import java.net.UnknownHostException
@@ -17,11 +18,11 @@ class AttendanceSummaryRepository @Inject constructor(
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
         return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
             .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
                 .flatMap {
-                    if (it) remote.getAttendanceSummary(semester, subjectId)
+                    if (it) remote.getAttendanceSummary(student, semester, subjectId)
                     else Single.error(UnknownHostException())
                 }.flatMap { new ->
                     local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())

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

@@ -2,7 +2,9 @@ package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -11,8 +13,9 @@ import javax.inject.Singleton
 @Singleton
 class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getCompletedLessons(startDate, endDate)
+    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getCompletedLessons(startDate, endDate)
             .map { lessons ->
                 lessons.map {
                     it.absence

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

@@ -4,7 +4,8 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -20,25 +21,22 @@ class CompletedLessonsRepository @Inject constructor(
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getCompletedLessons(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getCompletedLessons(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getCompletedLessons(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
-                                    local.saveCompletedLessons(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getCompletedLessons(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return local.getCompletedLessons(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getCompletedLessons(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteCompleteLessons(old.uniqueSubtract(new))
+                            local.saveCompletedLessons(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getCompletedLessons(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
     }
 }

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

@@ -13,7 +13,7 @@ class ExamLocal @Inject constructor(private val examDb: ExamDao) {
 
     fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Exam>> {
         return examDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
-                .filter { !it.isEmpty() }
+                .filter { it.isNotEmpty() }
     }
 
     fun saveExams(exams: List<Exam>) {

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

@@ -2,7 +2,9 @@ package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import org.threeten.bp.LocalDate
 import javax.inject.Inject
@@ -11,8 +13,9 @@ import javax.inject.Singleton
 @Singleton
 class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getExams(startDate, endDate, semester.semesterId)
+    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getExams(startDate, endDate, semester.semesterId)
             .map { exams ->
                 exams.map {
                     Exam(

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

@@ -4,7 +4,8 @@ import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Single
@@ -20,25 +21,22 @@ class ExamRepository @Inject constructor(
     private val remote: ExamRemote
 ) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getExams(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getExams(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getExams(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteExams(old.uniqueSubtract(new))
-                                    local.saveExams(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getExams(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return local.getExams(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getExams(student, semester, start.monday, end.sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getExams(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteExams(old.uniqueSubtract(new))
+                            local.saveExams(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getExams(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end } }
     }
 }

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

@@ -1,14 +1,19 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
+class GradeLocal @Inject constructor(
+    private val gradeDb: GradeDao,
+    private val gradeSummaryDb: GradeSummaryDao
+) {
 
     fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
@@ -22,7 +27,23 @@ class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
         gradeDb.updateAll(grades)
     }
 
-    fun getGrades(semester: Semester): Maybe<List<Grade>> {
+    fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.updateAll(gradesSummary)
+    }
+
+    fun getGradesDetails(semester: Semester): Maybe<List<Grade>> {
         return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
     }
+
+    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.insertAll(gradesSummary)
+    }
+
+    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.deleteAll(gradesSummary)
+    }
+
+    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
 }

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

@@ -1,8 +1,11 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -10,10 +13,11 @@ import javax.inject.Singleton
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGrades(semester: Semester): Single<List<Grade>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGrades(semester.semesterId)
-            .map { grades ->
-                grades.map {
+    fun getGrades(student: Student, semester: Semester): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGrades(semester.semesterId)
+            .map { (details, summary) ->
+                details.map {
                     Grade(
                         studentId = semester.studentId,
                         semesterId = semester.semesterId,
@@ -30,6 +34,19 @@ class GradeRemote @Inject constructor(private val sdk: Sdk) {
                         date = it.date,
                         teacher = it.teacher
                     )
+                } to summary.map {
+                    GradeSummary(
+                        semesterId = semester.semesterId,
+                        studentId = semester.studentId,
+                        position = 0,
+                        subject = it.name,
+                        predictedGrade = it.predicted,
+                        finalGrade = it.final,
+                        pointsSum = it.pointsSum,
+                        proposedPoints = it.proposedPoints,
+                        finalPoints = it.finalPoints,
+                        average = it.average
+                    )
                 }
             }
     }

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

@@ -3,11 +3,13 @@ package io.github.wulkanowy.data.repositories.grade
 import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
 import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
 import io.reactivex.Completable
 import io.reactivex.Single
+import org.threeten.bp.LocalDateTime
 import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -19,34 +21,79 @@ class GradeRepository @Inject constructor(
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
-        return local.getGrades(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGrades(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                            local.deleteGrades(old.uniqueSubtract(new))
-                            local.saveGrades(new.uniqueSubtract(old)
-                                .onEach {
-                                    if (it.date >= notifyBreakDate) it.apply {
-                                        isRead = false
-                                        if (notify) isNotified = false
-                                    }
-                                })
-                        }
-                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return local.getGradesDetails(semester).flatMap { details ->
+            local.getGradesSummary(semester).map { summary -> details to summary }
+        }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getGrades(student, semester)
+                else Single.error(UnknownHostException())
+            }.flatMap { (newDetails, newSummary) ->
+                local.getGradesDetails(semester).toSingle(emptyList())
+                    .doOnSuccess { old ->
+                        val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                        local.deleteGrades(old.uniqueSubtract(newDetails))
+                        local.saveGrades(newDetails.uniqueSubtract(old)
+                            .onEach {
+                                if (it.date >= notifyBreakDate) it.apply {
+                                    isRead = false
+                                    if (notify) isNotified = false
+                                }
+                            })
+                    }.flatMap {
+                        local.getGradesSummary(semester).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteGradesSummary(old.uniqueSubtract(newSummary))
+                                local.saveGradesSummary(newSummary.uniqueSubtract(old)
+                                    .onEach { summary ->
+                                        val oldSummary = old.find { oldSummary -> oldSummary.subject == summary.subject }
+                                        summary.isPredictedGradeNotified = when {
+                                            summary.predictedGrade.isEmpty() -> true
+                                            notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
+                                            else -> true
+                                        }
+                                        summary.isFinalGradeNotified = when {
+                                            summary.finalGrade.isEmpty() -> true
+                                            notify && oldSummary?.finalGrade != summary.finalGrade -> false
+                                            else -> true
+                                        }
+
+                                        summary.predictedGradeLastChange = when {
+                                            oldSummary == null -> LocalDateTime.now()
+                                            summary.predictedGrade != oldSummary.predictedGrade -> LocalDateTime.now()
+                                            else -> oldSummary.predictedGradeLastChange
+                                        }
+                                        summary.finalGradeLastChange = when {
+                                            oldSummary == null -> LocalDateTime.now()
+                                            summary.finalGrade != oldSummary.finalGrade -> LocalDateTime.now()
+                                            else -> oldSummary.finalGradeLastChange
+                                        }
+                                    })
+                            }
+                    }
+            }.flatMap {
+                local.getGradesDetails(semester).toSingle(emptyList()).flatMap { details ->
+                    local.getGradesSummary(semester).toSingle(emptyList()).map { summary ->
+                        details to summary
+                    }
+                }
+            })
     }
 
     fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
     }
 
     fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+    }
+
+    fun getNotNotifiedPredictedGrades(semester: Semester): Single<List<GradeSummary>> {
+        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }.toSingle(emptyList())
+    }
+
+    fun getNotNotifiedFinalGrades(semester: Semester): Single<List<GradeSummary>> {
+        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }.toSingle(emptyList())
     }
 
     fun updateGrade(grade: Grade): Completable {
@@ -56,4 +103,8 @@ class GradeRepository @Inject constructor(
     fun updateGrades(grades: List<Grade>): Completable {
         return Completable.fromCallable { local.updateGrades(grades) }
     }
+
+    fun updateGradesSummary(gradesSummary: List<GradeSummary>): Completable {
+        return Completable.fromCallable { local.updateGradesSummary(gradesSummary) }
+    }
 }

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

@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
-
-    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.insertAll(gradesSummary)
-    }
-
-    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.deleteAll(gradesSummary)
-    }
-
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
-    }
-}

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

@@ -1,32 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryRemote @Inject constructor(private val sdk: Sdk) {
-
-    fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesSummary(semester.semesterId)
-            .map { gradesSummary ->
-                gradesSummary.map {
-                    GradeSummary(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        position = 0,
-                        subject = it.name,
-                        predictedGrade = it.predicted,
-                        finalGrade = it.final,
-                        pointsSum = it.pointsSum,
-                        proposedPoints = it.proposedPoints,
-                        finalPoints = it.finalPoints,
-                        average = it.average
-                    )
-                }
-            }
-    }
-}