diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..d744bdd14
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,142 @@
+name: Test and deploy
+
+on:
+ push:
+ branches: [ develop ]
+ tags: [ '*' ]
+ pull_request:
+ branches: [ develop ]
+
+ workflow_dispatch:
+
+jobs:
+ build:
+ name: Pre-build
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - uses: fkirc/skip-duplicate-actions@master
+ - uses: actions/checkout@v2
+ - uses: gradle/wrapper-validation-action@v1
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - uses: actions/cache@v2
+ with:
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+ - name: Build
+ run: ./gradlew --build-cache compileFdroidDebugUnitTestKotlin preFdroidDebugAndroidTestBuild dexBuilderFdroidDebugAndroidTest packageFdroidDebug packageFdroidDebugAndroidTest
+ - name: Prepare build cache
+ run: tar -cf prebuild.tar .build-cache .gradle app/build
+ - uses: actions/upload-artifact@v2
+ with:
+ name: prebuild.tar
+ path: prebuild.tar
+
+ unit-tests:
+ name: Unit tests
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ needs: [ build ]
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - uses: actions/cache@v2
+ with:
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+ - uses: actions/download-artifact@v2
+ with:
+ name: prebuild.tar
+ - name: Extract build cache
+ run: tar -xf prebuild.tar
+ - name: Unit tests
+ run: |
+ ./gradlew --build-cache -Pcoverage testFdroidDebugUnitTest --stacktrace
+ ./gradlew --build-cache -Pcoverage jacocoTestReport --stacktrace
+ - uses: codecov/codecov-action@v1
+ with:
+ flags: unit
+
+ instrumentation-tests:
+ name: Instrumentation tests
+ runs-on: macOS-latest
+ timeout-minutes: 15
+ needs: [ build ]
+ strategy:
+ fail-fast: true
+ matrix:
+ api-level: [21, 29]
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - uses: actions/cache@v2
+ with:
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+ - uses: actions/download-artifact@v2
+ with:
+ name: prebuild.tar
+ - name: Extract build cache
+ run: tar -xf prebuild.tar
+ - name: Instrumentation tests
+ uses: reactivecircus/android-emulator-runner@v2
+ with:
+ api-level: ${{ matrix.api-level }}
+ arch: x86
+ script: |
+ ./gradlew --build-cache -Pcoverage connectedFdroidDebugAndroidTest --stacktrace
+ ./gradlew --build-cache -Pcoverage jacocoTestReport --stacktrace
+ - uses: codecov/codecov-action@v1
+ with:
+ flags: instrumented,api-${{ matrix.api-level }}
+
+ deploy-google-play:
+ name: Deploy to google play
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ environment: google-play
+ needs: [ build, unit-tests, instrumentation-tests ]
+ if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - uses: actions/cache@v2
+ with:
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+ - uses: actions/download-artifact@v2
+ with:
+ name: prebuild.tar
+ - name: Extract build cache
+ run: tar -xf prebuild.tar
+ - name: Decrypt keys
+ env:
+ ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+ SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
+ run: |
+ 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
+ - name: Upload apk to google play
+ env:
+ PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
+ PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
+ PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
+ PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
+ run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
diff --git a/.gitignore b/.gitignore
index d3fb6e4e9..5d3321e3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ out/
# Gradle files
.gradle/
build/
+.build-cache
# Local configuration file (sdk path, etc)
local.properties
@@ -113,3 +114,6 @@ Thumbs.db
!/gradle/wrapper/gradle-wrapper.jar
.idea/jarRepositories.xml
+
+
+app/src/release/agconnect-services.json
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cb2f41195..0ac66f649 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -18,18 +18,9 @@
-
-
-
-
-
-
-
+
-
-
-
@@ -143,13 +134,11 @@
+
-
-
-
diff --git a/.travis.yml b/.travis.yml
index e383a74b5..04db3a616 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
branches:
only:
- develop
- - 0.22.0
+ - 0.24.0
android:
licenses:
@@ -58,6 +58,7 @@ script:
- |
if [ $TRAVIS_TAG ]; then
gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
+ gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-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 -PenableFirebase --stacktrace;
diff --git a/README.en.md b/README.en.md
index 4c5e53da8..0f2885cfd 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,7 +1,8 @@
[Polska wersja README](README.md)
# Wulkanowy
-[](https://travis-ci.com/wulkanowy/wulkanowy)
+
+[](https://github.com/wulkanowy/wulkanowy/actions)
[](https://codecov.io/gh/wulkanowy/wulkanowy)
[](https://discord.gg/vccAQBr)
[](https://f-droid.org/packages/io.github.wulkanowy/)
@@ -11,7 +12,7 @@ Unofficial android VULCAN UONET+ register client for both students and their par
## Features
-* logging in using the email and password OR using token and pin
+* logging in using the email and password
* functions from the register website:
* grades
* grade statistics
@@ -24,15 +25,19 @@ Unofficial android VULCAN UONET+ register client for both students and their par
* homework
* notes
* lucky number
+ * additional lessons
+ * school conferences
+ * student and school information
* calculation of the average independently of school's preferences
* notifications, e.g. about a new grade
+* support for multiple accounts with the ability to rename students
* dark and black (AMOLED) theme
* offline mode
* no ads
## Download
-You can download the current beta version from the Google Play, F-Droid or Huawei AppGallery store
+You can download the current version from the Google Play, F-Droid or Huawei AppGallery store
[
()
val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
AppDatabase::class.java, dbName)
.addMigrations(*AppDatabase.getMigrations(SharedPrefProvider(PreferenceManager
- .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())))
+ .getDefaultSharedPreferences(context)))
)
.build()
// close the database and release any stream resources when the test finishes
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
deleted file mode 100644
index 04d13be4b..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import java.time.LocalDate.now
-import java.time.LocalDateTime
-
-fun getStudent(): Student {
- return Student(
- email = "test",
- password = "test123",
- schoolSymbol = "23",
- scrapperBaseUrl = "fakelog.cf",
- loginType = "AUTO",
- isCurrent = true,
- userName = "",
- studentName = "",
- schoolShortName = "",
- schoolName = "",
- studentId = 0,
- classId = 1,
- symbol = "",
- registrationDate = LocalDateTime.now(),
- className = "",
- loginMode = "API",
- certificateKey = "",
- privateKey = "",
- mobileBaseUrl = "",
- userLoginId = 0,
- isParent = false
- )
-}
-
-fun getSemester() = Semester(
- semesterId = 1,
- studentId = 1,
- classId = 1,
- diaryId = 2,
- diaryName = "",
- end = now(),
- schoolYear = 2019,
- semesterName = 1,
- start = now(),
- unitId = 1
-)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
deleted file mode 100644
index fa1289869..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package io.github.wulkanowy.data.repositories.attendance
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class AttendanceLocalTest {
-
- private lateinit var attendanceLocal: AttendanceLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
- attendanceLocal = AttendanceLocal(testDb.attendanceDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val list = listOf(
- getAttendanceEntity(
- of(2018, 9, 10),
- SentExcuseStatus.ACCEPTED
- ),
- getAttendanceEntity(
- of(2018, 9, 14),
- SentExcuseStatus.WAITING
- ),
- getAttendanceEntity(
- of(2018, 9, 17),
- SentExcuseStatus.ACCEPTED
- )
- )
- runBlocking { attendanceLocal.saveAttendance(list) }
-
- val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
- val attendance = runBlocking { attendanceLocal.getAttendance(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
- assertEquals(2, attendance.size)
- 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
- )
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
deleted file mode 100644
index ca7d0b1be..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.data.repositories.completedlessons
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class CompletedLessonsLocalTest {
-
- private lateinit var completedLessonsLocal: CompletedLessonsLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room
- .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
- .build()
- completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val list = listOf(
- getCompletedLesson(of(2018, 9, 10), 1),
- getCompletedLesson(of(2018, 9, 14), 2),
- getCompletedLesson(of(2018, 9, 17), 3)
- )
- runBlocking { completedLessonsLocal.saveCompletedLessons(list) }
-
- val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
- val completed = runBlocking { completedLessonsLocal.getCompletedLessons(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
- assertEquals(2, completed.size)
- assertEquals(completed[0].date, of(2018, 9, 10))
- assertEquals(completed[1].date, of(2018, 9, 14))
- }
-
- private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
- return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
deleted file mode 100644
index 14b29c9f6..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.data.repositories.exam
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class ExamLocalTest {
-
- private lateinit var examLocal: ExamLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
- examLocal = ExamLocal(testDb.examsDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val list = listOf(
- Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
- Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
- Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
- )
- runBlocking { examLocal.saveExams(list) }
-
- val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
- val exams = runBlocking { examLocal.getExams(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
- assertEquals(2, exams.size)
- assertEquals(exams[0].date, of(2018, 9, 10))
- assertEquals(exams[1].date, of(2018, 9, 14))
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
deleted file mode 100644
index 946ebf8ea..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.github.wulkanowy.data.repositories.grade
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDate.now
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class GradeLocalTest {
-
- private lateinit var gradeLocal: GradeLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room
- .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
- .build()
- gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val list = listOf(
- createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
- createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
- createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
- )
- runBlocking { gradeLocal.saveGrades(list) }
-
- val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
-
- val grades = runBlocking { gradeLocal.getGradesDetails(semester).first() }
-
- assertEquals(2, grades.size)
- assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
- assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
deleted file mode 100644
index 5cf9c2196..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-package io.github.wulkanowy.data.repositories.grade
-
-import android.os.Build.VERSION_CODES.P
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate.of
-import java.time.LocalDateTime
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-
-@SdkSuppress(minSdkVersion = P)
-@RunWith(AndroidJUnit4::class)
-class GradeRepositoryTest {
-
- @MockK
- private lateinit var semesterMock: Semester
-
- private lateinit var studentMock: Student
-
- @MockK
- private lateinit var gradeRemote: GradeRemote
-
- private lateinit var gradeLocal: GradeLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun initApi() {
- MockKAnnotations.init(this)
- testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
- gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
- studentMock = getStudentMock()
-
- every { semesterMock.studentId } returns 1
- every { semesterMock.diaryId } returns 1
- every { semesterMock.schoolYear } returns 2019
- every { semesterMock.semesterId } returns 1
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun markOlderThanRegisterDateAsRead() {
- coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
- createGradeLocal(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
- createGradeLocal(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
- createGradeLocal(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
- createGradeLocal(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
- ) to emptyList())
-
- val grades = runBlocking {
- GradeRepository(gradeLocal, gradeRemote)
- .getGrades(studentMock, semesterMock, true)
- .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
- }
-
- assertFalse { grades[0].isRead }
- assertFalse { grades[1].isRead }
- assertTrue { grades[2].isRead }
- assertTrue { grades[3].isRead }
- }
-
- @Test
- fun mitigateOldGradesNotifications() {
- val list = listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
- createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
- createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
- )
- runBlocking { gradeLocal.saveGrades(list) }
-
- coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
- createGradeLocal(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
- createGradeLocal(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
- createGradeLocal(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
- createGradeLocal(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
- ) to emptyList())
-
- val grades = runBlocking {
- GradeRepository(gradeLocal, gradeRemote)
- .getGrades(studentMock, semesterMock, true)
- .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
- }
-
- assertFalse { grades[0].isRead }
- assertFalse { grades[1].isRead }
- assertTrue { grades[2].isRead }
- assertTrue { grades[3].isRead }
- }
-
- @Test
- fun subtractLocaleDuplicateGrades() {
- val list = listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
- )
- runBlocking { gradeLocal.saveGrades(list) }
-
- coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
- ) to emptyList())
-
- val grades = runBlocking {
- GradeRepository(gradeLocal, gradeRemote)
- .getGrades(studentMock, semesterMock, true)
- .filter { it.status == Status.SUCCESS }.first().data!!
- }
-
- assertEquals(2, grades.first.size)
- }
-
- @Test
- fun subtractRemoteDuplicateGrades() {
- val list = listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
- )
- runBlocking { gradeLocal.saveGrades(list) }
-
- coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
- ) to emptyList())
-
- val grades = runBlocking {
- GradeRepository(gradeLocal, gradeRemote)
- .getGrades(studentMock, semesterMock, true)
- .filter { it.status == Status.SUCCESS }.first().data!!
- }
-
- assertEquals(3, grades.first.size)
- }
-
- @Test
- fun emptyLocal() {
- runBlocking { gradeLocal.saveGrades(listOf()) }
-
- coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
- ) to emptyList())
-
- val grades = runBlocking {
- GradeRepository(gradeLocal, gradeRemote)
- .getGrades(studentMock, semesterMock, true)
- .filter { it.status == Status.SUCCESS }.first().data!!
- }
-
- assertEquals(3, grades.first.size)
- }
-
- @Test
- fun emptyRemote() {
- val list = listOf(
- createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
- createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
- )
- runBlocking { gradeLocal.saveGrades(list) }
-
- coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (emptyList() to emptyList())
-
- val grades = runBlocking {
- GradeRepository(gradeLocal, gradeRemote)
- .getGrades(studentMock, semesterMock, true)
- .filter { it.status == Status.SUCCESS }.first().data!!
- }
-
- assertEquals(0, grades.first.size)
- }
-
- private fun getStudentMock() = Student(
- scrapperBaseUrl = "http://fakelog.cf",
- email = "jan@fakelog.cf",
- certificateKey = "",
- classId = 0,
- className = "",
- isCurrent = false,
- isParent = false,
- loginMode = Sdk.Mode.SCRAPPER.name,
- loginType = "STANDARD",
- mobileBaseUrl = "",
- password = "",
- privateKey = "",
- registrationDate = LocalDateTime.of(2019, 2, 27, 12, 0),
- schoolName = "",
- schoolShortName = "test",
- schoolSymbol = "",
- studentId = 0,
- studentName = "",
- symbol = "",
- userLoginId = 0,
- userName = ""
- )
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
deleted file mode 100644
index 629c24321..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.data.repositories.grade
-
-import java.time.LocalDate
-import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
-import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
-
-fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
- return GradeLocal(
- semesterId = semesterId,
- studentId = 1,
- modifier = .0,
- teacher = "",
- subject = "",
- date = date,
- color = "",
- comment = "",
- description = desc,
- entry = "",
- gradeSymbol = "",
- value = value.toDouble(),
- weight = "",
- weightValue = weight
- )
-}
-
-fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
- return GradeRemote(
- subject = "",
- color = "",
- comment = "",
- date = date,
- description = desc,
- entry = "",
- modifier = .0,
- symbol = "",
- teacher = "",
- value = value.toDouble(),
- weight = weight.toString(),
- weightValue = weight
- )
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
deleted file mode 100644
index 197d2d0ec..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate.now
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class GradeStatisticsLocalTest {
-
- private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
- .build()
- gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndRead_subject() {
- val list = listOf(
- getGradeStatistics("Matematyka", 2, 1),
- getGradeStatistics("Fizyka", 1, 2)
- )
- runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
-
- val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
- assertEquals(1, stats.size)
- assertEquals(stats[0].subject, "Matematyka")
- }
-
- @Test
- fun saveAndRead_all() {
- val list = listOf(
- getGradeStatistics("Matematyka", 2, 1),
- getGradeStatistics("Chemia", 2, 1),
- getGradeStatistics("Fizyka", 1, 2)
- )
- runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
-
- val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
- assertEquals(2, stats.size)
-// assertEquals(3, stats.size)
-// assertEquals(stats[0].subject, "Wszystkie") // now in main repo
- assertEquals(stats[0].subject, "Matematyka")
- assertEquals(stats[1].subject, "Chemia")
- }
-
- @Test
- fun saveAndRead_points() {
- val list = listOf(
- getGradePointsStatistics("Matematyka", 2, 1),
- getGradePointsStatistics("Chemia", 2, 1),
- getGradePointsStatistics("Fizyka", 1, 2)
- )
- runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(list) }
-
- val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
- with(stats[0]) {
- assertEquals(subject, "Matematyka")
- assertEquals(others, 5.0)
- assertEquals(student, 5.0)
- }
- }
-
- @Test
- fun saveAndRead_subjectEmpty() {
- runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
-
- val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
- assertEquals(emptyList(), stats)
- }
-
- @Test
- fun saveAndRead_allEmpty() {
- runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
-
- val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
- assertEquals(emptyList(), stats)
- }
-
- private fun getSemester(): Semester {
- return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
- }
-
- private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
- return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
- }
-
- private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
- return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
deleted file mode 100644
index ca38b1fee..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.github.wulkanowy.data.repositories.luckynumber
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.now
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class LuckyNumberLocalTest {
-
- private lateinit var luckyNumberLocal: LuckyNumberLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room
- .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
- .build()
- luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val number = LuckyNumber(1, LocalDate.of(2019, 1, 20), 14)
- runBlocking { luckyNumberLocal.saveLuckyNumber(number) }
-
- val student = Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", "", 1, false, now())
- val luckyNumber = runBlocking { luckyNumberLocal.getLuckyNumber(student, LocalDate.of(2019, 1, 20)).first() }
-
- assertEquals(1, luckyNumber?.studentId)
- assertEquals(LocalDate.of(2019, 1, 20), luckyNumber?.date)
- assertEquals(14, luckyNumber?.luckyNumber)
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
deleted file mode 100644
index 6bd1959bd..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.github.wulkanowy.data.repositories.recipient
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDateTime
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class RecipientLocalTest {
-
- private lateinit var recipientLocal: RecipientLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
- .build()
- recipientLocal = RecipientLocal(testDb.recipientDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val list = listOf(
- Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
- Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
- Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
- )
- runBlocking { recipientLocal.saveRecipients(list) }
-
- val student = Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
- val recipients = runBlocking {
- recipientLocal.getRecipients(
- student = student,
- role = 2,
- unit = ReportingUnit(1, 4, "", 0, "", emptyList())
- )
- }
-
- assertEquals(2, recipients.size)
- assertEquals(1, recipients[0].studentId)
- assertEquals("3rPracownik", recipients[1].realId)
- assertEquals("Kowalski Jan", recipients[0].name)
- assertEquals("Kowalska Karolina [KK] - Pracownik (Fake123456)", recipients[1].realName)
- assertEquals(3, recipients[0].loginId)
- assertEquals(4, recipients[1].unitId)
- assertEquals(2, recipients[0].role)
- assertEquals("hash", recipients[1].hash)
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
deleted file mode 100644
index d68f15a80..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.data.repositories.student
-
-import android.content.Context
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.TestDispatchersProvider
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.getStudent
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class StudentLocalTest {
-
- private lateinit var studentLocal: StudentLocal
-
- private lateinit var testDb: AppDatabase
-
- private val student = getStudent()
-
- @Before
- fun createDb() {
- val context = ApplicationProvider.getApplicationContext()
- testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
- .build()
- studentLocal = StudentLocal(testDb.studentDao, TestDispatchersProvider(), context)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- runBlocking { studentLocal.saveStudents(listOf(student)) }
-
- val student = runBlocking { studentLocal.getCurrentStudent(true) }
- assertEquals("23", student?.schoolSymbol)
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
deleted file mode 100644
index dddf6464c..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
-import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
-import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
-
-fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
- return TimetableLocal(
- studentId = 1,
- diaryId = 2,
- number = number,
- start = start,
- end = now(),
- date = start.toLocalDate(),
- subject = subject,
- subjectOld = "",
- group = "",
- room = room,
- roomOld = "",
- teacher = teacher,
- teacherOld = "",
- info = "",
- isStudentPlan = true,
- changes = changes,
- canceled = false
- )
-}
-
-fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
- return TimetableRemote(
- number = number,
- start = start,
- end = start.plusMinutes(45),
- date = start.toLocalDate(),
- subject = subject,
- group = "",
- room = room,
- teacher = teacher,
- info = "",
- changes = changes,
- canceled = false,
- roomOld = "",
- subjectOld = "",
- teacherOld = "",
- studentPlan = true
- )
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
deleted file mode 100644
index e793212e6..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.of
-import kotlin.test.assertEquals
-
-@RunWith(AndroidJUnit4::class)
-class TimetableLocalTest {
-
- private lateinit var timetableDb: TimetableLocal
-
- private lateinit var testDb: AppDatabase
-
- @Before
- fun createDb() {
- testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
- .build()
- timetableDb = TimetableLocal(testDb.timetableDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun saveAndReadTest() {
- val list = listOf(
- createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
- createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
- createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
- )
- runBlocking { timetableDb.saveTimetable(list) }
-
- val semester = Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1)
- val exams = runBlocking {
- timetableDb.getTimetable(
- semester = semester,
- startDate = LocalDate.of(2018, 9, 10),
- endDate = LocalDate.of(2018, 9, 14)
- ).first()
- }
-
- assertEquals(2, exams.size)
- assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
- assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
- }
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
deleted file mode 100644
index 1bd3c4679..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import android.os.Build.VERSION_CODES.P
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider.getApplicationContext
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SdkSuppress
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.repositories.getSemester
-import io.github.wulkanowy.data.repositories.getStudent
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.time.LocalDate
-import java.time.LocalDateTime.of
-import kotlin.test.assertEquals
-
-@SdkSuppress(minSdkVersion = P)
-@RunWith(AndroidJUnit4::class)
-class TimetableRepositoryTest {
-
- @MockK(relaxed = true)
- private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
-
- @MockK
- private lateinit var timetableRemote: TimetableRemote
-
- private lateinit var timetableLocal: TimetableLocal
-
- private lateinit var testDb: AppDatabase
-
- private val student = getStudent()
-
- private val semester = getSemester()
-
- @Before
- fun initApi() {
- MockKAnnotations.init(this)
- testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
- timetableLocal = TimetableLocal(testDb.timetableDao)
- }
-
- @After
- fun closeDb() {
- testDb.close()
- }
-
- @Test
- fun copyRoomToCompletedFromPrevious() {
- runBlocking {
- timetableLocal.saveTimetable(listOf(
- createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
- createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
- createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
- createTimetableLocal(of(2019, 3, 5, 10, 30), 3, "213", "W-F", "Jan Kowalski")
- ))
- }
-
- coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
- createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
- createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
- createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
- createTimetableLocal(of(2019, 3, 5, 10, 30), 4, "", "W-F")
- )
-
- val lessons = runBlocking {
- TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
- student = student,
- semester = semester,
- start = LocalDate.of(2019, 3, 5),
- end = LocalDate.of(2019, 3, 5),
- forceRefresh = true
- ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
- }
-
- assertEquals(4, lessons.size)
- assertEquals("123", lessons[0].room)
- assertEquals("321", lessons[1].room)
- assertEquals("213", lessons[2].room)
- }
-
- @Test
- fun copyTeacherToCompletedFromPrevious() {
- val list = listOf(
- createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
- createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
- createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
- createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
-
- createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false),
- createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false),
- createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true),
- createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true),
-
- createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "", false),
- createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
- createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
- createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
- )
- runBlocking { timetableLocal.saveTimetable(list) }
-
- coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
- createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
- createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
- createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
- createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
-
- createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
- createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
- createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
- createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
-
- createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
- createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
- createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
- createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
- )
-
- val lessons = runBlocking {
- TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
- student = student,
- semester = semester,
- start = LocalDate.of(2019, 12, 23),
- end = LocalDate.of(2019, 12, 25),
- forceRefresh = true
- ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
- }
-
- assertEquals(12, lessons.size)
-
- assertEquals("Paweł Poniedziałkowski", lessons[0].teacher)
- assertEquals("Jakub Wtorkowski", lessons[1].teacher)
- assertEquals("Joanna Poniedziałkowska", lessons[2].teacher)
- assertEquals("Joanna Wtorkowska", lessons[3].teacher)
-
- assertEquals("Joanna Wtorkowska", lessons[4].teacher)
- assertEquals("", lessons[5].teacher)
- assertEquals("", lessons[6].teacher)
- assertEquals("", lessons[7].teacher)
-
- assertEquals("Paweł Środowski", lessons[8].teacher)
- assertEquals("Paweł Czwartkowski", lessons[9].teacher)
- assertEquals("Paweł Środowski", lessons[10].teacher)
- assertEquals("Paweł Czwartkowski", lessons[11].teacher)
- }
-}
diff --git a/app/src/debug/agconnect-services.json b/app/src/debug/agconnect-services.json
new file mode 100644
index 000000000..48192df01
--- /dev/null
+++ b/app/src/debug/agconnect-services.json
@@ -0,0 +1,33 @@
+{
+ "agcgw":{
+ "backurl":"connect-dre.dbankcloud.cn",
+ "url":"connect-dre.hispace.hicloud.com"
+ },
+ "client":{
+ "cp_id":"890048000024105546",
+ "product_id":"",
+ "client_id":"",
+ "client_secret":"",
+ "app_id":"101440411",
+ "package_name":"io.github.wulkanowy.dev",
+ "api_key":""
+ },
+ "service":{
+ "analytics":{
+ "collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+ "resource_id":"p1",
+ "channel_id":""
+ },
+ "search":{
+ "url":"https://search-dre.cloud.huawei.com"
+ },
+ "cloudstorage":{
+ "storage_url":"https://ops-dre.agcstorage.link"
+ },
+ "ml":{
+ "mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
+ }
+ },
+ "region":"DE",
+ "configuration_version":"1.0"
+}
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml
new file mode 100644
index 000000000..ac99d4a89
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..10b27cee7
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..db5747b0d
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..8d9858292
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..232108e87
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png differ
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
similarity index 75%
rename from app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
rename to app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
index f23645bc3..3bf7e1693 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@@ -6,7 +6,7 @@ import javax.inject.Singleton
@Singleton
@Suppress("UNUSED_PARAMETER")
-class FirebaseAnalyticsHelper @Inject constructor() {
+class AnalyticsHelper @Inject constructor() {
fun logEvent(name: String, vararg params: Pair) {
// do nothing
@@ -15,4 +15,8 @@ class FirebaseAnalyticsHelper @Inject constructor() {
fun setCurrentScreen(activity: Activity, name: String?) {
// do nothing
}
+
+ fun popCurrentScreen(name: String?) {
+ // do nothing
+ }
}
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
similarity index 71%
rename from app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
rename to app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
index d03a319a2..5d58270d4 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@@ -8,6 +8,6 @@ open class TimberTreeNoOp : Timber.Tree() {
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
}
-class CrashlyticsTree : TimberTreeNoOp()
+class CrashLogTree : TimberTreeNoOp()
-class CrashlyticsExceptionTree : TimberTreeNoOp()
+class CrashLogExceptionTree : TimberTreeNoOp()
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
new file mode 100644
index 000000000..5d33825f1
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.utils
+
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import com.huawei.hms.analytics.HiAnalytics
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AnalyticsHelper @Inject constructor(
+ @ApplicationContext private val context: Context
+) {
+
+ private val analytics by lazy { HiAnalytics.getInstance(context) }
+
+ fun logEvent(name: String, vararg params: Pair) {
+ Bundle().apply {
+ params.forEach {
+ if (it.second == null) return@forEach
+ when (it.second) {
+ is String, is String? -> putString(it.first, it.second as String)
+ is Int, is Int? -> putInt(it.first, it.second as Int)
+ is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
+ }
+ }
+ analytics.onEvent(name, this)
+ }
+ }
+
+ fun setCurrentScreen(activity: Activity, name: String?) {
+ analytics.pageStart(name, activity::class.simpleName)
+ }
+
+ fun popCurrentScreen(name: String?) {
+ analytics.pageEnd(name)
+ }
+}
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
new file mode 100644
index 000000000..b5fb6ad71
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.utils
+
+import android.util.Log
+import com.huawei.agconnect.crash.AGConnectCrash
+import fr.bipi.tressence.base.FormatterPriorityTree
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import java.io.InterruptedIOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
+
+ private val connectCrash by lazy { AGConnectCrash.getInstance() }
+
+ override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+ if (skipLog(priority, tag, message, t)) return
+
+ connectCrash.log(format(priority, tag, message))
+ }
+}
+
+class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) {
+
+ private val connectCrash by lazy { AGConnectCrash.getInstance() }
+
+ override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
+ return when (t) {
+ is FeatureDisabledException,
+ is FeatureNotAvailableException,
+ is UnknownHostException,
+ is SocketTimeoutException,
+ is InterruptedIOException -> true
+ else -> super.skipLog(priority, tag, message, t)
+ }
+ }
+
+ override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+ if (skipLog(priority, tag, message, t)) return
+
+ // Disabled due to a bug in the Huawei library
+
+ /*connectCrash.setCustomKey("priority", priority)
+ connectCrash.setCustomKey("tag", tag.orEmpty())
+ connectCrash.setCustomKey("message", message)
+
+ if (t != null) {
+ connectCrash.recordException(t)
+ } else {
+ connectCrash.recordException(StackTraceRecorder(format(priority, tag, message)))
+ }*/
+ }
+}
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt
new file mode 100644
index 000000000..3abab9629
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.app.Activity
+import android.view.View
+import javax.inject.Inject
+
+@Suppress("UNUSED_PARAMETER")
+class UpdateHelper @Inject constructor() {
+
+ lateinit var messageContainer: View
+
+ fun checkAndInstallUpdates(activity: Activity) {}
+
+ fun onActivityResult(requestCode: Int, resultCode: Int) {}
+
+ fun onResume(activity: Activity) {}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4ec2f7816..ac8d3be4a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
return arrayOf(
@@ -142,6 +161,13 @@ abstract class AppDatabase : RoomDatabase() {
Migration25(),
Migration26(),
Migration27(),
+ Migration28(),
+ Migration29(),
+ Migration30(),
+ Migration31(),
+ Migration32(),
+ Migration33(),
+ Migration34()
)
}
@@ -171,9 +197,11 @@ abstract class AppDatabase : RoomDatabase() {
abstract val gradeSummaryDao: GradeSummaryDao
- abstract val gradeStatistics: GradeStatisticsDao
+ abstract val gradePartialStatisticsDao: GradePartialStatisticsDao
- abstract val gradePointsStatistics: GradePointsStatisticsDao
+ abstract val gradePointsStatisticsDao: GradePointsStatisticsDao
+
+ abstract val gradeSemesterStatisticsDao: GradeSemesterStatisticsDao
abstract val messagesDao: MessagesDao
@@ -198,4 +226,10 @@ abstract class AppDatabase : RoomDatabase() {
abstract val teacherDao: TeacherDao
abstract val schoolDao: SchoolDao
+
+ abstract val conferenceDao: ConferenceDao
+
+ abstract val timetableAdditionalDao: TimetableAdditionalDao
+
+ abstract val studentInfoDao: StudentInfoDao
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
index 4a4aaf74f..9301d5fa9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@@ -6,7 +6,9 @@ import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
+class SharedPrefProvider @Inject constructor(
+ private val sharedPref: SharedPreferences
+) {
companion object {
const val APP_VERSION_CODE_KEY = "app_version_code"
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
index 8c03609d6..097ad7c81 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -12,5 +12,5 @@ import javax.inject.Singleton
interface CompletedLessonsDao : BaseDao {
@Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
- fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow>
+ fun loadAll(studentId: Int, diaryId: Int, from: LocalDate, end: LocalDate): Flow>
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
new file mode 100644
index 000000000..4ed9aecf5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.Conference
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Dao
+@Singleton
+interface ConferenceDao : BaseDao {
+
+ @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId")
+ fun loadAll(diaryId: Int, studentId: Int): Flow>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePartialStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePartialStatisticsDao.kt
new file mode 100644
index 000000000..bce6ce572
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePartialStatisticsDao.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradePartialStatistics
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface GradePartialStatisticsDao : BaseDao {
+
+ @Query("SELECT * FROM GradePartialStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
+ fun loadAll(semesterId: Int, studentId: Int): Flow>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSemesterStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSemesterStatisticsDao.kt
new file mode 100644
index 000000000..09ae81714
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSemesterStatisticsDao.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface GradeSemesterStatisticsDao : BaseDao {
+
+ @Query("SELECT * FROM GradeSemesterStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
+ fun loadAll(semesterId: Int, studentId: Int): Flow>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
deleted file mode 100644
index b462ad5db..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface GradeStatisticsDao : BaseDao {
-
- @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
- fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Flow>
-
- @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
- fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Flow>
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
index 8baba2c30..081e859a5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
@@ -8,6 +8,6 @@ import kotlinx.coroutines.flow.Flow
@Dao
interface MobileDeviceDao : BaseDao {
- @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
- fun loadAll(studentId: Int): Flow>
+ @Query("SELECT * FROM MobileDevices WHERE student_id = :userLoginId ORDER BY date DESC")
+ fun loadAll(userLoginId: Int): Flow>
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
index 419efde0d..943f3f0cc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -9,6 +9,6 @@ import javax.inject.Singleton
@Dao
interface RecipientDao : BaseDao {
- @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
- suspend fun load(studentId: Int, role: Int, unitId: Int): List
+ @Query("SELECT * FROM Recipients WHERE student_id = :userLoginId AND unit_id = :unitId AND role = :role")
+ suspend fun loadAll(userLoginId: Int, unitId: Int, role: Int): List
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index d7237ea8a..e9c5f157e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -6,7 +6,9 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy.ABORT
import androidx.room.Query
import androidx.room.Transaction
+import androidx.room.Update
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentNick
import io.github.wulkanowy.data.db.entities.StudentWithSemesters
import javax.inject.Singleton
@@ -20,6 +22,9 @@ interface StudentDao {
@Delete
suspend fun delete(student: Student)
+ @Update(entity = Student::class)
+ suspend fun update(studentNick: StudentNick)
+
@Query("SELECT * FROM Students WHERE is_current = 1")
suspend fun loadCurrent(): Student?
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentInfoDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentInfoDao.kt
new file mode 100644
index 000000000..5ec86af12
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentInfoDao.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.StudentInfo
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface StudentInfoDao : BaseDao {
+
+ @Query("SELECT * FROM StudentInfo WHERE student_id = :studentId")
+ fun loadStudentInfo(studentId: Int): Flow
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt
new file mode 100644
index 000000000..335e003e1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
+import javax.inject.Singleton
+
+@Dao
+@Singleton
+interface TimetableAdditionalDao : BaseDao {
+
+ @Query("SELECT * FROM TimetableAdditional WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
+ fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
new file mode 100644
index 000000000..8ddcbbb0b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+import java.time.LocalDateTime
+
+@Entity(tableName = "Conferences")
+data class Conference(
+
+ @ColumnInfo(name = "student_id")
+ val studentId: Int,
+
+ @ColumnInfo(name = "diary_id")
+ val diaryId: Int,
+
+ val title: String,
+
+ val subject: String,
+
+ val agenda: String,
+
+ @ColumnInfo(name = "present_on_conference")
+ val presentOnConference: String,
+
+ @ColumnInfo(name = "conference_id")
+ val conferenceId: Int,
+
+ val date: LocalDateTime
+) : Serializable {
+
+ @PrimaryKey(autoGenerate = true)
+ var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePartialStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePartialStatistics.kt
new file mode 100644
index 000000000..db164afde
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePartialStatistics.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "GradePartialStatistics")
+data class GradePartialStatistics(
+
+ @ColumnInfo(name = "student_id")
+ val studentId: Int,
+
+ @ColumnInfo(name = "semester_id")
+ val semesterId: Int,
+
+ val subject: String,
+
+ @ColumnInfo(name = "class_average")
+ val classAverage: String,
+
+ @ColumnInfo(name = "student_average")
+ val studentAverage: String,
+
+ @ColumnInfo(name = "class_amounts")
+ val classAmounts: List,
+
+ @ColumnInfo(name = "student_amounts")
+ val studentAmounts: List
+
+) {
+ @PrimaryKey(autoGenerate = true)
+ var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt
similarity index 61%
rename from app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
rename to app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt
index 8ad8b8b8d..e747271ce 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt
@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-@Entity(tableName = "GradesStatistics")
-data class GradeStatistics(
+@Entity(tableName = "GradeSemesterStatistics")
+data class GradeSemesterStatistics(
@ColumnInfo(name = "student_id")
val studentId: Int,
@@ -15,13 +15,14 @@ data class GradeStatistics(
val subject: String,
- val grade: Int,
+ val amounts: List,
- val amount: Int,
-
- @ColumnInfo(name = "is_semester")
- val semester: Boolean
+ @ColumnInfo(name = "student_grade")
+ val studentGrade: Int
) {
@PrimaryKey(autoGenerate = true)
var id: Long = 0
+
+ @Transient
+ var average: String = ""
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index 9d8f11625..83d82c0b9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
@@ -10,7 +10,7 @@ import java.time.LocalDateTime
data class MobileDevice(
@ColumnInfo(name = "student_id")
- val studentId: Int,
+ val userLoginId: Int,
@ColumnInfo(name = "device_id")
val deviceId: Int,
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
index 3021da72d..b1f1f3530 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
@@ -9,7 +9,7 @@ import java.io.Serializable
data class Recipient(
@ColumnInfo(name = "student_id")
- val studentId: Int,
+ val userLoginId: Int,
@ColumnInfo(name = "real_id")
val realId: String,
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
index 601d8aac7..0570a2ffd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
@@ -12,7 +12,7 @@ data class ReportingUnit(
val studentId: Int,
@ColumnInfo(name = "real_id")
- val realId: Int,
+ val unitId: Int,
@ColumnInfo(name = "short")
val shortName: String,
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index b6c75ff8f..6b60c8146 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -7,7 +7,13 @@ import androidx.room.PrimaryKey
import java.io.Serializable
import java.time.LocalDateTime
-@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
+@Entity(
+ tableName = "Students",
+ indices = [Index(
+ value = ["email", "symbol", "student_id", "school_id", "class_id"],
+ unique = true
+ )]
+)
data class Student(
@ColumnInfo(name = "scrapper_base_url")
@@ -52,7 +58,7 @@ data class Student(
@ColumnInfo(name = "school_id")
val schoolSymbol: String,
- @ColumnInfo(name ="school_short")
+ @ColumnInfo(name = "school_short")
val schoolShortName: String,
@ColumnInfo(name = "school_name")
@@ -73,4 +79,6 @@ data class Student(
@PrimaryKey(autoGenerate = true)
var id: Long = 0
+
+ var nick = ""
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentInfo.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentInfo.kt
new file mode 100644
index 000000000..7366e547f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentInfo.kt
@@ -0,0 +1,85 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import io.github.wulkanowy.data.enums.Gender
+import java.io.Serializable
+import java.time.LocalDate
+
+@Entity(tableName = "StudentInfo")
+data class StudentInfo(
+
+ @ColumnInfo(name = "student_id")
+ val studentId: Int,
+
+ @ColumnInfo(name = "full_name")
+ val fullName: String,
+
+ @ColumnInfo(name = "first_name")
+ val firstName: String,
+
+ @ColumnInfo(name = "second_name")
+ val secondName: String,
+
+ val surname: String,
+
+ @ColumnInfo(name = "birth_date")
+ val birthDate: LocalDate,
+
+ @ColumnInfo(name = "birth_place")
+ val birthPlace: String,
+
+ val gender: Gender,
+
+ @ColumnInfo(name = "has_polish_citizenship")
+ val hasPolishCitizenship: Boolean,
+
+ @ColumnInfo(name = "family_name")
+ val familyName: String,
+
+ @ColumnInfo(name = "parents_names")
+ val parentsNames: String,
+
+ val address: String,
+
+ @ColumnInfo(name = "registered_address")
+ val registeredAddress: String,
+
+ @ColumnInfo(name = "correspondence_address")
+ val correspondenceAddress: String,
+
+ @ColumnInfo(name = "phone_number")
+ val phoneNumber: String,
+
+ @ColumnInfo(name = "cell_phone_number")
+ val cellPhoneNumber: String,
+
+ val email: String,
+
+ @Embedded(prefix = "first_guardian_")
+ val firstGuardian: StudentGuardian?,
+
+ @Embedded(prefix = "second_guardian_")
+ val secondGuardian: StudentGuardian?
+
+) : Serializable {
+
+ @PrimaryKey(autoGenerate = true)
+ var id: Long = 0
+}
+
+data class StudentGuardian(
+
+ @ColumnInfo(name = "full_name")
+ val fullName: String,
+
+ val kinship: String,
+
+ val address: String,
+
+ val phones: String,
+
+ val email: String
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentNick.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentNick.kt
new file mode 100644
index 000000000..71f48f7a3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentNick.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity
+data class StudentNick(
+
+ val nick: String
+
+) : Serializable {
+
+ @PrimaryKey
+ var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt
new file mode 100644
index 000000000..c1f1365f9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+import java.time.LocalDate
+import java.time.LocalDateTime
+
+@Entity(tableName = "TimetableAdditional")
+data class TimetableAdditional(
+
+ @ColumnInfo(name = "student_id")
+ val studentId: Int,
+
+ @ColumnInfo(name = "diary_id")
+ val diaryId: Int,
+
+ val start: LocalDateTime,
+
+ val end: LocalDateTime,
+
+ val date: LocalDate,
+
+ val subject: String,
+) : Serializable {
+
+ @PrimaryKey(autoGenerate = true)
+ var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration28.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration28.kt
new file mode 100644
index 000000000..51e7628b5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration28.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration28 : Migration(27, 28) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("""
+ CREATE TABLE IF NOT EXISTS Conferences (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ student_id INTEGER NOT NULL,
+ diary_id INTEGER NOT NULL,
+ title TEXT NOT NULL,
+ subject TEXT NOT NULL,
+ agenda TEXT NOT NULL,
+ present_on_conference TEXT NOT NULL,
+ conference_id INTEGER NOT NULL,
+ date INTEGER NOT NULL
+ )
+ """)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration29.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration29.kt
new file mode 100644
index 000000000..327552d75
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration29.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration29 : Migration(28, 29) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("DROP TABLE IF EXISTS GradesStatistics")
+ database.execSQL("""
+ CREATE TABLE IF NOT EXISTS GradeSemesterStatistics (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ student_id INTEGER NOT NULL,
+ semester_id INTEGER NOT NULL,
+ subject TEXT NOT NULL,
+ amounts TEXT NOT NULL,
+ student_grade INTEGER NOT NULL
+ )
+ """)
+ database.execSQL("""
+ CREATE TABLE IF NOT EXISTS GradePartialStatistics (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ student_id INTEGER NOT NULL,
+ semester_id INTEGER NOT NULL,
+ subject TEXT NOT NULL,
+ class_average TEXT NOT NULL,
+ student_average TEXT NOT NULL,
+ class_amounts TEXT NOT NULL,
+ student_amounts TEXT NOT NULL
+ )
+ """)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration30.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration30.kt
new file mode 100644
index 000000000..b33914fec
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration30.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration30 : Migration(29, 30) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("""
+ CREATE TABLE TimetableAdditional (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ student_id INTEGER NOT NULL,
+ diary_id INTEGER NOT NULL,
+ start INTEGER NOT NULL,
+ `end` INTEGER NOT NULL,
+ date INTEGER NOT NULL,
+ subject TEXT NOT NULL
+ )
+ """)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration31.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration31.kt
new file mode 100644
index 000000000..064a3e5bc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration31.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration31 : Migration(30, 31) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL(
+ """CREATE TABLE IF NOT EXISTS StudentInfo (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ student_id INTEGER NOT NULL,
+ full_name TEXT NOT NULL,
+ first_name TEXT NOT NULL,
+ second_name TEXT NOT NULL,
+ surname TEXT NOT NULL,
+ birth_date INTEGER NOT NULL,
+ birth_place TEXT NOT NULL,
+ gender TEXT NOT NULL,
+ has_polish_citizenship INTEGER NOT NULL,
+ family_name TEXT NOT NULL,
+ parents_names TEXT NOT NULL,
+ address TEXT NOT NULL,
+ registered_address TEXT NOT NULL,
+ correspondence_address TEXT NOT NULL,
+ phone_number TEXT NOT NULL,
+ cell_phone_number TEXT NOT NULL,
+ email TEXT NOT NULL,
+ first_guardian_full_name TEXT NOT NULL,
+ first_guardian_kinship TEXT NOT NULL,
+ first_guardian_address TEXT NOT NULL,
+ first_guardian_phones TEXT NOT NULL,
+ first_guardian_email TEXT NOT NULL,
+ second_guardian_full_name TEXT NOT NULL,
+ second_guardian_kinship TEXT NOT NULL,
+ second_guardian_address TEXT NOT NULL,
+ second_guardian_phones TEXT NOT NULL,
+ second_guardian_email TEXT NOT NULL)
+ """
+ )
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration32.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration32.kt
new file mode 100644
index 000000000..508485e08
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration32.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration32 : Migration(31, 32) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("ALTER TABLE Students ADD COLUMN nick TEXT NOT NULL DEFAULT \"\"")
+ }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration33.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration33.kt
new file mode 100644
index 000000000..4a57880d4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration33.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration33 : Migration(32, 33) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("DROP TABLE IF EXISTS StudentInfo")
+
+ database.execSQL(
+ """CREATE TABLE IF NOT EXISTS StudentInfo (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ student_id INTEGER NOT NULL,
+ full_name TEXT NOT NULL,
+ first_name TEXT NOT NULL,
+ second_name TEXT NOT NULL,
+ surname TEXT NOT NULL,
+ birth_date INTEGER NOT NULL,
+ birth_place TEXT NOT NULL,
+ gender TEXT NOT NULL,
+ has_polish_citizenship INTEGER NOT NULL,
+ family_name TEXT NOT NULL,
+ parents_names TEXT NOT NULL,
+ address TEXT NOT NULL,
+ registered_address TEXT NOT NULL,
+ correspondence_address TEXT NOT NULL,
+ phone_number TEXT NOT NULL,
+ cell_phone_number TEXT NOT NULL,
+ email TEXT NOT NULL,
+ first_guardian_full_name TEXT,
+ first_guardian_kinship TEXT,
+ first_guardian_address TEXT,
+ first_guardian_phones TEXT,
+ first_guardian_email TEXT,
+ second_guardian_full_name TEXT,
+ second_guardian_kinship TEXT,
+ second_guardian_address TEXT,
+ second_guardian_phones TEXT,
+ second_guardian_email TEXT)
+ """
+ )
+ }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration34.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration34.kt
new file mode 100644
index 000000000..2c57eb00a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration34.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration34 : Migration(33, 34) {
+
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("DELETE FROM ReportingUnits")
+ database.execSQL("DELETE FROM Recipients")
+ }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/Gender.kt b/app/src/main/java/io/github/wulkanowy/data/enums/Gender.kt
new file mode 100644
index 000000000..df93dcbef
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/Gender.kt
@@ -0,0 +1,3 @@
+package io.github.wulkanowy.data.enums
+
+enum class Gender { MALE, FEMALE }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt b/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
similarity index 63%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
rename to app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
index 06f5a1e05..899ba9085 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.message
+package io.github.wulkanowy.data.enums
enum class MessageFolder(val id: Int = 1) {
RECEIVED(1),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt b/app/src/main/java/io/github/wulkanowy/data/enums/SentExcuseStatus.kt
similarity index 60%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
rename to app/src/main/java/io/github/wulkanowy/data/enums/SentExcuseStatus.kt
index 50d6b8ed5..99878152f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/SentExcuseStatus.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.attendance
+package io.github.wulkanowy.data.enums
enum class SentExcuseStatus(val id: Int = 0) {
WAITING,
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
new file mode 100644
index 000000000..46e67fdaa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
+import io.github.wulkanowy.sdk.pojo.AttendanceSummary as SdkAttendanceSummary
+
+fun List.mapToEntities(semester: Semester) = map {
+ Attendance(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ date = it.date,
+ timeId = it.timeId,
+ number = it.number,
+ subject = it.subject,
+ name = it.name,
+ presence = it.presence,
+ absence = it.absence,
+ exemption = it.exemption,
+ lateness = it.lateness,
+ excused = it.excused,
+ deleted = it.deleted,
+ excusable = it.excusable,
+ excuseStatus = it.excuseStatus?.name
+ )
+}
+
+fun List.mapToEntities(semester: Semester, subjectId: Int) = map {
+ AttendanceSummary(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ subjectId = subjectId,
+ month = it.month,
+ presence = it.presence,
+ absence = it.absence,
+ absenceExcused = it.absenceExcused,
+ absenceForSchoolReasons = it.absenceForSchoolReasons,
+ lateness = it.lateness,
+ latenessExcused = it.latenessExcused,
+ exemption = it.exemption
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/CompletedLessonsMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/CompletedLessonsMapper.kt
new file mode 100644
index 000000000..c42126eb7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/CompletedLessonsMapper.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.CompletedLesson as SdkCompletedLesson
+
+fun List.mapToEntities(semester: Semester) = map {
+ CompletedLesson(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ date = it.date,
+ number = it.number,
+ subject = it.subject,
+ topic = it.topic,
+ teacher = it.teacher,
+ teacherSymbol = it.teacherSymbol,
+ substitution = it.substitution,
+ absence = it.absence,
+ resources = it.resources
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
new file mode 100644
index 000000000..52dc9b30b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.Conference as SdkConference
+
+fun List.mapToEntities(semester: Semester) = map {
+ Conference(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ agenda = it.agenda,
+ conferenceId = it.id,
+ date = it.date,
+ presentOnConference = it.presentOnConference,
+ subject = it.subject,
+ title = it.title
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
new file mode 100644
index 000000000..bdb5efbba
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.Exam as SdkExam
+
+fun List.mapToEntities(semester: Semester) = map {
+ Exam(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ date = it.date,
+ entryDate = it.entryDate,
+ subject = it.subject,
+ group = it.group,
+ type = it.type,
+ description = it.description,
+ teacher = it.teacher,
+ teacherSymbol = it.teacherSymbol
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
new file mode 100644
index 000000000..178de682a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.mappers
+
+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.sdk.pojo.GradeSummary as SdkGradeSummary
+import io.github.wulkanowy.sdk.pojo.Grade as SdkGrade
+
+fun List.mapToEntities(semester: Semester) = map {
+ Grade(
+ studentId = semester.studentId,
+ semesterId = semester.semesterId,
+ subject = it.subject,
+ entry = it.entry,
+ value = it.value,
+ modifier = it.modifier,
+ comment = it.comment,
+ color = it.color,
+ gradeSymbol = it.symbol,
+ description = it.description,
+ weight = it.weight,
+ weightValue = it.weightValue,
+ date = it.date,
+ teacher = it.teacher
+ )
+}
+
+@JvmName("mapGradeSummaryToEntities")
+fun List.mapToEntities(semester: Semester) = 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
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/GradeStatisticsMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeStatisticsMapper.kt
new file mode 100644
index 000000000..fbd40433c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeStatisticsMapper.kt
@@ -0,0 +1,80 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.GradePartialStatistics
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
+import io.github.wulkanowy.sdk.pojo.GradeStatisticsSubject as SdkGradeStatisticsSubject
+import io.github.wulkanowy.sdk.pojo.GradeStatisticsSemester as SdkGradeStatisticsSemester
+import io.github.wulkanowy.sdk.pojo.GradePointsStatistics as SdkGradePointsStatistics
+
+@JvmName("mapToEntitiesSubject")
+fun List.mapToEntities(semester: Semester) = map {
+ GradePartialStatistics(
+ semesterId = semester.semesterId,
+ studentId = semester.studentId,
+ subject = it.subject,
+ classAverage = it.classAverage,
+ studentAverage = it.studentAverage,
+ classAmounts = it.classItems
+ .sortedBy { item -> item.grade }
+ .map { item -> item.amount },
+ studentAmounts = it.studentItems.map { item -> item.amount }
+ )
+}
+
+@JvmName("mapToEntitiesSemester")
+fun List.mapToEntities(semester: Semester) = map {
+ GradeSemesterStatistics(
+ semesterId = semester.semesterId,
+ studentId = semester.studentId,
+ subject = it.subject,
+ amounts = it.items
+ .sortedBy { item -> item.grade }
+ .map { item -> item.amount },
+ studentGrade = it.items.singleOrNull { item -> item.isStudentHere }?.grade ?: 0
+ )
+}
+
+@JvmName("mapToEntitiesPoints")
+fun List.mapToEntities(semester: Semester) = map {
+ GradePointsStatistics(
+ semesterId = semester.semesterId,
+ studentId = semester.studentId,
+ subject = it.subject,
+ others = it.others,
+ student = it.student
+ )
+}
+
+fun List.mapPartialToStatisticItems() = filterNot { it.classAmounts.isEmpty() }.map {
+ GradeStatisticsItem(
+ type = ViewType.PARTIAL,
+ average = it.classAverage,
+ partial = it,
+ points = null,
+ semester = null
+ )
+}
+
+fun List.mapSemesterToStatisticItems() = filterNot { it.amounts.isEmpty() }.map {
+ GradeStatisticsItem(
+ type = ViewType.SEMESTER,
+ partial = null,
+ points = null,
+ average = "",
+ semester = it
+ )
+}
+
+fun List.mapPointsToStatisticsItems() = map {
+ GradeStatisticsItem(
+ type = ViewType.POINTS,
+ partial = null,
+ semester = null,
+ average = "",
+ points = it
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/HomeworkMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/HomeworkMapper.kt
new file mode 100644
index 000000000..880a26d6d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/HomeworkMapper.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.sdk.pojo.Homework as SdkHomework
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.Semester
+
+fun List.mapToEntities(semester: Semester) = map {
+ Homework(
+ semesterId = semester.semesterId,
+ studentId = semester.studentId,
+ date = it.date,
+ entryDate = it.entryDate,
+ subject = it.subject,
+ content = it.content,
+ teacher = it.teacher,
+ teacherSymbol = it.teacherSymbol,
+ attachments = it.attachments.map { attachment ->
+ attachment.url to attachment.name
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/LuckyNumberMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/LuckyNumberMapper.kt
new file mode 100644
index 000000000..78ebe1d6e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/LuckyNumberMapper.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Student
+import java.time.LocalDate
+import io.github.wulkanowy.sdk.pojo.LuckyNumber as SdkLuckyNumber
+
+fun SdkLuckyNumber.mapToEntity(student: Student) = LuckyNumber(
+ studentId = student.studentId,
+ date = LocalDate.now(),
+ luckyNumber = number
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
new file mode 100644
index 000000000..2c815b305
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
+import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
+import java.time.LocalDateTime
+import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
+
+fun List.mapToEntities(student: Student) = map {
+ Message(
+ studentId = student.id.toInt(),
+ realId = it.id ?: 0,
+ messageId = it.messageId ?: 0,
+ sender = it.sender?.name.orEmpty(),
+ senderId = it.sender?.loginId ?: 0,
+ recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
+ subject = it.subject.trim(),
+ date = it.date ?: LocalDateTime.now(),
+ folderId = it.folderId,
+ unread = it.unread ?: false,
+ removed = it.removed,
+ hasAttachments = it.hasAttachments
+ ).apply {
+ content = it.content.orEmpty()
+ unreadBy = it.unreadBy ?: 0
+ readBy = it.readBy ?: 0
+ }
+}
+
+fun List.mapToEntities() = map {
+ MessageAttachment(
+ realId = it.id,
+ messageId = it.messageId,
+ oneDriveId = it.oneDriveId,
+ url = it.url,
+ filename = it.filename
+ )
+}
+
+fun List.mapFromEntities() = map {
+ SdkRecipient(
+ id = it.realId,
+ name = it.realName,
+ loginId = it.loginId,
+ reportingUnitId = it.unitId,
+ role = it.role,
+ hash = it.hash,
+ shortName = it.name
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
new file mode 100644
index 000000000..f0c375bfa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.sdk.pojo.Token as SdkToken
+import io.github.wulkanowy.sdk.pojo.Device as SdkDevice
+
+fun List.mapToEntities(semester: Semester) = map {
+ MobileDevice(
+ userLoginId = semester.studentId,
+ date = it.createDate,
+ deviceId = it.id,
+ name = it.name
+ )
+}
+
+fun SdkToken.mapToMobileDeviceToken() = MobileDeviceToken(
+ token = token,
+ symbol = symbol,
+ pin = pin,
+ qr = qrCodeImage
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/NoteMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/NoteMapper.kt
new file mode 100644
index 000000000..70941799b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/NoteMapper.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.Note as SdkNote
+
+fun List.mapToEntities(semester: Semester) = map {
+ Note(
+ studentId = semester.studentId,
+ date = it.date,
+ teacher = it.teacher,
+ teacherSymbol = it.teacherSymbol,
+ category = it.category,
+ categoryType = it.categoryType.id,
+ isPointsShow = it.showPoints,
+ points = it.points,
+ content = it.content
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
new file mode 100644
index 000000000..9996f6800
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
+
+fun List.mapToEntities(userLoginId: Int) = map {
+ Recipient(
+ userLoginId = userLoginId,
+ realId = it.id,
+ realName = it.name,
+ name = it.shortName,
+ hash = it.hash,
+ loginId = it.loginId,
+ role = it.role,
+ unitId = it.reportingUnitId ?: 0
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
new file mode 100644
index 000000000..71ea7099d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.pojo.ReportingUnit as SdkReportingUnit
+
+fun List.mapToEntities(student: Student) = map {
+ ReportingUnit(
+ studentId = student.studentId,
+ unitId = it.id,
+ roles = it.roles,
+ senderId = it.senderId,
+ senderName = it.senderName,
+ shortName = it.short
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SchoolInfoMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SchoolInfoMapper.kt
new file mode 100644
index 000000000..dc3a5a9e9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/SchoolInfoMapper.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.School as SdkSchool
+
+fun SdkSchool.mapToEntity(semester: Semester) = School(
+ studentId = semester.studentId,
+ classId = semester.classId,
+ name = name,
+ address = address,
+ contact = contact,
+ headmaster = headmaster,
+ pedagogue = pedagogue
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentInfoMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentInfoMapper.kt
new file mode 100644
index 000000000..9e8533901
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentInfoMapper.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.StudentGuardian
+import io.github.wulkanowy.data.db.entities.StudentInfo
+import io.github.wulkanowy.data.enums.Gender
+import io.github.wulkanowy.sdk.pojo.StudentGuardian as SdkStudentGuardian
+import io.github.wulkanowy.sdk.pojo.StudentInfo as SdkStudentInfo
+
+fun SdkStudentInfo.mapToEntity(semester: Semester) = StudentInfo(
+ studentId = semester.studentId,
+ fullName = fullName,
+ firstName = firstName,
+ secondName = secondName,
+ surname = surname,
+ birthDate = birthDate,
+ birthPlace = birthPlace,
+ gender = Gender.valueOf(gender.name),
+ hasPolishCitizenship = hasPolishCitizenship,
+ familyName = familyName,
+ parentsNames = parentsNames,
+ address = address,
+ registeredAddress = registeredAddress,
+ correspondenceAddress = correspondenceAddress,
+ phoneNumber = phoneNumber,
+ cellPhoneNumber = phoneNumber,
+ email = email,
+ firstGuardian = guardianFirst?.mapToEntity(),
+ secondGuardian = guardianSecond?.mapToEntity()
+)
+
+fun SdkStudentGuardian.mapToEntity() = StudentGuardian(
+ fullName = fullName,
+ kinship = kinship,
+ address = address,
+ phones = phones,
+ email = email
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SubjectMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SubjectMapper.kt
new file mode 100644
index 000000000..4dc95aaa7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/SubjectMapper.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.sdk.pojo.Subject as SdkSubject
+
+fun List.mapToEntities(semester: Semester) = map {
+ Subject(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ name = it.name,
+ realId = it.id
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/TeacherMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/TeacherMapper.kt
new file mode 100644
index 000000000..49cb7c294
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/TeacherMapper.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.sdk.pojo.Teacher as SdkTeacher
+
+fun List.mapToEntities(semester: Semester) = map {
+ Teacher(
+ studentId = semester.studentId,
+ name = it.name,
+ subject = it.subject,
+ shortName = it.short,
+ classId = semester.classId
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
new file mode 100644
index 000000000..ffd2ae34e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
+import io.github.wulkanowy.sdk.pojo.TimetableAdditional as SdkTimetableAdditional
+
+fun List.mapToEntities(semester: Semester) = map {
+ Timetable(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ number = it.number,
+ start = it.start,
+ end = it.end,
+ date = it.date,
+ subject = it.subject,
+ subjectOld = it.subjectOld,
+ group = it.group,
+ room = it.room,
+ roomOld = it.roomOld,
+ teacher = it.teacher,
+ teacherOld = it.teacherOld,
+ info = it.info,
+ isStudentPlan = it.studentPlan,
+ changes = it.changes,
+ canceled = it.canceled
+ )
+}
+
+@JvmName("mapToEntitiesTimetableAdditional")
+fun List.mapToEntities(semester: Semester) = map {
+ TimetableAdditional(
+ studentId = semester.studentId,
+ diaryId = semester.diaryId,
+ subject = it.subject,
+ date = it.date,
+ start = it.start,
+ end = it.end
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
index 34b62abdb..88257470d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
@@ -1,14 +1,19 @@
package io.github.wulkanowy.data.pojos
+import io.github.wulkanowy.data.db.entities.GradePartialStatistics
import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
data class GradeStatisticsItem(
val type: ViewType,
- val partial: List,
+ val average: String,
+
+ val partial: GradePartialStatistics?,
+
+ val semester: GradeSemesterStatistics?,
val points: GradePointsStatistics?
)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
similarity index 93%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
index ff538969b..aea8632ac 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.appcreator
+package io.github.wulkanowy.data.repositories
import android.content.res.AssetManager
import com.squareup.moshi.Moshi
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
new file mode 100644
index 000000000..9a6528f39
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
@@ -0,0 +1,57 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.AttendanceDao
+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.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Absent
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AttendanceRepository @Inject constructor(
+ private val attendanceDb: AttendanceDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "attendance"
+
+ fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
+ query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getAttendance(start.monday, end.sunday, semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ attendanceDb.deleteAll(old uniqueSubtract new)
+ attendanceDb.insertAll(new uniqueSubtract old)
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
+ },
+ filterResult = { it.filter { item -> item.date in start..end } }
+ )
+
+ suspend fun excuseForAbsence(student: Student, semester: Semester, absenceList: List, reason: String? = null) {
+ 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)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
new file mode 100644
index 000000000..4edb507be
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AttendanceSummaryRepository @Inject constructor(
+ private val attendanceDb: AttendanceSummaryDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "attendance_summary"
+
+ fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+ query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getAttendanceSummary(subjectId)
+ .mapToEntities(semester, subjectId)
+ },
+ saveFetchResult = { old, new ->
+ attendanceDb.deleteAll(old uniqueSubtract new)
+ attendanceDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
new file mode 100644
index 000000000..59aabdd54
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
+import java.time.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsRepository @Inject constructor(
+ private val completedLessonsDb: CompletedLessonsDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "completed"
+
+ fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
+ query = { completedLessonsDb.loadAll(semester.studentId, semester.diaryId, start.monday, end.sunday) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getCompletedLessons(start.monday, end.sunday)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ completedLessonsDb.deleteAll(old uniqueSubtract new)
+ completedLessonsDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
+ },
+ filterResult = { it.filter { item -> item.date in start..end } }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
new file mode 100644
index 000000000..befcf9e6b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.ConferenceDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ConferenceRepository @Inject constructor(
+ private val conferenceDb: ConferenceDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "conference"
+
+ fun getConferences(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+ query = { conferenceDb.loadAll(semester.diaryId, student.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getConferences()
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ conferenceDb.deleteAll(old uniqueSubtract new)
+ conferenceDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
new file mode 100644
index 000000000..bd6e7d2d6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.ExamDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.endExamsDay
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.startExamsDay
+import io.github.wulkanowy.utils.uniqueSubtract
+import java.time.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ExamRepository @Inject constructor(
+ private val examDb: ExamDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "exam"
+
+ fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
+ query = { examDb.loadAll(semester.diaryId, semester.studentId, start.startExamsDay, start.endExamsDay) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ examDb.deleteAll(old uniqueSubtract new)
+ examDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
+ },
+ filterResult = { it.filter { item -> item.date in start..end } }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
similarity index 54%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
index 8cbbfdfb0..bab290f32 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
@@ -1,9 +1,16 @@
-package io.github.wulkanowy.data.repositories.grade
+package io.github.wulkanowy.data.repositories
+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.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
import io.github.wulkanowy.utils.networkBoundResource
import io.github.wulkanowy.utils.uniqueSubtract
import kotlinx.coroutines.flow.Flow
@@ -15,24 +22,40 @@ import javax.inject.Singleton
@Singleton
class GradeRepository @Inject constructor(
- private val local: GradeLocal,
- private val remote: GradeRemote
+ private val gradeDb: GradeDao,
+ private val gradeSummaryDb: GradeSummaryDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
) {
+ private val cacheKey = "grade"
+
fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
- shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh },
- query = { local.getGradesDetails(semester).combine(local.getGradesSummary(semester)) { details, summaries -> details to summaries } },
- fetch = { remote.getGrades(student, semester) },
- saveFetchResult = { old, new ->
- refreshGradeDetails(student, old.first, new.first, notify)
- refreshGradeSummaries(old.second, new.second, notify)
+ shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+ query = {
+ gradeDb.loadAll(semester.semesterId, semester.studentId).combine(gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)) { details, summaries ->
+ details to summaries
+ }
+ },
+ fetch = {
+ val (details, summary) = sdk.init(student)
+ .switchDiary(semester.diaryId, semester.schoolYear)
+ .getGrades(semester.semesterId)
+
+ details.mapToEntities(semester) to summary.mapToEntities(semester)
+ },
+ saveFetchResult = { (oldDetails, oldSummary), (newDetails, newSummary) ->
+ refreshGradeDetails(student, oldDetails, newDetails, notify)
+ refreshGradeSummaries(oldSummary, newSummary, notify)
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
}
)
private suspend fun refreshGradeDetails(student: Student, oldGrades: List, newDetails: List, notify: Boolean) {
val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
- local.deleteGrades(oldGrades uniqueSubtract newDetails)
- local.saveGrades((newDetails uniqueSubtract oldGrades).onEach {
+ gradeDb.deleteAll(oldGrades uniqueSubtract newDetails)
+ gradeDb.insertAll((newDetails uniqueSubtract oldGrades).onEach {
if (it.date >= notifyBreakDate) it.apply {
isRead = false
if (notify) isNotified = false
@@ -41,8 +64,8 @@ class GradeRepository @Inject constructor(
}
private suspend fun refreshGradeSummaries(oldSummaries: List, newSummary: List, notify: Boolean) {
- local.deleteGradesSummary(oldSummaries uniqueSubtract newSummary)
- local.saveGradesSummary((newSummary uniqueSubtract oldSummaries).onEach { summary ->
+ gradeSummaryDb.deleteAll(oldSummaries uniqueSubtract newSummary)
+ gradeSummaryDb.insertAll((newSummary uniqueSubtract oldSummaries).onEach { summary ->
val oldSummary = oldSummaries.find { oldSummary -> oldSummary.subject == summary.subject }
summary.isPredictedGradeNotified = when {
summary.predictedGrade.isEmpty() -> true
@@ -69,30 +92,30 @@ class GradeRepository @Inject constructor(
}
fun getUnreadGrades(semester: Semester): Flow> {
- return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }
+ return gradeDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { grade -> !grade.isRead } }
}
fun getNotNotifiedGrades(semester: Semester): Flow> {
- return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }
+ return gradeDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { grade -> !grade.isNotified } }
}
fun getNotNotifiedPredictedGrades(semester: Semester): Flow> {
- return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
+ return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
}
fun getNotNotifiedFinalGrades(semester: Semester): Flow> {
- return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
+ return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
}
suspend fun updateGrade(grade: Grade) {
- return local.updateGrades(listOf(grade))
+ return gradeDb.updateAll(listOf(grade))
}
suspend fun updateGrades(grades: List) {
- return local.updateGrades(grades)
+ return gradeDb.updateAll(grades)
}
suspend fun updateGradesSummary(gradesSummary: List) {
- return local.updateGradesSummary(gradesSummary)
+ return gradeSummaryDb.updateAll(gradesSummary)
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
new file mode 100644
index 000000000..ab65fb141
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
@@ -0,0 +1,144 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
+import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
+import io.github.wulkanowy.data.db.entities.GradePartialStatistics
+import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapPartialToStatisticItems
+import io.github.wulkanowy.data.mappers.mapPointsToStatisticsItems
+import io.github.wulkanowy.data.mappers.mapSemesterToStatisticItems
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsRepository @Inject constructor(
+ private val gradePartialStatisticsDb: GradePartialStatisticsDao,
+ private val gradePointsStatisticsDb: GradePointsStatisticsDao,
+ private val gradeSemesterStatisticsDb: GradeSemesterStatisticsDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val partialCacheKey = "grade_stats_partial"
+ private val semesterCacheKey = "grade_stats_semester"
+ private val pointsCacheKey = "grade_stats_points"
+
+ fun getGradesPartialStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(partialCacheKey, semester)) },
+ query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getGradesPartialStatistics(semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ gradePartialStatisticsDb.deleteAll(old uniqueSubtract new)
+ gradePartialStatisticsDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(partialCacheKey, semester))
+ },
+ mapResult = { items ->
+ when (subjectName) {
+ "Wszystkie" -> {
+ val numerator = items.map {
+ it.classAverage.replace(",", ".").toDoubleOrNull() ?: .0
+ }.filterNot { it == .0 }
+ (items.reversed() + GradePartialStatistics(
+ studentId = semester.studentId,
+ semesterId = semester.semesterId,
+ subject = subjectName,
+ classAverage = if (numerator.isEmpty()) "" else numerator.average().let {
+ "%.2f".format(Locale.FRANCE, it)
+ },
+ studentAverage = "",
+ classAmounts = items.map { it.classAmounts }.sumGradeAmounts(),
+ studentAmounts = items.map { it.studentAmounts }.sumGradeAmounts()
+ )).reversed()
+ }
+ else -> items.filter { it.subject == subjectName }
+ }.mapPartialToStatisticItems()
+ }
+ )
+
+ fun getGradesSemesterStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(semesterCacheKey, semester)) },
+ query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getGradesSemesterStatistics(semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ gradeSemesterStatisticsDb.deleteAll(old uniqueSubtract new)
+ gradeSemesterStatisticsDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(semesterCacheKey, semester))
+ },
+ mapResult = { items ->
+ val itemsWithAverage = items.map { item ->
+ item.copy().apply {
+ val denominator = item.amounts.sum()
+ average = if (denominator == 0) "" else (item.amounts.mapIndexed { gradeValue, amount ->
+ (gradeValue + 1) * amount
+ }.sum().toDouble() / denominator).let {
+ "%.2f".format(Locale.FRANCE, it)
+ }
+ }
+ }
+ when (subjectName) {
+ "Wszystkie" -> (itemsWithAverage.reversed() + GradeSemesterStatistics(
+ studentId = semester.studentId,
+ semesterId = semester.semesterId,
+ subject = subjectName,
+ amounts = itemsWithAverage.map { it.amounts }.sumGradeAmounts(),
+ studentGrade = 0
+ ).apply {
+ average = itemsWithAverage.mapNotNull { it.average.replace(",", ".").toDoubleOrNull() }.average().let {
+ "%.2f".format(Locale.FRANCE, it)
+ }
+ }).reversed()
+ else -> itemsWithAverage.filter { it.subject == subjectName }
+ }.mapSemesterToStatisticItems()
+ }
+ )
+
+ fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(pointsCacheKey, semester)) },
+ query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getGradesPointsStatistics(semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ gradePointsStatisticsDb.deleteAll(old uniqueSubtract new)
+ gradePointsStatisticsDb.insertAll(new uniqueSubtract old)
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(pointsCacheKey, semester))
+ },
+ mapResult = { items ->
+ when (subjectName) {
+ "Wszystkie" -> items
+ else -> items.filter { it.subject == subjectName }
+ }.mapPointsToStatisticsItems()
+ }
+ )
+
+ private fun List>.sumGradeAmounts(): List {
+ val result = mutableListOf(0, 0, 0, 0, 0, 0)
+ forEach {
+ it.forEachIndexed { grade, amount ->
+ result[grade] += amount
+ }
+ }
+ return result
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
new file mode 100644
index 000000000..7625dbbc8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
@@ -0,0 +1,50 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.HomeworkDao
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
+import java.time.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeworkRepository @Inject constructor(
+ private val homeworkDb: HomeworkDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "homework"
+
+ fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
+ query = { homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getHomework(start.monday, end.sunday)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ homeworkDb.deleteAll(old uniqueSubtract new)
+ homeworkDb.insertAll(new uniqueSubtract old)
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
+ }
+ )
+
+ suspend fun toggleDone(homework: Homework) {
+ homeworkDb.updateAll(listOf(homework.apply {
+ isDone = !isDone
+ }))
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/LoggerRepository.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/LoggerRepository.kt
index 85168fee5..6d509b026 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/LoggerRepository.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.logger
+package io.github.wulkanowy.data.repositories
import android.content.Context
import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
new file mode 100644
index 000000000..801292b42
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import java.time.LocalDate.now
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberRepository @Inject constructor(
+ private val luckyNumberDb: LuckyNumberDao,
+ private val sdk: Sdk
+) {
+
+ fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+ shouldFetch = { it == null || forceRefresh },
+ query = { luckyNumberDb.load(student.studentId, now()) },
+ fetch = { sdk.init(student).getLuckyNumber(student.schoolShortName)?.mapToEntity(student) },
+ saveFetchResult = { old, new ->
+ if (new != old) {
+ old?.let { luckyNumberDb.deleteAll(listOfNotNull(it)) }
+ luckyNumberDb.insertAll(listOfNotNull((new?.apply {
+ if (notify) isNotified = false
+ })))
+ }
+ }
+ )
+
+ suspend fun getNotNotifiedLuckyNumber(student: Student) = luckyNumberDb.load(student.studentId, now()).map {
+ if (it?.isNotified == false) it else null
+ }.first()
+
+ suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) = luckyNumberDb.updateAll(listOfNotNull(luckyNumber))
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
new file mode 100644
index 000000000..ea7b2b0e0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -0,0 +1,102 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
+import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.mappers.mapFromEntities
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Folder
+import io.github.wulkanowy.sdk.pojo.SentMessage
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
+import java.time.LocalDateTime.now
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageRepository @Inject constructor(
+ private val messagesDb: MessagesDao,
+ private val messageAttachmentDao: MessageAttachmentDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "message"
+
+ @Suppress("UNUSED_PARAMETER")
+ fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student, folder)) },
+ query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
+ fetch = { sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).mapToEntities(student) },
+ saveFetchResult = { old, new ->
+ messagesDb.deleteAll(old uniqueSubtract new)
+ messagesDb.insertAll((new uniqueSubtract old).onEach {
+ it.isNotified = !notify
+ })
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
+ }
+ )
+
+ fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
+ shouldFetch = {
+ checkNotNull(it, { "This message no longer exist!" })
+ Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
+ it.message.unread || it.message.content.isEmpty()
+ },
+ query = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) },
+ fetch = {
+ sdk.init(student).getMessageDetails(it!!.message.messageId, message.folderId, markAsRead, message.realId).let { details ->
+ details.content to details.attachments.mapToEntities()
+ }
+ },
+ saveFetchResult = { old, (downloadedMessage, attachments) ->
+ checkNotNull(old, { "Fetched message no longer exist!" })
+ messagesDb.updateAll(listOf(old.message.copy(unread = !markAsRead).apply {
+ id = old.message.id
+ content = content.ifBlank { downloadedMessage }
+ }))
+ messageAttachmentDao.insertAttachments(attachments)
+ Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
+ }
+ )
+
+ fun getNotNotifiedMessages(student: Student): Flow> {
+ return messagesDb.loadAll(student.id.toInt(), RECEIVED.id).map { it.filter { message -> !message.isNotified && message.unread } }
+ }
+
+ suspend fun updateMessages(messages: List) {
+ return messagesDb.updateAll(messages)
+ }
+
+ suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List): SentMessage {
+ return sdk.init(student).sendMessage(
+ subject = subject,
+ content = content,
+ recipients = recipients.mapFromEntities()
+ )
+ }
+
+ suspend fun deleteMessage(student: Student, message: Message) {
+ val isDeleted = sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
+
+ if (message.folderId != MessageFolder.TRASHED.id) {
+ if (isDeleted) messagesDb.updateAll(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
+ id = message.id
+ content = message.content
+ }))
+ } else messagesDb.deleteAll(listOf(message))
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
new file mode 100644
index 000000000..7e83ef7d5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
@@ -0,0 +1,56 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.MobileDeviceDao
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.mappers.mapToMobileDeviceToken
+import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobileDeviceRepository @Inject constructor(
+ private val mobileDb: MobileDeviceDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "devices"
+
+ fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student)) },
+ query = { mobileDb.loadAll(student.userLoginId.takeIf { it != 0 } ?: student.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getRegisteredDevices()
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ mobileDb.deleteAll(old uniqueSubtract new)
+ mobileDb.insertAll(new uniqueSubtract old)
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
+ }
+ )
+
+ suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .unregisterDevice(device.deviceId)
+
+ mobileDb.deleteAll(listOf(device))
+ }
+
+ suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
+ return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getToken()
+ .mapToMobileDeviceToken()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
new file mode 100644
index 000000000..85789f098
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.NoteDao
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteRepository @Inject constructor(
+ private val noteDb: NoteDao,
+ private val sdk: Sdk,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "note"
+
+ fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+ query = { noteDb.loadAll(student.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getNotes(semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ noteDb.deleteAll(old uniqueSubtract new)
+ noteDb.insertAll((new uniqueSubtract old).onEach {
+ if (it.date >= student.registrationDate.toLocalDate()) it.apply {
+ isRead = false
+ if (notify) isNotified = false
+ }
+ })
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
+ }
+ )
+
+ fun getNotNotifiedNotes(student: Student): Flow> {
+ return noteDb.loadAll(student.studentId).map { it.filter { note -> !note.isNotified } }
+ }
+
+ suspend fun updateNote(note: Note) {
+ noteDb.updateAll(listOf(note))
+ }
+
+ suspend fun updateNotes(notes: List) {
+ noteDb.updateAll(notes)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
similarity index 98%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index da31751a1..8cb815cc3 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.repositories.preferences
+package io.github.wulkanowy.data.repositories
import android.content.Context
import android.content.SharedPreferences
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
new file mode 100644
index 000000000..24ab5f0c9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.RecipientDao
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecipientRepository @Inject constructor(
+ private val recipientDb: RecipientDao,
+ private val sdk: Sdk
+) {
+
+ suspend fun refreshRecipients(student: Student, unit: ReportingUnit, role: Int) {
+ val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.senderId)
+ val old = recipientDb.loadAll(unit.senderId, unit.unitId, role)
+
+ recipientDb.deleteAll(old uniqueSubtract new)
+ recipientDb.insertAll(new uniqueSubtract old)
+ }
+
+ suspend fun getRecipients(student: Student, unit: ReportingUnit, role: Int): List {
+ return recipientDb.loadAll(unit.senderId, unit.unitId, role).ifEmpty {
+ refreshRecipients(student, unit, role)
+
+ recipientDb.loadAll(unit.senderId, unit.unitId, role)
+ }
+ }
+
+ suspend fun getMessageRecipients(student: Student, message: Message): List {
+ return sdk.init(student).getMessageRecipients(message.messageId, message.senderId).mapToEntities(student.userLoginId)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
similarity index 79%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
index 11eac71e0..5e1063558 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
@@ -1,11 +1,11 @@
-package io.github.wulkanowy.data.repositories.recover
+package io.github.wulkanowy.data.repositories
import io.github.wulkanowy.sdk.Sdk
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
-class RecoverRemote @Inject constructor(private val sdk: Sdk) {
+class RecoverRepository @Inject constructor(private val sdk: Sdk) {
suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair {
return sdk.getPasswordResetCaptchaCode(host, symbol)
@@ -15,4 +15,3 @@ class RecoverRemote @Inject constructor(private val sdk: Sdk) {
return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
}
}
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
new file mode 100644
index 000000000..792e66b5e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.ReportingUnitDao
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitRepository @Inject constructor(
+ private val reportingUnitDb: ReportingUnitDao,
+ private val sdk: Sdk
+) {
+
+ suspend fun refreshReportingUnits(student: Student) {
+ val new = sdk.init(student).getReportingUnits().mapToEntities(student)
+ val old = reportingUnitDb.load(student.studentId)
+
+ reportingUnitDb.deleteAll(old.uniqueSubtract(new))
+ reportingUnitDb.insertAll(new.uniqueSubtract(old))
+ }
+
+ suspend fun getReportingUnits(student: Student): List {
+ return reportingUnitDb.load(student.studentId).ifEmpty {
+ refreshReportingUnits(student)
+
+ reportingUnitDb.load(student.studentId)
+ }
+ }
+
+ suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
+ return reportingUnitDb.loadOne(student.studentId, unitId) ?: run {
+ refreshReportingUnits(student)
+
+ return reportingUnitDb.loadOne(student.studentId, unitId)
+ }
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
new file mode 100644
index 000000000..6b22b32c3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.SchoolDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SchoolRepository @Inject constructor(
+ private val schoolDb: SchoolDao,
+ private val sdk: Sdk
+) {
+
+ fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) =
+ networkBoundResource(
+ shouldFetch = { it == null || forceRefresh },
+ query = { schoolDb.load(semester.studentId, semester.classId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).getSchool()
+ .mapToEntity(semester)
+ },
+ saveFetchResult = { old, new ->
+ if (old != null && new != old) {
+ with(schoolDb) {
+ deleteAll(listOf(old))
+ insertAll(listOf(new))
+ }
+ } else if (old == null) {
+ schoolDb.insertAll(listOf(new))
+ }
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
similarity index 73%
rename from app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
index 2748f1df5..8942391c8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
@@ -1,10 +1,13 @@
-package io.github.wulkanowy.data.repositories.semester
+package io.github.wulkanowy.data.repositories
+import io.github.wulkanowy.data.db.dao.SemesterDao
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
import io.github.wulkanowy.sdk.Sdk
import io.github.wulkanowy.utils.DispatchersProvider
import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.init
import io.github.wulkanowy.utils.isCurrent
import io.github.wulkanowy.utils.uniqueSubtract
import kotlinx.coroutines.withContext
@@ -14,17 +17,17 @@ import javax.inject.Singleton
@Singleton
class SemesterRepository @Inject constructor(
- private val remote: SemesterRemote,
- private val local: SemesterLocal,
+ private val semesterDb: SemesterDao,
+ private val sdk: Sdk,
private val dispatchers: DispatchersProvider
) {
suspend fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false) = withContext(dispatchers.backgroundThread) {
- val semesters = local.getSemesters(student)
+ val semesters = semesterDb.loadAll(student.studentId, student.classId)
if (isShouldFetch(student, semesters, forceRefresh, refreshOnNoCurrent)) {
refreshSemesters(student)
- local.getSemesters(student)
+ semesterDb.loadAll(student.studentId, student.classId)
} else semesters
}
@@ -41,12 +44,12 @@ class SemesterRepository @Inject constructor(
}
private suspend fun refreshSemesters(student: Student) {
- val new = remote.getSemesters(student)
+ val new = sdk.init(student).getSemesters().mapToEntities(student.studentId)
if (new.isEmpty()) return Timber.i("Empty semester list!")
- val old = local.getSemesters(student)
- local.deleteSemesters(old.uniqueSubtract(new))
- local.saveSemesters(new.uniqueSubtract(old))
+ val old = semesterDb.loadAll(student.studentId, student.classId)
+ semesterDb.deleteAll(old.uniqueSubtract(new))
+ semesterDb.insertSemesters(new.uniqueSubtract(old))
}
suspend fun getCurrentSemester(student: Student, forceRefresh: Boolean = false) = withContext(dispatchers.backgroundThread) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
new file mode 100644
index 000000000..e3deb447f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.StudentInfoDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudentInfoRepository @Inject constructor(
+ private val studentInfoDao: StudentInfoDao,
+ private val sdk: Sdk
+) {
+
+ fun getStudentInfo(student: Student, semester: Semester, forceRefresh: Boolean) =
+ networkBoundResource(
+ shouldFetch = { it == null || forceRefresh },
+ query = { studentInfoDao.loadStudentInfo(student.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getStudentInfo().mapToEntity(semester)
+ },
+ saveFetchResult = { old, new ->
+ if (old != null && new != old) {
+ with(studentInfoDao) {
+ deleteAll(listOf(old))
+ insertAll(listOf(new))
+ }
+ } else if (old == null) {
+ studentInfoDao.insertAll(listOf(new))
+ }
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
new file mode 100644
index 000000000..558214799
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -0,0 +1,107 @@
+package io.github.wulkanowy.data.repositories
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.db.dao.SemesterDao
+import io.github.wulkanowy.data.db.dao.StudentDao
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentNick
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.security.decrypt
+import io.github.wulkanowy.utils.security.encrypt
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudentRepository @Inject constructor(
+ @ApplicationContext private val context: Context,
+ private val dispatchers: DispatchersProvider,
+ private val studentDb: StudentDao,
+ private val semesterDb: SemesterDao,
+ private val sdk: Sdk
+) {
+
+ suspend fun isStudentSaved() = getSavedStudents(false).isNotEmpty()
+
+ suspend fun isCurrentStudentSet() = studentDb.loadCurrent()?.isCurrent ?: false
+
+ suspend fun getStudentsApi(
+ pin: String,
+ symbol: String,
+ token: String
+ ): List =
+ sdk.getStudentsFromMobileApi(token, pin, symbol, "").mapToEntities()
+
+ suspend fun getStudentsScrapper(
+ email: String,
+ password: String,
+ scrapperBaseUrl: String,
+ symbol: String
+ ): List =
+ sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol)
+ .mapToEntities(password)
+
+ suspend fun getStudentsHybrid(
+ email: String,
+ password: String,
+ scrapperBaseUrl: String,
+ symbol: String
+ ): List =
+ sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).mapToEntities(password)
+
+ suspend fun getSavedStudents(decryptPass: Boolean = true) =
+ withContext(dispatchers.backgroundThread) {
+ studentDb.loadStudentsWithSemesters().map {
+ it.apply {
+ if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+ student.password = decrypt(student.password)
+ }
+ }
+ }
+ }
+
+ suspend fun getStudentById(id: Int) = withContext(dispatchers.backgroundThread) {
+ studentDb.loadById(id)?.apply {
+ if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) {
+ password = decrypt(password)
+ }
+ }
+ } ?: throw NoCurrentStudentException()
+
+ suspend fun getCurrentStudent(decryptPass: Boolean = true) =
+ withContext(dispatchers.backgroundThread) {
+ studentDb.loadCurrent()?.apply {
+ if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) {
+ password = decrypt(password)
+ }
+ }
+ } ?: throw NoCurrentStudentException()
+
+ suspend fun saveStudents(studentsWithSemesters: List): List {
+ semesterDb.insertSemesters(studentsWithSemesters.flatMap { it.semesters })
+
+ return withContext(dispatchers.backgroundThread) {
+ studentDb.insertAll(studentsWithSemesters.map { it.student }.map {
+ if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) {
+ it.copy(password = encrypt(it.password, context))
+ } else it
+ })
+ }
+ }
+
+ suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
+ with(studentDb) {
+ resetCurrent()
+ updateCurrent(studentWithSemesters.student.id)
+ }
+ }
+
+ suspend fun logoutStudent(student: Student) = studentDb.delete(student)
+
+ suspend fun updateStudentNick(studentNick: StudentNick) = studentDb.update(studentNick)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
new file mode 100644
index 000000000..ef07a1d47
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.SubjectDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SubjectRepository @Inject constructor(
+ private val subjectDao: SubjectDao,
+ private val sdk: Sdk
+) {
+
+ fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh },
+ query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getSubjects().mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ subjectDao.deleteAll(old uniqueSubtract new)
+ subjectDao.insertAll(new uniqueSubtract old)
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
new file mode 100644
index 000000000..25da718ca
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.TeacherDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRepository @Inject constructor(
+ private val teacherDb: TeacherDao,
+ private val sdk: Sdk
+) {
+
+ fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+ shouldFetch = { it.isEmpty() || forceRefresh },
+ query = { teacherDb.loadAll(semester.studentId, semester.classId) },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getTeachers(semester.semesterId)
+ .mapToEntities(semester)
+ },
+ saveFetchResult = { old, new ->
+ teacherDb.deleteAll(old uniqueSubtract new)
+ teacherDb.insertAll(new uniqueSubtract old)
+ }
+ )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
new file mode 100644
index 000000000..fa1898f5b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
@@ -0,0 +1,84 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
+import io.github.wulkanowy.data.db.dao.TimetableDao
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import java.time.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TimetableRepository @Inject constructor(
+ private val timetableDb: TimetableDao,
+ private val timetableAdditionalDb: TimetableAdditionalDao,
+ private val sdk: Sdk,
+ private val schedulerHelper: TimetableNotificationSchedulerHelper,
+ private val refreshHelper: AutoRefreshHelper,
+) {
+
+ private val cacheKey = "timetable"
+
+ fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean, refreshAdditional: Boolean = false) = networkBoundResource(
+ shouldFetch = { (timetable, additional) -> timetable.isEmpty() || (additional.isEmpty() && refreshAdditional) || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
+ query = {
+ timetableDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
+ .map { schedulerHelper.scheduleNotifications(it, student); it }
+ .combine(timetableAdditionalDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)) { timetable, additional ->
+ timetable to additional
+ }
+ },
+ fetch = {
+ sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+ .getTimetable(start.monday, end.sunday)
+ .let { (normal, additional) -> normal.mapToEntities(semester) to additional.mapToEntities(semester) }
+
+ },
+ saveFetchResult = { (oldTimetable, oldAdditional), (newTimetable, newAdditional) ->
+ refreshTimetable(student, oldTimetable, newTimetable)
+ refreshAdditional(oldAdditional, newAdditional)
+
+ refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
+ },
+ filterResult = { (timetable, additional) ->
+ timetable.filter { item ->
+ item.date in start..end
+ } to additional.filter { item ->
+ item.date in start..end
+ }
+ }
+ )
+
+ private suspend fun refreshTimetable(student: Student, old: List, new: List) {
+ timetableDb.deleteAll(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
+ timetableDb.insertAll(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
+ item.also { new ->
+ old.singleOrNull { new.start == it.start }?.let { old ->
+ return@map new.copy(
+ room = if (new.room.isEmpty()) old.room else new.room,
+ teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
+ )
+ }
+ }
+ })
+ }
+
+ private suspend fun refreshAdditional(old: List, new: List) {
+ timetableAdditionalDb.deleteAll(old.uniqueSubtract(new))
+ timetableAdditionalDb.insertAll(new.uniqueSubtract(old))
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
deleted file mode 100644
index 9aaa52304..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.attendance
-
-import io.github.wulkanowy.data.db.dao.AttendanceDao
-import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
-
- suspend fun saveAttendance(attendance: List) {
- attendanceDb.insertAll(attendance)
- }
-
- suspend fun deleteAttendance(attendance: List) {
- attendanceDb.deleteAll(attendance)
- }
-
- fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow> {
- return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
deleted file mode 100644
index 870690ec0..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-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 java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getAttendance(startDate, endDate, semester.semesterId)
- .map {
- Attendance(
- studentId = semester.studentId,
- diaryId = semester.diaryId,
- date = it.date,
- timeId = it.timeId,
- number = it.number,
- subject = it.subject,
- name = it.name,
- presence = it.presence,
- absence = it.absence,
- exemption = it.exemption,
- lateness = it.lateness,
- excused = it.excused,
- deleted = it.deleted,
- excusable = it.excusable,
- excuseStatus = it.excuseStatus?.name
- )
- }
- }
-
- suspend fun excuseAbsence(student: Student, semester: Semester, absenceList: List, reason: String?): 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)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
deleted file mode 100644
index 60f864f27..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-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.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceRepository @Inject constructor(
- private val local: AttendanceLocal,
- private val remote: AttendanceRemote
-) {
-
- fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getAttendance(semester, start.monday, end.sunday) },
- fetch = { remote.getAttendance(student, semester, start.monday, end.sunday) },
- saveFetchResult = { old, new ->
- local.deleteAttendance(old uniqueSubtract new)
- local.saveAttendance(new uniqueSubtract old)
- },
- filterResult = { it.filter { item -> item.date in start..end } }
- )
-
- suspend fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List, reason: String? = null) {
- remote.excuseAbsence(student, semester, attendanceList, reason)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
deleted file mode 100644
index 703bc9474..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.attendancesummary
-
-import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
-
- suspend fun saveAttendanceSummary(attendance: List) {
- attendanceDb.insertAll(attendance)
- }
-
- suspend fun deleteAttendanceSummary(attendance: List) {
- attendanceDb.deleteAll(attendance)
- }
-
- fun getAttendanceSummary(semester: Semester, subjectId: Int): Flow> {
- return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
deleted file mode 100644
index 29a0b9a7b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-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 javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getAttendanceSummary(subjectId)
- .map {
- AttendanceSummary(
- studentId = semester.studentId,
- diaryId = semester.diaryId,
- subjectId = subjectId,
- month = it.month,
- presence = it.presence,
- absence = it.absence,
- absenceExcused = it.absenceExcused,
- absenceForSchoolReasons = it.absenceForSchoolReasons,
- lateness = it.lateness,
- latenessExcused = it.latenessExcused,
- exemption = it.exemption
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
deleted file mode 100644
index 5dbe1ab05..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.attendancesummary
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceSummaryRepository @Inject constructor(
- private val local: AttendanceSummaryLocal,
- private val remote: AttendanceSummaryRemote
-) {
-
- fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getAttendanceSummary(semester, subjectId) },
- fetch = { remote.getAttendanceSummary(student, semester, subjectId) },
- saveFetchResult = { old, new ->
- local.deleteAttendanceSummary(old uniqueSubtract new)
- local.saveAttendanceSummary(new uniqueSubtract old)
- }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
deleted file mode 100644
index 51a1bdbfc..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.completedlessons
-
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
-
- suspend fun saveCompletedLessons(completedLessons: List) {
- completedLessonsDb.insertAll(completedLessons)
- }
-
- suspend fun deleteCompleteLessons(completedLessons: List) {
- completedLessonsDb.deleteAll(completedLessons)
- }
-
- fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Flow> {
- return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
deleted file mode 100644
index d15a27623..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-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 java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getCompletedLessons(startDate, endDate)
- .map {
- it.absence
- CompletedLesson(
- studentId = semester.studentId,
- diaryId = semester.diaryId,
- date = it.date,
- number = it.number,
- subject = it.subject,
- topic = it.topic,
- teacher = it.teacher,
- teacherSymbol = it.teacherSymbol,
- substitution = it.substitution,
- absence = it.absence,
- resources = it.resources
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
deleted file mode 100644
index 61268a66a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.completedlessons
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class CompletedLessonsRepository @Inject constructor(
- private val local: CompletedLessonsLocal,
- private val remote: CompletedLessonsRemote
-) {
-
- fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getCompletedLessons(semester, start.monday, end.sunday) },
- fetch = { remote.getCompletedLessons(student, semester, start.monday, end.sunday) },
- saveFetchResult = { old, new ->
- local.deleteCompleteLessons(old uniqueSubtract new)
- local.saveCompletedLessons(new uniqueSubtract old)
- },
- filterResult = { it.filter { item -> item.date in start..end } }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
deleted file mode 100644
index acc55b5ec..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.exam
-
-import io.github.wulkanowy.data.db.dao.ExamDao
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ExamLocal @Inject constructor(private val examDb: ExamDao) {
-
- fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow> {
- return examDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
- }
-
- suspend fun saveExams(exams: List) {
- examDb.insertAll(exams)
- }
-
- suspend fun deleteExams(exams: List) {
- examDb.deleteAll(exams)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
deleted file mode 100644
index ac4aa93d7..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-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 java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ExamRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getExams(startDate, endDate, semester.semesterId)
- .map {
- Exam(
- studentId = semester.studentId,
- diaryId = semester.diaryId,
- date = it.date,
- entryDate = it.entryDate,
- subject = it.subject,
- group = it.group,
- type = it.type,
- description = it.description,
- teacher = it.teacher,
- teacherSymbol = it.teacherSymbol
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
deleted file mode 100644
index 3f4591a25..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.exam
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.endExamsDay
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.startExamsDay
-import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ExamRepository @Inject constructor(
- private val local: ExamLocal,
- private val remote: ExamRemote
-) {
-
- fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getExams(semester, start.startExamsDay, start.endExamsDay) },
- fetch = { remote.getExams(student, semester, start.startExamsDay, start.endExamsDay) },
- saveFetchResult = { old, new ->
- local.deleteExams(old uniqueSubtract new)
- local.saveExams(new uniqueSubtract old)
- },
- filterResult = { it.filter { item -> item.date in start..end } }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
deleted file mode 100644
index ed3635423..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-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 kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeLocal @Inject constructor(
- private val gradeDb: GradeDao,
- private val gradeSummaryDb: GradeSummaryDao
-) {
-
- suspend fun saveGrades(grades: List) {
- gradeDb.insertAll(grades)
- }
-
- suspend fun deleteGrades(grades: List) {
- gradeDb.deleteAll(grades)
- }
-
- suspend fun updateGrades(grades: List) {
- gradeDb.updateAll(grades)
- }
-
- suspend fun updateGradesSummary(gradesSummary: List) {
- gradeSummaryDb.updateAll(gradesSummary)
- }
-
- fun getGradesDetails(semester: Semester): Flow> {
- return gradeDb.loadAll(semester.semesterId, semester.studentId)
- }
-
- suspend fun saveGradesSummary(gradesSummary: List) {
- gradeSummaryDb.insertAll(gradesSummary)
- }
-
- suspend fun deleteGradesSummary(gradesSummary: List) {
- gradeSummaryDb.deleteAll(gradesSummary)
- }
-
- fun getGradesSummary(semester: Semester): Flow> {
- return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
deleted file mode 100644
index 9534a8910..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-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 javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getGrades(student: Student, semester: Semester): Pair, List> {
- val (details, summary) = sdk
- .init(student)
- .switchDiary(semester.diaryId, semester.schoolYear)
- .getGrades(semester.semesterId)
-
- return details.map {
- Grade(
- studentId = semester.studentId,
- semesterId = semester.semesterId,
- subject = it.subject,
- entry = it.entry,
- value = it.value,
- modifier = it.modifier,
- comment = it.comment,
- color = it.color,
- gradeSymbol = it.symbol,
- description = it.description,
- weight = it.weight,
- weightValue = it.weightValue,
- 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
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
deleted file mode 100644
index e0e2cd4db..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
-
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeStatisticsLocal @Inject constructor(
- private val gradeStatisticsDb: GradeStatisticsDao,
- private val gradePointsStatisticsDb: GradePointsStatisticsDao
-) {
-
- fun getGradesStatistics(semester: Semester, isSemester: Boolean): Flow> {
- return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
- }
-
- fun getGradesPointsStatistics(semester: Semester): Flow> {
- return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
- }
-
- suspend fun saveGradesStatistics(gradesStatistics: List) {
- gradeStatisticsDb.insertAll(gradesStatistics)
- }
-
- suspend fun saveGradesPointsStatistics(gradePointsStatistics: List) {
- gradePointsStatisticsDb.insertAll(gradePointsStatistics)
- }
-
- suspend fun deleteGradesStatistics(gradesStatistics: List) {
- gradeStatisticsDb.deleteAll(gradesStatistics)
- }
-
- suspend fun deleteGradesPointsStatistics(gradesPointsStatistics: List) {
- gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
deleted file mode 100644
index 1ff8132fc..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
-
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
- if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
- else it.getGradesPartialStatistics(semester.semesterId)
- }.map {
- GradeStatistics(
- semesterId = semester.semesterId,
- studentId = semester.studentId,
- subject = it.subject,
- grade = it.gradeValue,
- amount = it.amount,
- semester = isSemester
- )
- }
- }
-
- suspend fun getGradePointsStatistics(student: Student, semester: Semester): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getGradesPointsStatistics(semester.semesterId)
- .map {
- GradePointsStatistics(
- semesterId = semester.semesterId,
- studentId = semester.studentId,
- subject = it.subject,
- others = it.others,
- student = it.student
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
deleted file mode 100644
index 52ca705f7..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradestatistics
-
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeStatisticsRepository @Inject constructor(
- private val local: GradeStatisticsLocal,
- private val remote: GradeStatisticsRemote
-) {
-
- fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getGradesStatistics(semester, isSemester) },
- fetch = { remote.getGradeStatistics(student, semester, isSemester) },
- saveFetchResult = { old, new ->
- local.deleteGradesStatistics(old uniqueSubtract new)
- local.saveGradesStatistics(new uniqueSubtract old)
- },
- mapResult = { items ->
- when (subjectName) {
- "Wszystkie" -> items.groupBy { it.grade }.map {
- GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
- it.value.fold(0) { acc, e -> acc + e.amount }, false)
- } + items
- else -> items.filter { it.subject == subjectName }
- }.mapToStatisticItems()
- }
- )
-
- fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getGradesPointsStatistics(semester) },
- fetch = { remote.getGradePointsStatistics(student, semester) },
- saveFetchResult = { old, new ->
- local.deleteGradesPointsStatistics(old uniqueSubtract new)
- local.saveGradesPointsStatistics(new uniqueSubtract old)
- },
- mapResult = { items ->
- when (subjectName) {
- "Wszystkie" -> items
- else -> items.filter { it.subject == subjectName }
- }.mapToStatisticsItem()
- }
- )
-
- private fun List.mapToStatisticItems() = groupBy { it.subject }.map {
- GradeStatisticsItem(
- type = ViewType.PARTIAL,
- partial = it.value
- .sortedByDescending { item -> item.grade }
- .filter { item -> item.amount != 0 },
- points = null
- )
- }
-
- private fun List.mapToStatisticsItem() = map {
- GradeStatisticsItem(
- type = ViewType.POINTS,
- partial = emptyList(),
- points = it
- )
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
deleted file mode 100644
index f2cbb8031..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.homework
-
-import io.github.wulkanowy.data.db.dao.HomeworkDao
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
-
- suspend fun saveHomework(homework: List) {
- homeworkDb.insertAll(homework)
- }
-
- suspend fun deleteHomework(homework: List) {
- homeworkDb.deleteAll(homework)
- }
-
- suspend fun updateHomework(homework: List) {
- homeworkDb.updateAll(homework)
- }
-
- fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow> {
- return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
deleted file mode 100644
index 32109877a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.data.repositories.homework
-
-import io.github.wulkanowy.data.db.entities.Homework
-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 java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getHomework(startDate, endDate)
- .map {
- Homework(
- semesterId = semester.semesterId,
- studentId = semester.studentId,
- date = it.date,
- entryDate = it.entryDate,
- subject = it.subject,
- content = it.content,
- teacher = it.teacher,
- teacherSymbol = it.teacherSymbol,
- attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
deleted file mode 100644
index 54397ea02..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.github.wulkanowy.data.repositories.homework
-
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeworkRepository @Inject constructor(
- private val local: HomeworkLocal,
- private val remote: HomeworkRemote
-) {
-
- fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getHomework(semester, start.monday, end.sunday) },
- fetch = { remote.getHomework(student, semester, start.monday, end.sunday) },
- saveFetchResult = { old, new ->
- local.deleteHomework(old uniqueSubtract new)
- local.saveHomework(new uniqueSubtract old)
- }
- )
-
- suspend fun toggleDone(homework: Homework) {
- local.updateHomework(listOf(homework.apply {
- isDone = !isDone
- }))
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
deleted file mode 100644
index 0c3156d1e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.luckynumber
-
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
-
- suspend fun saveLuckyNumber(luckyNumber: LuckyNumber?) {
- luckyNumberDb.insertAll(listOfNotNull(luckyNumber))
- }
-
- suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) {
- luckyNumberDb.updateAll(listOfNotNull(luckyNumber))
- }
-
- suspend fun deleteLuckyNumber(luckyNumber: LuckyNumber?) {
- luckyNumberDb.deleteAll(listOfNotNull(luckyNumber))
- }
-
- fun getLuckyNumber(student: Student, date: LocalDate): Flow {
- return luckyNumberDb.load(student.studentId, date)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
deleted file mode 100644
index 2872957d0..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.repositories.luckynumber
-
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getLuckyNumber(student: Student): LuckyNumber? {
- return sdk.init(student).getLuckyNumber(student.schoolShortName)?.let {
- LuckyNumber(
- studentId = student.studentId,
- date = LocalDate.now(),
- luckyNumber = it
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
deleted file mode 100644
index 173ce7e45..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.repositories.luckynumber
-
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import java.time.LocalDate.now
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LuckyNumberRepository @Inject constructor(
- private val local: LuckyNumberLocal,
- private val remote: LuckyNumberRemote
-) {
-
- fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
- shouldFetch = { it == null || forceRefresh },
- query = { local.getLuckyNumber(student, now()) },
- fetch = { remote.getLuckyNumber(student) },
- saveFetchResult = { old, new ->
- if (new != old) {
- old?.let { local.deleteLuckyNumber(it) }
- local.saveLuckyNumber(new?.apply {
- if (notify) isNotified = false
- })
- }
- }
- )
-
- suspend fun getNotNotifiedLuckyNumber(student: Student) =
- local.getLuckyNumber(student, now()).map { if (it?.isNotified == false) it else null }.first()
-
- suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) = local.updateLuckyNumber(luckyNumber)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
deleted file mode 100644
index f1c8eaf08..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.data.repositories.message
-
-import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
-import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessageLocal @Inject constructor(
- private val messagesDb: MessagesDao,
- private val messageAttachmentDao: MessageAttachmentDao
-) {
-
- suspend fun saveMessages(messages: List) {
- messagesDb.insertAll(messages)
- }
-
- suspend fun updateMessages(messages: List) {
- messagesDb.updateAll(messages)
- }
-
- suspend fun deleteMessages(messages: List) {
- messagesDb.deleteAll(messages)
- }
-
- fun getMessageWithAttachment(student: Student, message: Message): Flow {
- return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
- }
-
- suspend fun saveMessageAttachments(attachments: List) {
- messageAttachmentDao.insertAttachments(attachments)
- }
-
- fun getMessages(student: Student, folder: MessageFolder): Flow> {
- return messagesDb.loadAll(student.id.toInt(), folder.id)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
deleted file mode 100644
index 044a13a28..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.github.wulkanowy.data.repositories.message
-
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.Recipient
-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.Folder
-import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.init
-import java.time.LocalDateTime.now
-import javax.inject.Inject
-import javax.inject.Singleton
-import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
-
-@Singleton
-class MessageRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getMessages(student: Student, semester: Semester, folder: MessageFolder): List {
- return sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).map {
- Message(
- studentId = student.id.toInt(),
- realId = it.id ?: 0,
- messageId = it.messageId ?: 0,
- sender = it.sender?.name.orEmpty(),
- senderId = it.sender?.loginId ?: 0,
- recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
- subject = it.subject.trim(),
- date = it.date ?: now(),
- folderId = it.folderId,
- unread = it.unread ?: false,
- removed = it.removed,
- hasAttachments = it.hasAttachments
- ).apply {
- content = it.content.orEmpty()
- unreadBy = it.unreadBy ?: 0
- readBy = it.readBy ?: 0
- }
- }
- }
-
- suspend fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Pair> {
- return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).let { details ->
- details.content to details.attachments.map {
- MessageAttachment(
- realId = it.id,
- messageId = it.messageId,
- oneDriveId = it.oneDriveId,
- url = it.url,
- filename = it.filename
- )
- }
- }
- }
-
- suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List): SentMessage {
- return sdk.init(student).sendMessage(
- subject = subject,
- content = content,
- recipients = recipients.map {
- SdkRecipient(
- id = it.realId,
- name = it.realName,
- loginId = it.loginId,
- reportingUnitId = it.unitId,
- role = it.role,
- hash = it.hash,
- shortName = it.name
- )
- }
- )
- }
-
- suspend fun deleteMessage(student: Student, message: Message): Boolean {
- return sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
deleted file mode 100644
index bb9326992..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.github.wulkanowy.data.repositories.message
-
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
-import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessageRepository @Inject constructor(
- private val local: MessageLocal,
- private val remote: MessageRemote
-) {
-
- fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getMessages(student, folder) },
- fetch = { remote.getMessages(student, semester, folder) },
- saveFetchResult = { old, new ->
- local.deleteMessages(old uniqueSubtract new)
- local.saveMessages((new uniqueSubtract old).onEach {
- it.isNotified = !notify
- })
- }
- )
-
- fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
- shouldFetch = {
- checkNotNull(it, { "This message no longer exist!" })
- Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
- it.message.unread || it.message.content.isEmpty()
- },
- query = { local.getMessageWithAttachment(student, message) },
- fetch = { remote.getMessagesContentDetails(student, it!!.message, markAsRead) },
- saveFetchResult = { old, (downloadedMessage, attachments) ->
- checkNotNull(old, { "Fetched message no longer exist!" })
- local.updateMessages(listOf(old.message.copy(unread = !markAsRead).apply {
- id = old.message.id
- content = content.ifBlank { downloadedMessage }
- }))
- local.saveMessageAttachments(attachments)
- Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
- }
- )
-
- fun getNotNotifiedMessages(student: Student): Flow> {
- return local.getMessages(student, RECEIVED).map { it.filter { message -> !message.isNotified && message.unread } }
- }
-
- suspend fun updateMessages(messages: List) {
- return local.updateMessages(messages)
- }
-
- suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List): SentMessage {
- return remote.sendMessage(student, subject, content, recipients)
- }
-
- suspend fun deleteMessage(student: Student, message: Message) {
- val isDeleted = remote.deleteMessage(student, message)
-
- if (message.folderId != MessageFolder.TRASHED.id) {
- if (isDeleted) local.updateMessages(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
- id = message.id
- content = message.content
- }))
- } else local.deleteMessages(listOf(message))
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
deleted file mode 100644
index 0ccb3d7ef..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.mobiledevice
-
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
-
- suspend fun saveDevices(devices: List) {
- mobileDb.insertAll(devices)
- }
-
- suspend fun deleteDevices(devices: List) {
- mobileDb.deleteAll(devices)
- }
-
- fun getDevices(semester: Semester): Flow> {
- return mobileDb.loadAll(semester.studentId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
deleted file mode 100644
index 907e965ce..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.repositories.mobiledevice
-
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getDevices(student: Student, semester: Semester): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getRegisteredDevices()
- .map {
- MobileDevice(
- studentId = semester.studentId,
- date = it.createDate,
- deviceId = it.id,
- name = it.name
- )
- }
- }
-
- suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Boolean {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .unregisterDevice(device.deviceId)
- }
-
- suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getToken()
- .let {
- MobileDeviceToken(
- token = it.token,
- symbol = it.symbol,
- pin = it.pin,
- qr = it.qrCodeImage
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
deleted file mode 100644
index 65526ef86..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.repositories.mobiledevice
-
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MobileDeviceRepository @Inject constructor(
- private val local: MobileDeviceLocal,
- private val remote: MobileDeviceRemote
-) {
-
- fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getDevices(semester) },
- fetch = { remote.getDevices(student, semester) },
- saveFetchResult = { old, new ->
- local.deleteDevices(old uniqueSubtract new)
- local.saveDevices(new uniqueSubtract old)
- }
- )
-
- suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
- remote.unregisterDevice(student, semester, device)
- local.deleteDevices(listOf(device))
- }
-
- suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
- return remote.getToken(student, semester)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
deleted file mode 100644
index 85ba5e223..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.github.wulkanowy.data.repositories.note
-
-import io.github.wulkanowy.data.db.dao.NoteDao
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
-
- suspend fun saveNotes(notes: List) {
- noteDb.insertAll(notes)
- }
-
- suspend fun updateNotes(notes: List) {
- noteDb.updateAll(notes)
- }
-
- suspend fun deleteNotes(notes: List) {
- noteDb.deleteAll(notes)
- }
-
- fun getNotes(student: Student): Flow> {
- return noteDb.loadAll(student.studentId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
deleted file mode 100644
index 0e488b7d9..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.data.repositories.note
-
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getNotes(student: Student, semester: Semester): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getNotes(semester.semesterId)
- .map {
- Note(
- studentId = semester.studentId,
- date = it.date,
- teacher = it.teacher,
- teacherSymbol = it.teacherSymbol,
- category = it.category,
- categoryType = it.categoryType.id,
- isPointsShow = it.showPoints,
- points = it.points,
- content = it.content
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
deleted file mode 100644
index 6cf62ba22..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.repositories.note
-
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteRepository @Inject constructor(
- private val local: NoteLocal,
- private val remote: NoteRemote
-) {
-
- fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getNotes(student) },
- fetch = { remote.getNotes(student, semester) },
- saveFetchResult = { old, new ->
- local.deleteNotes(old uniqueSubtract new)
- local.saveNotes((new uniqueSubtract old).onEach {
- if (it.date >= student.registrationDate.toLocalDate()) it.apply {
- isRead = false
- if (notify) isNotified = false
- }
- })
- }
- )
-
- fun getNotNotifiedNotes(student: Student): Flow> {
- return local.getNotes(student).map { it.filter { note -> !note.isNotified } }
- }
-
- suspend fun updateNote(note: Note) {
- local.updateNotes(listOf(note))
- }
-
- suspend fun updateNotes(notes: List) {
- return local.updateNotes(notes)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
deleted file mode 100644
index fac1645e4..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.recipient
-
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao) {
-
- suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List {
- return recipientDb.load(student.studentId, role, unit.realId)
- }
-
- suspend fun saveRecipients(recipients: List): List {
- return recipientDb.insertAll(recipients)
- }
-
- suspend fun deleteRecipients(recipients: List) {
- recipientDb.deleteAll(recipients)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
deleted file mode 100644
index a5318e77f..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.data.repositories.recipient
-
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
-
-@Singleton
-class RecipientRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List {
- return sdk.init(student).getRecipients(unit.realId, role)
- .map { it.toRecipient() }
- }
-
- suspend fun getMessageRecipients(student: Student, message: Message): List {
- return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
- .map { it.toRecipient() }
- }
-
- private fun SdkRecipient.toRecipient(): Recipient {
- return Recipient(
- studentId = sdk.studentId,
- realId = id,
- realName = name,
- name = shortName,
- hash = hash,
- loginId = loginId,
- role = role,
- unitId = reportingUnitId ?: 0
- )
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
deleted file mode 100644
index f5e876b03..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.repositories.recipient
-
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecipientRepository @Inject constructor(
- private val local: RecipientLocal,
- private val remote: RecipientRemote
-) {
-
- suspend fun refreshRecipients(student: Student, role: Int, unit: ReportingUnit) {
- val new = remote.getRecipients(student, role, unit)
- val old = local.getRecipients(student, role, unit)
-
- local.deleteRecipients(old uniqueSubtract new)
- local.saveRecipients(new uniqueSubtract old)
- }
-
- suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List {
- return local.getRecipients(student, role, unit).ifEmpty {
- refreshRecipients(student, role, unit)
-
- local.getRecipients(student, role, unit)
- }
- }
-
- suspend fun getMessageRecipients(student: Student, message: Message): List {
- return remote.getMessageRecipients(student, message)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
deleted file mode 100644
index 3117a606a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.data.repositories.recover
-
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecoverRepository @Inject constructor(private val remote: RecoverRemote) {
-
- suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair {
- return remote.getReCaptchaSiteKey(host, symbol)
- }
-
- suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
- return remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
deleted file mode 100644
index 737f1a04f..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.repositories.reportingunit
-
-import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: ReportingUnitDao) {
-
- suspend fun getReportingUnits(student: Student): List {
- return reportingUnitDb.load(student.studentId)
- }
-
- suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
- return reportingUnitDb.loadOne(student.studentId, unitId)
- }
-
- suspend fun saveReportingUnits(reportingUnits: List): List {
- return reportingUnitDb.insertAll(reportingUnits)
- }
-
- suspend fun deleteReportingUnits(reportingUnits: List) {
- reportingUnitDb.deleteAll(reportingUnits)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
deleted file mode 100644
index 6b11c2cc9..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.reportingunit
-
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getReportingUnits(student: Student): List {
- return sdk.init(student).getReportingUnits().map { unit ->
- ReportingUnit(
- studentId = sdk.studentId,
- realId = unit.id,
- roles = unit.roles,
- senderId = unit.senderId,
- senderName = unit.senderName,
- shortName = unit.short
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
deleted file mode 100644
index ff5839460..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.data.repositories.reportingunit
-
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ReportingUnitRepository @Inject constructor(
- private val local: ReportingUnitLocal,
- private val remote: ReportingUnitRemote
-) {
-
- suspend fun refreshReportingUnits(student: Student) {
- val new = remote.getReportingUnits(student)
- val old = local.getReportingUnits(student)
-
- local.deleteReportingUnits(old.uniqueSubtract(new))
- local.saveReportingUnits(new.uniqueSubtract(old))
- }
-
- suspend fun getReportingUnits(student: Student): List {
- return local.getReportingUnits(student).ifEmpty {
- refreshReportingUnits(student)
-
- local.getReportingUnits(student)
- }
- }
-
- suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
- return local.getReportingUnit(student, unitId) ?: run {
- refreshReportingUnits(student)
-
- return local.getReportingUnit(student, unitId)
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
deleted file mode 100644
index bc1b2f446..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import io.github.wulkanowy.data.db.dao.SchoolDao
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-
-class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
-
- suspend fun saveSchool(school: School) {
- schoolDb.insertAll(listOf(school))
- }
-
- suspend fun deleteSchool(school: School) {
- schoolDb.deleteAll(listOf(school))
- }
-
- fun getSchool(semester: Semester): Flow {
- return schoolDb.load(semester.studentId, semester.classId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
deleted file mode 100644
index 4d2e0cd6c..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-
-class SchoolRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getSchoolInfo(student: Student, semester: Semester): School {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getSchool()
- .let {
- School(
- studentId = semester.studentId,
- classId = semester.classId,
- name = it.name,
- address = it.address,
- contact = it.contact,
- headmaster = it.headmaster,
- pedagogue = it.pedagogue
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
deleted file mode 100644
index 4c84c3194..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.repositories.school
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SchoolRepository @Inject constructor(
- private val local: SchoolLocal,
- private val remote: SchoolRemote
-) {
-
- fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it == null || forceRefresh },
- query = { local.getSchool(semester) },
- fetch = { remote.getSchoolInfo(student, semester) },
- saveFetchResult = { old, new ->
- if (new != old && old != null) {
- local.deleteSchool(old)
- local.saveSchool(new)
- }
- local.saveSchool(new)
- }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
deleted file mode 100644
index 8ecf1595a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.repositories.semester
-
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
-
- suspend fun saveSemesters(semesters: List) {
- semesterDb.insertSemesters(semesters)
- }
-
- suspend fun deleteSemesters(semesters: List) {
- semesterDb.deleteAll(semesters)
- }
-
- suspend fun getSemesters(student: Student): List {
- return semesterDb.loadAll(student.studentId, student.classId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
deleted file mode 100644
index e1a920b6f..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.data.repositories.semester
-
-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 javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SemesterRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getSemesters(student: Student): List {
- return sdk.init(student).getSemesters().map {
- Semester(
- studentId = student.studentId,
- diaryId = it.diaryId,
- diaryName = it.diaryName,
- schoolYear = it.schoolYear,
- semesterId = it.semesterId,
- semesterName = it.semesterNumber,
- start = it.start,
- end = it.end,
- classId = it.classId,
- unitId = it.unitId
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
deleted file mode 100644
index c01d1d049..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.data.repositories.student
-
-import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.security.decrypt
-import io.github.wulkanowy.utils.security.encrypt
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentLocal @Inject constructor(
- private val studentDb: StudentDao,
- private val dispatchers: DispatchersProvider,
- @ApplicationContext private val context: Context
-) {
-
- suspend fun saveStudents(students: List) = withContext(dispatchers.backgroundThread) {
- studentDb.insertAll(students.map {
- if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
- else it
- })
- }
-
- suspend fun getStudents(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
- studentDb.loadStudentsWithSemesters().map {
- it.apply {
- if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) student.password = decrypt(student.password)
- }
- }
- }
-
- suspend fun getStudentById(id: Int) = withContext(dispatchers.backgroundThread) {
- studentDb.loadById(id)?.apply {
- if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
- }
- }
-
- suspend fun getCurrentStudent(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
- studentDb.loadCurrent()?.apply {
- if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
- }
- }
-
- suspend fun setCurrentStudent(student: Student) = withContext(dispatchers.backgroundThread) {
- studentDb.run {
- resetCurrent()
- updateCurrent(student.id)
- }
- }
-
- suspend fun logoutStudent(student: Student) = withContext(dispatchers.backgroundThread) {
- studentDb.delete(student)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
index dcb126233..e69de29bb 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.repositories.student
-
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.sdk.Sdk
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getStudentsMobileApi(token: String, pin: String, symbol: String): List {
- return sdk.getStudentsFromMobileApi(token, pin, symbol, "").mapToEntities()
- }
-
- suspend fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): List {
- return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).mapToEntities(password)
- }
-
- suspend fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): List {
- return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).mapToEntities(password)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
deleted file mode 100644
index 19e0e2086..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.github.wulkanowy.data.repositories.student
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.semester.SemesterLocal
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentRepository @Inject constructor(
- private val local: StudentLocal,
- private val semestersLocal: SemesterLocal,
- private val remote: StudentRemote
-) {
-
- suspend fun isStudentSaved(): Boolean = local.getStudents(false).isNotEmpty()
-
- suspend fun isCurrentStudentSet(): Boolean = local.getCurrentStudent(false)?.isCurrent ?: false
-
- suspend fun getStudentsApi(pin: String, symbol: String, token: String): List {
- return remote.getStudentsMobileApi(token, pin, symbol)
- }
-
- suspend fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): List {
- return remote.getStudentsScrapper(email, password, endpoint, symbol)
- }
-
- suspend fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): List {
- return remote.getStudentsHybrid(email, password, endpoint, symbol)
- }
-
- suspend fun getSavedStudents(decryptPass: Boolean = true): List {
- return local.getStudents(decryptPass)
- }
-
- suspend fun getStudentById(id: Int): Student {
- return local.getStudentById(id) ?: throw NoCurrentStudentException()
- }
-
- suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
- return local.getCurrentStudent(decryptPass) ?: throw NoCurrentStudentException()
- }
-
- suspend fun saveStudents(studentsWithSemesters: List): List {
- semestersLocal.saveSemesters(studentsWithSemesters.flatMap { it.semesters })
- return local.saveStudents(studentsWithSemesters.map { it.student })
- }
-
- suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
- return local.setCurrentStudent(studentWithSemesters.student)
- }
-
- suspend fun logoutStudent(student: Student) {
- return local.logoutStudent(student)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
deleted file mode 100644
index e225a381e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.subject
-
-import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Subject
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
-
- fun getSubjects(semester: Semester): Flow> {
- return subjectDao.loadAll(semester.diaryId, semester.studentId)
- }
-
- suspend fun saveSubjects(subjects: List) {
- subjectDao.insertAll(subjects)
- }
-
- suspend fun deleteSubjects(subjects: List) {
- subjectDao.deleteAll(subjects)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
deleted file mode 100644
index 624a5a00a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy.data.repositories.subject
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SubjectRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getSubjects(student: Student, semester: Semester): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getSubjects()
- .map {
- Subject(
- studentId = semester.studentId,
- diaryId = semester.diaryId,
- name = it.name,
- realId = it.id
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
deleted file mode 100644
index 60a0c3e71..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.subject
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SubjectRepository @Inject constructor(
- private val local: SubjectLocal,
- private val remote: SubjectRemote
-) {
-
- fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getSubjects(semester) },
- fetch = { remote.getSubjects(student, semester) },
- saveFetchResult = { old, new ->
- local.deleteSubjects(old uniqueSubtract new)
- local.saveSubjects(new uniqueSubtract old)
- }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
deleted file mode 100644
index 908f45a1a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-
-class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
-
- suspend fun saveTeachers(teachers: List) {
- teacherDb.insertAll(teachers)
- }
-
- suspend fun deleteTeachers(teachers: List) {
- teacherDb.deleteAll(teachers)
- }
-
- fun getTeachers(semester: Semester): Flow> {
- return teacherDb.loadAll(semester.studentId, semester.classId)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
deleted file mode 100644
index 1d1caa686..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TeacherRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getTeachers(student: Student, semester: Semester): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getTeachers(semester.semesterId)
- .map {
- Teacher(
- studentId = semester.studentId,
- name = it.name,
- subject = it.subject,
- shortName = it.short,
- classId = semester.classId
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
deleted file mode 100644
index df25a53ec..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.teacher
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TeacherRepository @Inject constructor(
- private val local: TeacherLocal,
- private val remote: TeacherRemote
-) {
-
- fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getTeachers(semester) },
- fetch = { remote.getTeachers(student, semester) },
- saveFetchResult = { old, new ->
- local.deleteTeachers(old uniqueSubtract new)
- local.saveTeachers(new uniqueSubtract old)
- }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
deleted file mode 100644
index df4bfb20a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import io.github.wulkanowy.data.db.dao.TimetableDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Timetable
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
-
- suspend fun saveTimetable(timetables: List) {
- timetableDb.insertAll(timetables)
- }
-
- suspend fun deleteTimetable(timetables: List) {
- timetableDb.deleteAll(timetables)
- }
-
- fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow> {
- return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
deleted file mode 100644
index eef8729e8..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TimetableRemote @Inject constructor(private val sdk: Sdk) {
-
- suspend fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List {
- return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
- .getTimetable(startDate, endDate)
- .map {
- Timetable(
- studentId = semester.studentId,
- diaryId = semester.diaryId,
- number = it.number,
- start = it.start,
- end = it.end,
- date = it.date,
- subject = it.subject,
- subjectOld = it.subjectOld,
- group = it.group,
- room = it.room,
- roomOld = it.roomOld,
- teacher = it.teacher,
- teacherOld = it.teacherOld,
- info = it.info,
- isStudentPlan = it.studentPlan,
- changes = it.changes,
- canceled = it.canceled
- )
- }
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
deleted file mode 100644
index ee2734aaf..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.data.repositories.timetable
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.map
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TimetableRepository @Inject constructor(
- private val local: TimetableLocal,
- private val remote: TimetableRemote,
- private val schedulerHelper: TimetableNotificationSchedulerHelper
-) {
-
- fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
- shouldFetch = { it.isEmpty() || forceRefresh },
- query = { local.getTimetable(semester, start.monday, end.sunday).map { schedulerHelper.scheduleNotifications(it, student); it } },
- fetch = { remote.getTimetable(student, semester, start.monday, end.sunday) },
- saveFetchResult = { old, new ->
- local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
- local.saveTimetable(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
- item.also { new ->
- old.singleOrNull { new.start == it.start }?.let { old ->
- return@map new.copy(
- room = if (new.room.isEmpty()) old.room else new.room,
- teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
- )
- }
- }
- })
- },
- filterResult = { it.filter { item -> item.date in start..end } }
- )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index 9133c34ed..4efb4d84a 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -6,13 +6,13 @@ import com.yariksoffice.lingver.Lingver
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
import io.github.wulkanowy.utils.DispatchersProvider
import javax.inject.Singleton
@Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
internal class AppModule {
@Singleton
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index ac5a84e8f..891f07da0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -9,8 +9,8 @@ import dagger.Binds
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
import dagger.multibindings.IntoSet
import io.github.wulkanowy.services.sync.channels.Channel
import io.github.wulkanowy.services.sync.channels.DebugChannel
@@ -38,7 +38,7 @@ import javax.inject.Singleton
@Suppress("unused")
@Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
abstract class ServicesModule {
companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
index 592d0919e..8eefc032f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
@@ -12,7 +12,7 @@ import androidx.core.app.NotificationManagerCompat
import dagger.hilt.android.AndroidEntryPoint
import io.github.wulkanowy.R
import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.services.HiltBroadcastReceiver
import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
import io.github.wulkanowy.ui.modules.main.MainActivity
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
index 2593a555b..c5a5590b9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -11,7 +11,7 @@ import androidx.core.app.NotificationManagerCompat
import dagger.hilt.android.qualifiers.ApplicationContext
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_END
import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_ROOM
import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_TITLE
@@ -27,6 +27,7 @@ import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companio
import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_NAME
import io.github.wulkanowy.ui.modules.main.MainView
import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.nickOrName
import io.github.wulkanowy.utils.toTimestamp
import kotlinx.coroutines.withContext
import timber.log.Timber
@@ -41,17 +42,23 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
private val dispatchersProvider: DispatchersProvider,
) {
- private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
+ private fun getRequestCode(time: LocalDateTime, studentId: Int) =
+ (time.toTimestamp() * studentId).toInt()
- private fun getUpcomingLessonTime(index: Int, day: List, lesson: Timetable): LocalDateTime {
- return day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
- }
+ private fun getUpcomingLessonTime(
+ index: Int,
+ day: List,
+ lesson: Timetable
+ ) = day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
suspend fun cancelScheduled(lessons: List, studentId: Int = 1) {
withContext(dispatchersProvider.backgroundThread) {
lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
- cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
+ cancelScheduledTo(
+ upcomingTime..lesson.start,
+ getRequestCode(upcomingTime, studentId)
+ )
cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
@@ -61,13 +68,18 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
private fun cancelScheduledTo(range: ClosedRange, requestCode: Int) {
if (now() in range) cancelNotification()
- alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT))
+ alarmManager.cancel(
+ PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT)
+ )
}
- fun cancelNotification() = NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
+ fun cancelNotification() =
+ NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
suspend fun scheduleNotifications(lessons: List, student: Student) {
- if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) return cancelScheduled(lessons, student.studentId)
+ if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) {
+ return cancelScheduled(lessons, student.studentId)
+ }
withContext(dispatchersProvider.backgroundThread) {
lessons.groupBy { it.date }
@@ -82,13 +94,28 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
val intent = createIntent(student, lesson, active.getOrNull(index + 1))
if (lesson.start > now()) {
- scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, active, lesson))
+ scheduleBroadcast(
+ intent,
+ student.studentId,
+ NOTIFICATION_TYPE_UPCOMING,
+ getUpcomingLessonTime(index, active, lesson)
+ )
}
if (lesson.end > now()) {
- scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
+ scheduleBroadcast(
+ intent,
+ student.studentId,
+ NOTIFICATION_TYPE_CURRENT,
+ lesson.start
+ )
if (active.lastIndex == index) {
- scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
+ scheduleBroadcast(
+ intent,
+ student.studentId,
+ NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION,
+ lesson.end
+ )
}
}
}
@@ -99,7 +126,7 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
private fun createIntent(student: Student, lesson: Timetable, nextLesson: Timetable?): Intent {
return Intent(context, TimetableNotificationReceiver::class.java).apply {
putExtra(STUDENT_ID, student.studentId)
- putExtra(STUDENT_NAME, student.studentName)
+ putExtra(STUDENT_NAME, student.nickOrName)
putExtra(LESSON_ROOM, lesson.room)
putExtra(LESSON_START, lesson.start.toTimestamp())
putExtra(LESSON_END, lesson.end.toTimestamp())
@@ -109,13 +136,23 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
}
}
- private fun scheduleBroadcast(intent: Intent, studentId: Int, notificationType: Int, time: LocalDateTime) {
- AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, RTC_WAKEUP, time.toTimestamp(),
+ private fun scheduleBroadcast(
+ intent: Intent,
+ studentId: Int,
+ notificationType: Int,
+ time: LocalDateTime
+ ) {
+ AlarmManagerCompat.setExactAndAllowWhileIdle(
+ alarmManager, RTC_WAKEUP, time.toTimestamp(),
PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
it.putExtra(LESSON_TYPE, notificationType)
}, FLAG_UPDATE_CURRENT)
)
- Timber.d("TimetableNotification scheduled: type: $notificationType, subject: ${intent.getStringExtra(LESSON_TITLE)}, start: $time, student: $studentId")
+ Timber.d(
+ "TimetableNotification scheduled: type: $notificationType, subject: ${
+ intent.getStringExtra(LESSON_TITLE)
+ }, start: $time, student: $studentId"
+ )
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 47a949273..b94d97e33 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -18,7 +18,7 @@ import androidx.work.WorkInfo
import androidx.work.WorkManager
import io.github.wulkanowy.data.db.SharedPrefProvider
import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.Channel
import io.github.wulkanowy.utils.AppInfo
import io.github.wulkanowy.utils.isHolidays
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 13326ca06..8b6bc65d1 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -5,15 +5,16 @@ import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationCompat.BigTextStyle
import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
import androidx.core.app.NotificationManagerCompat
-import androidx.hilt.Assisted
-import androidx.hilt.work.WorkerInject
+import androidx.hilt.work.HiltWorker
import androidx.work.CoroutineWorker
import androidx.work.Data
import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
import io.github.wulkanowy.services.sync.channels.DebugChannel
@@ -23,7 +24,8 @@ import kotlinx.coroutines.coroutineScope
import timber.log.Timber
import kotlin.random.Random
-class SyncWorker @WorkerInject constructor(
+@HiltWorker
+class SyncWorker @AssistedInject constructor(
@Assisted appContext: Context,
@Assisted workerParameters: WorkerParameters,
private val studentRepository: StudentRepository,
@@ -58,9 +60,10 @@ class SyncWorker @WorkerInject constructor(
}
val result = when {
exceptions.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
- Result.failure(Data.Builder()
- .putString("error", exceptions.map { it.stackTraceToString() }.toString())
- .build()
+ Result.failure(
+ Data.Builder()
+ .putString("error", exceptions.map { it.stackTraceToString() }.toString())
+ .build()
)
}
exceptions.isNotEmpty() -> Result.retry()
@@ -74,13 +77,16 @@ class SyncWorker @WorkerInject constructor(
}
private fun notify(result: Result) {
- notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
- .setContentTitle("Debug notification")
- .setSmallIcon(R.drawable.ic_stat_push)
- .setAutoCancel(true)
- .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
- .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
- .setPriority(PRIORITY_DEFAULT)
- .build())
+ notificationManager.notify(
+ Random.nextInt(Int.MAX_VALUE),
+ NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
+ .setContentTitle("Debug notification")
+ .setSmallIcon(R.drawable.ic_stat_push)
+ .setAutoCancel(true)
+ .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
+ .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
+ .setPriority(PRIORITY_DEFAULT)
+ .build()
+ )
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
index 9e4ab9025..cbe1fe6bd 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
import io.github.wulkanowy.utils.waitForResult
import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
index ecf0be018..788e4ea2c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
+import io.github.wulkanowy.data.repositories.AttendanceRepository
import io.github.wulkanowy.utils.monday
import io.github.wulkanowy.utils.sunday
import io.github.wulkanowy.utils.waitForResult
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
index 212ea6327..17bd61292 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
+import io.github.wulkanowy.data.repositories.CompletedLessonsRepository
import io.github.wulkanowy.utils.monday
import io.github.wulkanowy.utils.sunday
import io.github.wulkanowy.utils.waitForResult
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
index 899d45cba..b75499301 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.exam.ExamRepository
+import io.github.wulkanowy.data.repositories.ExamRepository
import io.github.wulkanowy.utils.waitForResult
import java.time.LocalDate.now
import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
index 3d61a423b..4575b419b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
+import io.github.wulkanowy.data.repositories.GradeStatisticsRepository
import io.github.wulkanowy.utils.waitForResult
import javax.inject.Inject
@@ -12,8 +12,8 @@ class GradeStatisticsWork @Inject constructor(
override suspend fun doWork(student: Student, semester: Semester) {
with(gradeStatisticsRepository) {
- getGradesStatistics(student, semester, "Wszystkie", isSemester = true, forceRefresh = true).waitForResult()
- getGradesStatistics(student, semester, "Wszystkie", isSemester = false, forceRefresh = true).waitForResult()
+ getGradesPartialStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
+ getGradesSemesterStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
getGradesPointsStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 00bce109e..19c26edd0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -13,8 +13,8 @@ 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.data.repositories.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.GradeRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.NewGradesChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.main.MainView
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index a07f11073..a16841e9a 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+import io.github.wulkanowy.data.repositories.HomeworkRepository
import io.github.wulkanowy.utils.monday
import io.github.wulkanowy.utils.sunday
import io.github.wulkanowy.utils.waitForResult
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index 7b9f5ab30..9f5365535 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -12,8 +12,8 @@ import io.github.wulkanowy.R
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 io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.main.MainView
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index 7b32f13bb..93c30b57c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -12,9 +12,9 @@ import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Message
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.message.MessageRepository
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.repositories.MessageRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
import io.github.wulkanowy.ui.modules.main.MainActivity
import io.github.wulkanowy.ui.modules.main.MainView
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index b08896966..50f418ed3 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -12,8 +12,8 @@ import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Note
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.note.NoteRepository
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.NoteRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory.NEUTRAL
import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory.POSITIVE
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
index c433c0ac8..34ab3db04 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
-import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+import io.github.wulkanowy.data.repositories.RecipientRepository
+import io.github.wulkanowy.data.repositories.ReportingUnitRepository
import javax.inject.Inject
class RecipientWork @Inject constructor(
@@ -16,7 +16,7 @@ class RecipientWork @Inject constructor(
reportingUnitRepository.getReportingUnits(student).let { units ->
units.map {
- recipientRepository.refreshRecipients(student, 2, it)
+ recipientRepository.refreshRecipients(student, it, 2)
}
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
index a9abdaa72..7c614c6c5 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
+import io.github.wulkanowy.data.repositories.TeacherRepository
import io.github.wulkanowy.utils.waitForResult
import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
index 3b8c6f5dc..2df2c9dcb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.services.sync.works
import io.github.wulkanowy.data.db.entities.Semester
import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
+import io.github.wulkanowy.data.repositories.TimetableRepository
import io.github.wulkanowy.utils.monday
import io.github.wulkanowy.utils.sunday
import io.github.wulkanowy.utils.waitForResult
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index 42c6d3bfd..45cd2b04e 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -4,10 +4,10 @@ import android.content.Intent
import android.widget.RemoteViewsService
import dagger.hilt.android.AndroidEntryPoint
import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.TimetableRepository
import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetFactory
import timber.log.Timber
import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
index 18cd58b41..1c31976ee 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -3,10 +3,15 @@ package io.github.wulkanowy.ui.base
import android.widget.Toast
import androidx.fragment.app.DialogFragment
import androidx.viewbinding.ViewBinding
+import io.github.wulkanowy.utils.AnalyticsHelper
import io.github.wulkanowy.utils.lifecycleAwareVariable
+import javax.inject.Inject
abstract class BaseDialogFragment : DialogFragment(), BaseView {
+ @Inject
+ lateinit var analyticsHelper: AnalyticsHelper
+
protected var binding: VB by lifecycleAwareVariable()
override fun showError(text: String, error: Throwable) {
@@ -28,4 +33,14 @@ abstract class BaseDialogFragment : DialogFragment(), BaseView
override fun showErrorDetailsDialog(error: Throwable) {
ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
}
+
+ override fun onResume() {
+ super.onResume()
+ analyticsHelper.setCurrentScreen(requireActivity(), this::class.simpleName)
+ }
+
+ override fun onPause() {
+ super.onPause()
+ analyticsHelper.popCurrentScreen(this::class.simpleName)
+ }
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
index ba8bfd85f..b222b0abb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
@@ -1,7 +1,7 @@
package io.github.wulkanowy.ui.base
import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.utils.flowWithResource
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 341ae4590..f76614e1e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -57,7 +57,7 @@ class ErrorDialog : BaseDialogFragment() {
}
}
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
}
@@ -114,11 +114,17 @@ class ErrorDialog : BaseDialogFragment() {
chooserTitle = getString(R.string.about_feedback),
email = "wulkanowyinc@gmail.com",
subject = "Zgłoszenie błędu",
- body = requireContext().getString(R.string.about_feedback_template,
- "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+ body = requireContext().getString(
+ R.string.about_feedback_template,
+ "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+ appInfo.systemVersion.toString(),
+ "${appInfo.versionName}-${appInfo.buildFlavor}"
) + "\n" + content,
onActivityNotFound = {
- requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+ requireContext().openInternetBrowser(
+ "https://github.com/wulkanowy/wulkanowy/issues",
+ ::showMessage
+ )
}
)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index 946e661b1..34dd3ec16 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -1,7 +1,6 @@
package io.github.wulkanowy.ui.base
import android.content.res.Resources
-import com.chuckerteam.chucker.api.ChuckerCollector
import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
import io.github.wulkanowy.utils.getString
@@ -9,7 +8,7 @@ import io.github.wulkanowy.utils.security.ScramblerException
import timber.log.Timber
import javax.inject.Inject
-open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckerCollector: ChuckerCollector) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources) {
var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
@@ -18,7 +17,6 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
var onNoCurrentStudent: () -> Unit = {}
fun dispatch(error: Throwable) {
- chuckerCollector.onError(error.javaClass.simpleName, error)
Timber.e(error, "An exception occurred while the Wulkanowy was running")
proceed(error)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
index 501348612..a2379c3e7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
index cefe6ed75..8e6130fbf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
@@ -9,6 +9,7 @@ import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.databinding.ItemAccountBinding
import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.nickOrName
import javax.inject.Inject
class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter() {
@@ -28,7 +29,7 @@ class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter(R.layout.fragment_about
override val versionRes: Triple?
get() = context?.run {
- Triple(getString(R.string.about_version), "${appInfo.versionName} (${appInfo.versionCode})", getCompatDrawable(R.drawable.ic_all_about))
+ val buildTimestamp = appInfo.buildTimestamp.toLocalDateTime().toFormattedString("yyyy-MM-dd")
+ val versionSignature = "${appInfo.versionName}-${appInfo.buildFlavor} (${appInfo.versionCode}), $buildTimestamp"
+ Triple(getString(R.string.about_version), versionSignature, getCompatDrawable(R.drawable.ic_all_about))
}
override val creatorsRes: Triple?
@@ -58,9 +62,18 @@ class AboutFragment : BaseFragment(R.layout.fragment_about
Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
}
+ override val facebookRes: Triple?
+ get() = context?.run {
+ Triple(getString(R.string.about_facebook), getString(R.string.about_facebook_summary), getCompatDrawable(R.drawable.ic_about_facebook))
+ }
+
override val homepageRes: Triple?
get() = context?.run {
- Triple(getString(R.string.about_homepage), getString(R.string.about_homepage_summary), getCompatDrawable(R.drawable.ic_about_homepage))
+ Triple(
+ getString(R.string.about_homepage),
+ getString(R.string.about_homepage_summary),
+ getCompatDrawable(R.drawable.ic_all_home)
+ )
}
override val licensesRes: Triple?
@@ -113,6 +126,10 @@ class AboutFragment : BaseFragment(R.layout.fragment_about
context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
}
+ override fun openFacebookPage() {
+ context?.openInternetBrowser("https://www.facebook.com/wulkanowy", ::showMessage)
+ }
+
override fun openHomepage() {
context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
}
@@ -122,11 +139,17 @@ class AboutFragment : BaseFragment(R.layout.fragment_about
chooserTitle = getString(R.string.about_feedback),
email = "wulkanowyinc@gmail.com",
subject = "Zgłoszenie błędu",
- body = getString(R.string.about_feedback_template,
- "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+ body = getString(
+ R.string.about_feedback_template,
+ "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+ appInfo.systemVersion.toString(),
+ "${appInfo.versionName}-${appInfo.buildFlavor}"
),
onActivityNotFound = {
- requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+ requireContext().openInternetBrowser(
+ "https://github.com/wulkanowy/wulkanowy/issues",
+ ::showMessage
+ )
}
)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 24e59d36b..fde20267d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -1,10 +1,10 @@
package io.github.wulkanowy.ui.modules.about
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AnalyticsHelper
import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import timber.log.Timber
import javax.inject.Inject
@@ -12,7 +12,7 @@ class AboutPresenter @Inject constructor(
errorHandler: ErrorHandler,
studentRepository: StudentRepository,
private val appInfo: AppInfo,
- private val analytics: FirebaseAnalyticsHelper
+ private val analytics: AnalyticsHelper
) : BasePresenter(errorHandler, studentRepository) {
override fun onAttachView(view: AboutView) {
@@ -46,6 +46,11 @@ class AboutPresenter @Inject constructor(
openDiscordInvite()
analytics.logEvent("about_open", "name" to "discord")
}
+ facebookRes?.first -> {
+ Timber.i("Opening facebook")
+ openFacebookPage()
+ analytics.logEvent("about_open", "name" to "facebook")
+ }
homepageRes?.first -> {
Timber.i("Opening homepage")
openHomepage()
@@ -78,6 +83,7 @@ class AboutPresenter @Inject constructor(
feedbackRes,
faqRes,
discordRes,
+ facebookRes,
homepageRes,
licensesRes,
privacyRes
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index 4c4b002f9..54882b302 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -15,6 +15,8 @@ interface AboutView : BaseView {
val discordRes: Triple?
+ val facebookRes: Triple?
+
val homepageRes: Triple?
val licensesRes: Triple?
@@ -31,6 +33,8 @@ interface AboutView : BaseView {
fun openDiscordInvite()
+ fun openFacebookPage()
+
fun openEmailClient()
fun openFaqPage()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
index 78fdb43a1..ef4b540e6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.ui.modules.about.contributor
import io.github.wulkanowy.data.Status
import io.github.wulkanowy.data.pojos.Contributor
-import io.github.wulkanowy.data.repositories.appcreator.AppCreatorRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.AppCreatorRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
import io.github.wulkanowy.utils.flowWithResource
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
index 18d257eed..cc430fc2c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.about.license
import com.mikepenz.aboutlibraries.entity.Library
import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
import io.github.wulkanowy.utils.DispatchersProvider
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
index 85eae8e6e..80020c81d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
@@ -1,8 +1,8 @@
package io.github.wulkanowy.ui.modules.about.logviewer
import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.logger.LoggerRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.LoggerRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
import io.github.wulkanowy.utils.flowWithResource
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
index 7ecb41399..342fd2d4b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
@@ -8,16 +8,17 @@ import android.view.View.VISIBLE
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
import io.github.wulkanowy.data.db.entities.StudentWithSemesters
import io.github.wulkanowy.databinding.HeaderAccountBinding
import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.sdk.Sdk
import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.nickOrName
import javax.inject.Inject
class AccountAdapter @Inject constructor() : RecyclerView.Adapter() {
+ var isAccountQuickDialogMode = false
+
var items = emptyList>()
var onClickListener: (StudentWithSemesters) -> Unit = {}
@@ -30,54 +31,69 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter HeaderViewHolder(HeaderAccountBinding.inflate(inflater, parent, false))
- AccountItem.ViewType.ITEM.id -> ItemViewHolder(ItemAccountBinding.inflate(inflater, parent, false))
+ AccountItem.ViewType.HEADER.id -> HeaderViewHolder(
+ HeaderAccountBinding.inflate(inflater, parent, false)
+ )
+ AccountItem.ViewType.ITEM.id -> ItemViewHolder(
+ ItemAccountBinding.inflate(inflater, parent, false)
+ )
else -> throw IllegalStateException()
}
}
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (holder) {
- is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as Account)
- is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as StudentWithSemesters)
+ is HeaderViewHolder -> bindHeaderViewHolder(
+ holder.binding,
+ items[position].value as Account,
+ position
+ )
+ is ItemViewHolder -> bindItemViewHolder(
+ holder.binding,
+ items[position].value as StudentWithSemesters
+ )
}
}
- private fun bindHeaderViewHolder(binding: HeaderAccountBinding, account: Account) {
+ private fun bindHeaderViewHolder(
+ binding: HeaderAccountBinding,
+ account: Account,
+ position: Int
+ ) {
with(binding) {
+ accountHeaderDivider.visibility = if (position == 0) GONE else VISIBLE
accountHeaderEmail.text = account.email
accountHeaderType.setText(if (account.isParent) R.string.account_type_parent else R.string.account_type_student)
}
}
@SuppressLint("SetTextI18n")
- private fun bindItemViewHolder(binding: ItemAccountBinding, studentWithSemesters: StudentWithSemesters) {
+ private fun bindItemViewHolder(
+ binding: ItemAccountBinding,
+ studentWithSemesters: StudentWithSemesters
+ ) {
val student = studentWithSemesters.student
val semesters = studentWithSemesters.semesters
val diary = semesters.maxByOrNull { it.semesterId }
+ val isDuplicatedStudent = items.filter {
+ if (it.value !is StudentWithSemesters) return@filter false
+ val studentToCompare = it.value.student
+
+ studentToCompare.studentId == student.studentId
+ && studentToCompare.schoolSymbol == student.schoolSymbol
+ && studentToCompare.symbol == student.symbol
+ }.size > 1 && isAccountQuickDialogMode
with(binding) {
- accountItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
+ accountItemName.text = "${student.nickOrName} ${diary?.diaryName.orEmpty()}"
accountItemSchool.text = studentWithSemesters.student.schoolName
- with(accountItemLoginMode) {
- visibility = when (Sdk.Mode.valueOf(student.loginMode)) {
- Sdk.Mode.API -> {
- setText(R.string.account_login_mobile_api)
- VISIBLE
- }
- Sdk.Mode.HYBRID -> {
- setText(R.string.account_login_hybrid)
- VISIBLE
- }
- Sdk.Mode.SCRAPPER -> {
- GONE
- }
- }
- }
+ accountItemAccountType.setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
+ accountItemAccountType.visibility = if (isDuplicatedStudent) VISIBLE else GONE
with(accountItemImage) {
- val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
- else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
+ val colorImage =
+ if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+ else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
deleted file mode 100644
index 1fa87268b..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.databinding.DialogAccountBinding
-import io.github.wulkanowy.ui.base.BaseDialogFragment
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AccountDialog : BaseDialogFragment(), AccountView {
-
- @Inject
- lateinit var presenter: AccountPresenter
-
- @Inject
- lateinit var accountAdapter: AccountAdapter
-
- companion object {
- fun newInstance() = AccountDialog()
- }
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setStyle(STYLE_NO_TITLE, 0)
- }
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- return DialogAccountBinding.inflate(inflater).apply { binding = this }.root
- }
-
- override fun onActivityCreated(savedInstanceState: Bundle?) {
- super.onActivityCreated(savedInstanceState)
- presenter.onAttachView(this)
- }
-
- override fun initView() {
- accountAdapter.onClickListener = presenter::onItemSelected
-
- with(binding) {
- accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
- accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
- accountDialogRecycler.apply {
- layoutManager = LinearLayoutManager(context)
- adapter = accountAdapter
- }
- }
- }
-
- override fun updateData(data: List>) {
- with(accountAdapter) {
- items = data
- notifyDataSetChanged()
- }
- }
-
- override fun showError(text: String, error: Throwable) {
- showMessage(text)
- }
-
- override fun showMessage(text: String) {
- Toast.makeText(context, text, LENGTH_LONG).show()
- }
-
- override fun dismissView() {
- dismiss()
- }
-
- override fun openLoginView() {
- activity?.let {
- startActivity(LoginActivity.getStartIntent(it))
- }
- }
-
- override fun showConfirmDialog() {
- context?.let {
- AlertDialog.Builder(it)
- .setTitle(R.string.account_logout_student)
- .setMessage(R.string.account_confirm)
- .setPositiveButton(R.string.account_logout) { _, _ -> presenter.onLogoutConfirm() }
- .setNegativeButton(android.R.string.cancel) { _, _ -> }
- .show()
- }
- }
-
- override fun recreateMainView() {
- activity?.recreate()
- }
-
- override fun onDestroy() {
- presenter.onDetachView()
- super.onDestroy()
- }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
new file mode 100644
index 000000000..7293527ee
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
@@ -0,0 +1,111 @@
+package io.github.wulkanowy.ui.modules.account
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.View
+import androidx.core.view.get
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.FragmentAccountBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AccountFragment : BaseFragment(R.layout.fragment_account),
+ AccountView, MainView.TitledView {
+
+ @Inject
+ lateinit var presenter: AccountPresenter
+
+ @Inject
+ lateinit var accountAdapter: AccountAdapter
+
+ companion object {
+
+ fun newInstance() = AccountFragment()
+ }
+
+ override val titleStringId = R.string.account_title
+
+ override var subtitleString = ""
+
+ override val isViewEmpty get() = accountAdapter.items.isEmpty()
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setHasOptionsMenu(true)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ binding = FragmentAccountBinding.bind(view)
+ presenter.onAttachView(this)
+ }
+
+ override fun initView() {
+ binding.accountErrorRetry.setOnClickListener { presenter.onRetry() }
+ binding.accountErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+ binding.accountRecycler.apply {
+ layoutManager = LinearLayoutManager(context)
+ adapter = accountAdapter
+ }
+
+ accountAdapter.onClickListener = presenter::onItemSelected
+
+ with(binding) {
+ accountAdd.setOnClickListener { presenter.onAddSelected() }
+ }
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ menu[0].isVisible = false
+ }
+
+ override fun updateData(data: List>) {
+ with(accountAdapter) {
+ items = data
+ notifyDataSetChanged()
+ }
+ }
+
+ override fun openLoginView() {
+ activity?.let {
+ startActivity(LoginActivity.getStartIntent(it))
+ }
+ }
+
+ override fun openAccountDetailsView(studentWithSemesters: StudentWithSemesters) {
+ (activity as? MainActivity)?.pushView(
+ AccountDetailsFragment.newInstance(
+ studentWithSemesters
+ )
+ )
+ }
+
+ override fun showErrorView(show: Boolean) {
+ binding.accountError.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun setErrorDetails(message: String) {
+ binding.accountErrorMessage.text = message
+ }
+
+ override fun showProgress(show: Boolean) {
+ binding.accountProgress.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun showContent(show: Boolean) {
+ with(binding) {
+ accountRecycler.visibility = if (show) View.VISIBLE else View.GONE
+ accountAdd.visibility = if (show) View.VISIBLE else View.GONE
+ }
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index 4eaee4291..366793b6d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -2,8 +2,7 @@ package io.github.wulkanowy.ui.modules.account
import io.github.wulkanowy.data.Status
import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.services.sync.SyncManager
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
import io.github.wulkanowy.utils.afterLoading
@@ -15,101 +14,91 @@ import javax.inject.Inject
class AccountPresenter @Inject constructor(
errorHandler: ErrorHandler,
studentRepository: StudentRepository,
- private val syncManager: SyncManager
) : BasePresenter(errorHandler, studentRepository) {
+ private lateinit var lastError: Throwable
+
override fun onAttachView(view: AccountView) {
super.onAttachView(view)
view.initView()
- Timber.i("Account dialog view was initialized")
+ Timber.i("Account view was initialized")
+ errorHandler.showErrorMessage = ::showErrorViewOnError
loadData()
}
+ fun onRetry() {
+ view?.run {
+ showErrorView(false)
+ showProgress(true)
+ }
+ loadData()
+ }
+
+ fun onDetailsClick() {
+ view?.showErrorDetailsDialog(lastError)
+ }
+
fun onAddSelected() {
Timber.i("Select add account")
view?.openLoginView()
}
- fun onRemoveSelected() {
- Timber.i("Select remove account")
- view?.showConfirmDialog()
- }
-
- fun onLogoutConfirm() {
- flowWithResource {
- val student = studentRepository.getCurrentStudent(false)
- studentRepository.logoutStudent(student)
-
- val students = studentRepository.getSavedStudents(false)
- if (students.isNotEmpty()) {
- studentRepository.switchStudent(students[0])
- }
- students
- }.onEach {
- when (it.status) {
- Status.LOADING -> Timber.i("Attempt to logout current user ")
- Status.SUCCESS -> view?.run {
- if (it.data!!.isEmpty()) {
- Timber.i("Logout result: Open login view")
- syncManager.stopSyncWorker()
- openClearLoginView()
- } else {
- Timber.i("Logout result: Switch to another student")
- recreateMainView()
- }
- }
- Status.ERROR -> {
- Timber.i("Logout result: An exception occurred")
- errorHandler.dispatch(it.error!!)
- }
- }
- }.afterLoading {
- view?.dismissView()
- }.launch("logout")
- }
-
fun onItemSelected(studentWithSemesters: StudentWithSemesters) {
- Timber.i("Select student item ${studentWithSemesters.student.id}")
- if (studentWithSemesters.student.isCurrent) {
- view?.dismissView()
- } else flowWithResource { studentRepository.switchStudent(studentWithSemesters) }.onEach {
- when (it.status) {
- Status.LOADING -> Timber.i("Attempt to change a student")
- Status.SUCCESS -> {
- Timber.i("Change a student result: Success")
- view?.recreateMainView()
- }
- Status.ERROR -> {
- Timber.i("Change a student result: An exception occurred")
- errorHandler.dispatch(it.error!!)
- }
- }
- }.afterLoading {
- view?.dismissView()
- }.launch("switch")
+ view?.openAccountDetailsView(studentWithSemesters)
}
private fun createAccountItems(items: List): List> {
- return items.groupBy { Account(it.student.email, it.student.isParent) }.map { (account, students) ->
- listOf(AccountItem(account, AccountItem.ViewType.HEADER)) + students.map { student ->
- AccountItem(student, AccountItem.ViewType.ITEM)
+ return items.groupBy {
+ Account("${it.student.userName} (${it.student.email})", it.student.isParent)
+ }
+ .map { (account, students) ->
+ listOf(
+ AccountItem(account, AccountItem.ViewType.HEADER)
+ ) + students.map { student ->
+ AccountItem(student, AccountItem.ViewType.ITEM)
+ }
}
- }.flatten()
+ .flatten()
}
private fun loadData() {
- flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
- when (it.status) {
- Status.LOADING -> Timber.i("Loading account data started")
- Status.SUCCESS -> {
- Timber.i("Loading account result: Success")
- view?.updateData(createAccountItems(it.data!!))
- }
- Status.ERROR -> {
- Timber.i("Loading account result: An exception occurred")
- errorHandler.dispatch(it.error!!)
+ flowWithResource { studentRepository.getSavedStudents(false) }
+ .onEach {
+ when (it.status) {
+ Status.LOADING -> {
+ Timber.i("Loading account data started")
+ view?.run {
+ showProgress(true)
+ showContent(false)
+ }
+ }
+ Status.SUCCESS -> {
+ Timber.i("Loading account result: Success")
+ view?.updateData(createAccountItems(it.data!!))
+ view?.run {
+ showContent(true)
+ showErrorView(false)
+ }
+ }
+ Status.ERROR -> {
+ Timber.i("Loading account result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
}
}
- }.launch()
+ .afterLoading { view?.showProgress(false) }
+ .launch()
+ }
+
+ private fun showErrorViewOnError(message: String, error: Throwable) {
+ view?.run {
+ if (isViewEmpty) {
+ lastError = error
+ setErrorDetails(message)
+ showErrorView(true)
+ showContent(false)
+ showProgress(false)
+ } else showError(message, error)
+ }
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index a1f8086cd..3453909d1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -1,19 +1,26 @@
package io.github.wulkanowy.ui.modules.account
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
import io.github.wulkanowy.ui.base.BaseView
interface AccountView : BaseView {
+ val isViewEmpty: Boolean
+
fun initView()
fun updateData(data: List>)
- fun dismissView()
-
- fun showConfirmDialog()
-
fun openLoginView()
- fun recreateMainView()
+ fun openAccountDetailsView(studentWithSemesters: StudentWithSemesters)
+
+ fun showErrorView(show: Boolean)
+
+ fun setErrorDetails(message: String)
+
+ fun showProgress(show: Boolean)
+
+ fun showContent(show: Boolean)
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
new file mode 100644
index 000000000..f4b2c833d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
@@ -0,0 +1,157 @@
+package io.github.wulkanowy.ui.modules.account.accountdetails
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.get
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.FragmentAccountDetailsBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.account.accountedit.AccountEditDialog
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoFragment
+import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
+import io.github.wulkanowy.utils.nickOrName
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AccountDetailsFragment :
+ BaseFragment(R.layout.fragment_account_details),
+ AccountDetailsView, MainView.TitledView {
+
+ @Inject
+ lateinit var presenter: AccountDetailsPresenter
+
+ override val titleStringId = R.string.account_details_title
+
+ override var subtitleString = ""
+
+ companion object {
+
+ private const val ARGUMENT_KEY = "Data"
+
+ fun newInstance(studentWithSemesters: StudentWithSemesters) =
+ AccountDetailsFragment().apply {
+ arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, studentWithSemesters) }
+ }
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setHasOptionsMenu(true)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ binding = FragmentAccountDetailsBinding.bind(view)
+ presenter.onAttachView(this, requireArguments()[ARGUMENT_KEY] as StudentWithSemesters)
+ }
+
+ override fun initView() {
+ binding.accountDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
+ binding.accountDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+ binding.accountDetailsLogout.setOnClickListener { presenter.onRemoveSelected() }
+ binding.accountDetailsSelect.setOnClickListener { presenter.onStudentSelect() }
+
+ binding.accountDetailsPersonalData.setOnClickListener {
+ presenter.onStudentInfoSelected(StudentInfoView.Type.PERSONAL)
+ }
+ binding.accountDetailsAddressData.setOnClickListener {
+ presenter.onStudentInfoSelected(StudentInfoView.Type.ADDRESS)
+ }
+ binding.accountDetailsContactData.setOnClickListener {
+ presenter.onStudentInfoSelected(StudentInfoView.Type.CONTACT)
+ }
+ binding.accountDetailsFamilyData.setOnClickListener {
+ presenter.onStudentInfoSelected(StudentInfoView.Type.FAMILY)
+ }
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ menu[0].isVisible = false
+ inflater.inflate(R.menu.action_menu_account_details, menu)
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return if (item.itemId == R.id.accountDetailsMenuEdit) {
+ presenter.onAccountEditSelected()
+ true
+ } else false
+ }
+
+ override fun showAccountData(student: Student) {
+ with(binding) {
+ accountDetailsName.text = student.nickOrName
+ accountDetailsSchool.text = student.schoolName
+ }
+ }
+
+ override fun enableSelectStudentButton(enable: Boolean) {
+ binding.accountDetailsSelect.isEnabled = enable
+ }
+
+ override fun showAccountEditDetailsDialog(student: Student) {
+ (requireActivity() as MainActivity).showDialogFragment(
+ AccountEditDialog.newInstance(student)
+ )
+ }
+
+ override fun showLogoutConfirmDialog() {
+ context?.let {
+ AlertDialog.Builder(it)
+ .setTitle(R.string.account_logout_student)
+ .setMessage(R.string.account_confirm)
+ .setPositiveButton(R.string.account_logout) { _, _ -> presenter.onLogoutConfirm() }
+ .setNegativeButton(android.R.string.cancel) { _, _ -> }
+ .show()
+ }
+ }
+
+ override fun popView() {
+ (requireActivity() as MainActivity).popView(2)
+ }
+
+ override fun recreateMainView() {
+ requireActivity().recreate()
+ }
+
+ override fun openStudentInfoView(
+ infoType: StudentInfoView.Type,
+ studentWithSemesters: StudentWithSemesters
+ ) {
+ (requireActivity() as MainActivity).pushView(
+ StudentInfoFragment.newInstance(
+ infoType,
+ studentWithSemesters
+ )
+ )
+ }
+
+ override fun showErrorView(show: Boolean) {
+ binding.accountDetailsError.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun setErrorDetails(message: String) {
+ binding.accountDetailsErrorMessage.text = message
+ }
+
+ override fun showProgress(show: Boolean) {
+ binding.accountDetailsProgress.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun showContent(show: Boolean) {
+ binding.accountDetailsContent.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun onDestroyView() {
+ presenter.onDetachView()
+ super.onDestroyView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
new file mode 100644
index 000000000..7b93d3d87
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
@@ -0,0 +1,172 @@
+package io.github.wulkanowy.ui.modules.account.accountdetails
+
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.services.sync.SyncManager
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class AccountDetailsPresenter @Inject constructor(
+ errorHandler: ErrorHandler,
+ studentRepository: StudentRepository,
+ private val syncManager: SyncManager
+) : BasePresenter(errorHandler, studentRepository) {
+
+ private lateinit var studentWithSemesters: StudentWithSemesters
+
+ private lateinit var lastError: Throwable
+
+ private var studentId: Long? = null
+
+ fun onAttachView(view: AccountDetailsView, studentWithSemesters: StudentWithSemesters) {
+ super.onAttachView(view)
+ studentId = studentWithSemesters.student.id
+
+ view.initView()
+ errorHandler.showErrorMessage = ::showErrorViewOnError
+ Timber.i("Account details view was initialized")
+ loadData()
+ }
+
+ fun onRetry() {
+ view?.run {
+ showErrorView(false)
+ showProgress(true)
+ }
+ loadData()
+ }
+
+ fun onDetailsClick() {
+ view?.showErrorDetailsDialog(lastError)
+ }
+
+ private fun loadData() {
+ flowWithResource { studentRepository.getSavedStudents() }
+ .map { studentWithSemesters ->
+ Resource(
+ data = studentWithSemesters.data?.single { it.student.id == studentId },
+ status = studentWithSemesters.status,
+ error = studentWithSemesters.error
+ )
+ }
+ .onEach {
+ when (it.status) {
+ Status.LOADING -> {
+ view?.run {
+ showProgress(true)
+ showContent(false)
+ }
+ Timber.i("Loading account details view started")
+ }
+ Status.SUCCESS -> {
+ Timber.i("Loading account details view result: Success")
+ studentWithSemesters = it.data!!
+ view?.run {
+ showAccountData(studentWithSemesters.student)
+ enableSelectStudentButton(!studentWithSemesters.student.isCurrent)
+ showContent(true)
+ showErrorView(false)
+ }
+ }
+ Status.ERROR -> {
+ Timber.i("Loading account details view result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
+ }
+ }
+ .afterLoading { view?.showProgress(false) }
+ .launch()
+ }
+
+ fun onAccountEditSelected() {
+ view?.showAccountEditDetailsDialog(studentWithSemesters.student)
+ }
+
+ fun onStudentInfoSelected(infoType: StudentInfoView.Type) {
+ view?.openStudentInfoView(infoType, studentWithSemesters)
+ }
+
+ fun onStudentSelect() {
+ Timber.i("Select student ${studentWithSemesters.student.id}")
+
+ flowWithResource { studentRepository.switchStudent(studentWithSemesters) }
+ .onEach {
+ when (it.status) {
+ Status.LOADING -> Timber.i("Attempt to change a student")
+ Status.SUCCESS -> {
+ Timber.i("Change a student result: Success")
+ view?.recreateMainView()
+ }
+ Status.ERROR -> {
+ Timber.i("Change a student result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
+ }
+ }.afterLoading {
+ view?.popView()
+ }.launch("switch")
+ }
+
+ fun onRemoveSelected() {
+ Timber.i("Select remove account")
+ view?.showLogoutConfirmDialog()
+ }
+
+ fun onLogoutConfirm() {
+ flowWithResource {
+ val studentToLogout = studentWithSemesters.student
+
+ studentRepository.logoutStudent(studentToLogout)
+ val students = studentRepository.getSavedStudents(false)
+
+ if (studentToLogout.isCurrent && students.isNotEmpty()) {
+ studentRepository.switchStudent(students[0])
+ }
+
+ return@flowWithResource students
+ }.onEach {
+ when (it.status) {
+ Status.LOADING -> Timber.i("Attempt to logout user")
+ Status.SUCCESS -> view?.run {
+ when {
+ it.data!!.isEmpty() -> {
+ Timber.i("Logout result: Open login view")
+ syncManager.stopSyncWorker()
+ openClearLoginView()
+ }
+ studentWithSemesters.student.isCurrent -> {
+ Timber.i("Logout result: Logout student and switch to another")
+ recreateMainView()
+ }
+ else -> Timber.i("Logout result: Logout student")
+ }
+ }
+ Status.ERROR -> {
+ Timber.i("Logout result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
+ }
+ }.afterLoading {
+ view?.popView()
+ }.launch("logout")
+ }
+
+ private fun showErrorViewOnError(message: String, error: Throwable) {
+ view?.run {
+ lastError = error
+ setErrorDetails(message)
+ showErrorView(true)
+ showContent(false)
+ showProgress(false)
+ }
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
new file mode 100644
index 000000000..652f0c1aa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.ui.modules.account.accountdetails
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
+
+interface AccountDetailsView : BaseView {
+
+ fun initView()
+
+ fun showAccountData(student: Student)
+
+ fun showAccountEditDetailsDialog(student: Student)
+
+ fun showLogoutConfirmDialog()
+
+ fun popView()
+
+ fun recreateMainView()
+
+ fun enableSelectStudentButton(enable: Boolean)
+
+ fun openStudentInfoView(
+ infoType: StudentInfoView.Type,
+ studentWithSemesters: StudentWithSemesters
+ )
+
+ fun showErrorView(show: Boolean)
+
+ fun setErrorDetails(message: String)
+
+ fun showProgress(show: Boolean)
+
+ fun showContent(show: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
new file mode 100644
index 000000000..89f23e29f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
@@ -0,0 +1,72 @@
+package io.github.wulkanowy.ui.modules.account.accountedit
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.DialogAccountEditBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AccountEditDialog : BaseDialogFragment(), AccountEditView {
+
+ @Inject
+ lateinit var presenter: AccountEditPresenter
+
+ companion object {
+
+ private const val ARGUMENT_KEY = "student_with_semesters"
+
+ fun newInstance(student: Student) =
+ AccountEditDialog().apply {
+ arguments = Bundle().apply {
+ putSerializable(ARGUMENT_KEY, student)
+ }
+ }
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setStyle(STYLE_NO_TITLE, 0)
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View = DialogAccountEditBinding.inflate(inflater).apply { binding = this }.root
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ presenter.onAttachView(this, requireArguments()[ARGUMENT_KEY] as Student)
+ }
+
+ override fun initView() {
+ with(binding) {
+ accountEditDetailsCancel.setOnClickListener { dismiss() }
+ accountEditDetailsSave.setOnClickListener {
+ presenter.changeStudentNick(binding.accountEditDetailsNickText.text.toString())
+ }
+ }
+ }
+
+ override fun showCurrentNick(nick: String) {
+ binding.accountEditDetailsNickText.setText(nick)
+ }
+
+ override fun popView() {
+ dismiss()
+ }
+
+ override fun recreateMainView() {
+ activity?.recreate()
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ presenter.onDetachView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
new file mode 100644
index 000000000..7830605c6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.account.accountedit
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentNick
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class AccountEditPresenter @Inject constructor(
+ errorHandler: ErrorHandler,
+ studentRepository: StudentRepository
+) : BasePresenter(errorHandler, studentRepository) {
+
+ lateinit var student: Student
+
+ fun onAttachView(view: AccountEditView, student: Student) {
+ super.onAttachView(view)
+ this.student = student
+
+ with(view) {
+ initView()
+ showCurrentNick(student.nick.trim())
+ }
+ Timber.i("Account edit dialog view was initialized")
+ }
+
+ fun changeStudentNick(nick: String) {
+ flowWithResource {
+ val studentNick =
+ StudentNick(nick = nick.trim()).apply { id = student.id }
+ studentRepository.updateStudentNick(studentNick)
+ }.onEach {
+ when (it.status) {
+ Status.LOADING -> Timber.i("Attempt to change a student nick")
+ Status.SUCCESS -> {
+ Timber.i("Change a student nick result: Success")
+ view?.recreateMainView()
+ }
+ Status.ERROR -> {
+ Timber.i("Change a student result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
+ }
+ }
+ .afterLoading { view?.popView() }
+ .launch()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt
new file mode 100644
index 000000000..b25eec6c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.ui.modules.account.accountedit
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface AccountEditView : BaseView {
+
+ fun initView()
+
+ fun popView()
+
+ fun recreateMainView()
+
+ fun showCurrentNick(nick: String)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
new file mode 100644
index 000000000..cb64a8fd3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
@@ -0,0 +1,82 @@
+package io.github.wulkanowy.ui.modules.account.accountquick
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.databinding.DialogAccountQuickBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.modules.account.AccountAdapter
+import io.github.wulkanowy.ui.modules.account.AccountFragment
+import io.github.wulkanowy.ui.modules.account.AccountItem
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AccountQuickDialog : BaseDialogFragment(), AccountQuickView {
+
+ @Inject
+ lateinit var accountAdapter: AccountAdapter
+
+ @Inject
+ lateinit var presenter: AccountQuickPresenter
+
+ companion object {
+ fun newInstance() = AccountQuickDialog()
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setStyle(STYLE_NO_TITLE, 0)
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ) = DialogAccountQuickBinding.inflate(inflater).apply { binding = this }.root
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ presenter.onAttachView(this)
+ }
+
+ override fun initView() {
+ binding.accountQuickDialogManger.setOnClickListener { presenter.onManagerSelected() }
+
+ with(accountAdapter) {
+ isAccountQuickDialogMode = true
+ onClickListener = presenter::onStudentSelect
+ }
+
+ with(binding.accountQuickDialogRecycler) {
+ layoutManager = LinearLayoutManager(context)
+ adapter = accountAdapter
+ }
+ }
+
+ override fun updateData(data: List>) {
+ with(accountAdapter) {
+ items = data
+ notifyDataSetChanged()
+ }
+ }
+
+ override fun popView() {
+ dismiss()
+ }
+
+ override fun recreateMainView() {
+ activity?.recreate()
+ }
+
+ override fun openAccountView() {
+ (requireActivity() as MainActivity).pushView(AccountFragment.newInstance())
+ }
+
+ override fun onDestroyView() {
+ presenter.onDetachView()
+ super.onDestroyView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt
new file mode 100644
index 000000000..43cc8bc77
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt
@@ -0,0 +1,79 @@
+package io.github.wulkanowy.ui.modules.account.accountquick
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.account.AccountItem
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class AccountQuickPresenter @Inject constructor(
+ errorHandler: ErrorHandler,
+ studentRepository: StudentRepository
+) : BasePresenter(errorHandler, studentRepository) {
+
+ override fun onAttachView(view: AccountQuickView) {
+ super.onAttachView(view)
+ view.initView()
+ Timber.i("Account quick dialog view was initialized")
+ loadData()
+ }
+
+ fun onManagerSelected() {
+ view?.run {
+ openAccountView()
+ popView()
+ }
+ }
+
+ fun onStudentSelect(studentWithSemesters: StudentWithSemesters) {
+ Timber.i("Select student ${studentWithSemesters.student.id}")
+
+ if (studentWithSemesters.student.isCurrent) {
+ view?.popView()
+ return
+ }
+
+ flowWithResource { studentRepository.switchStudent(studentWithSemesters) }
+ .onEach {
+ when (it.status) {
+ Status.LOADING -> Timber.i("Attempt to change a student")
+ Status.SUCCESS -> {
+ Timber.i("Change a student result: Success")
+ view?.recreateMainView()
+ }
+ Status.ERROR -> {
+ Timber.i("Change a student result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
+ }
+ }
+ .afterLoading { view?.popView() }
+ .launch("switch")
+ }
+
+ private fun loadData() {
+ flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
+ when (it.status) {
+ Status.LOADING -> Timber.i("Loading account data started")
+ Status.SUCCESS -> {
+ Timber.i("Loading account result: Success")
+ view?.updateData(createAccountItems(it.data!!))
+ }
+ Status.ERROR -> {
+ Timber.i("Loading account result: An exception occurred")
+ errorHandler.dispatch(it.error!!)
+ }
+ }
+ }.launch()
+ }
+
+ private fun createAccountItems(items: List) = items.map {
+ AccountItem(it, AccountItem.ViewType.ITEM)
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickView.kt
new file mode 100644
index 000000000..4a9420d99
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickView.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.ui.modules.account.accountquick
+
+import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.account.AccountItem
+
+interface AccountQuickView : BaseView {
+
+ fun initView()
+
+ fun updateData(data: List>)
+
+ fun recreateMainView()
+
+ fun popView()
+
+ fun openAccountView()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
index 8e8a6149d..03ec1c842 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -7,7 +7,7 @@ import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
+import io.github.wulkanowy.data.enums.SentExcuseStatus
import io.github.wulkanowy.databinding.ItemAttendanceBinding
import io.github.wulkanowy.utils.description
import javax.inject.Inject
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index c7caef069..00d5aae87 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -26,6 +26,7 @@ import io.github.wulkanowy.ui.modules.main.MainView
import io.github.wulkanowy.ui.widgets.DividerItemDecoration
import io.github.wulkanowy.utils.SchooldaysRangeLimiter
import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.getThemeAttrColor
import java.time.LocalDate
import javax.inject.Inject
@@ -60,6 +61,7 @@ class AttendanceFragment : BaseFragment(R.layout.frag
override val excuseActionMode: Boolean get() = attendanceAdapter.excuseActionMode
private var actionMode: ActionMode? = null
+
private val actionModeCallback = object : ActionMode.Callback {
override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
val inflater = mode.menuInflater
@@ -111,6 +113,8 @@ class AttendanceFragment : BaseFragment(R.layout.frag
with(binding) {
attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+ attendanceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+ attendanceSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
@@ -191,8 +195,8 @@ class AttendanceFragment : BaseFragment(R.layout.frag
binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
}
- override fun hideRefresh() {
- binding.attendanceSwipe.isRefreshing = false
+ override fun showRefresh(show: Boolean) {
+ binding.attendanceSwipe.isRefreshing = show
}
override fun showPreButton(show: Boolean) {
@@ -222,6 +226,7 @@ class AttendanceFragment : BaseFragment(R.layout.frag
setDateRangeLimiter(SchooldaysRangeLimiter())
version = DatePickerDialog.Version.VERSION_2
scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
+ vibrate(false)
show(this@AttendanceFragment.parentFragmentManager, null)
}
}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 158f08ba3..68802c0c7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -3,13 +3,13 @@ package io.github.wulkanowy.ui.modules.attendance
import android.annotation.SuppressLint
import io.github.wulkanowy.data.Status
import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
-import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.data.repositories.AttendanceRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.AnalyticsHelper
import io.github.wulkanowy.utils.afterLoading
import io.github.wulkanowy.utils.flowWithResource
import io.github.wulkanowy.utils.flowWithResourceIn
@@ -34,7 +34,7 @@ class AttendancePresenter @Inject constructor(
private val attendanceRepository: AttendanceRepository,
private val semesterRepository: SemesterRepository,
private val prefRepository: PreferencesRepository,
- private val analytics: FirebaseAnalyticsHelper
+ private val analytics: AnalyticsHelper
) : BasePresenter(errorHandler, studentRepository) {
private var baseDate: LocalDate = now().previousOrSameSchoolDay
@@ -51,23 +51,23 @@ class AttendancePresenter @Inject constructor(
view.initView()
Timber.i("Attendance view was initialized")
errorHandler.showErrorMessage = ::showErrorViewOnError
- loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+ reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
+ loadData()
if (currentDate.isHolidays) setBaseDateOnHolidays()
- reloadView()
}
fun onPreviousDay() {
view?.finishActionMode()
attendanceToExcuseList.clear()
- loadData(currentDate.previousSchoolDay)
- reloadView()
+ reloadView(currentDate.previousSchoolDay)
+ loadData()
}
fun onNextDay() {
view?.finishActionMode()
attendanceToExcuseList.clear()
- loadData(currentDate.nextSchoolDay)
- reloadView()
+ reloadView(currentDate.nextSchoolDay)
+ loadData()
}
fun onPickDate() {
@@ -75,13 +75,13 @@ class AttendancePresenter @Inject constructor(
}
fun onDateSet(year: Int, month: Int, day: Int) {
- loadData(LocalDate.of(year, month, day))
- reloadView()
+ reloadView(LocalDate.of(year, month, day))
+ loadData()
}
fun onSwipeRefresh() {
Timber.i("Force refreshing the attendance")
- loadData(currentDate, true)
+ loadData(true)
}
fun onRetry() {
@@ -89,7 +89,7 @@ class AttendancePresenter @Inject constructor(
showErrorView(false)
showProgress(true)
}
- loadData(currentDate, true)
+ loadData(true)
}
fun onDetailsClick() {
@@ -102,8 +102,8 @@ class AttendancePresenter @Inject constructor(
if (view.currentStackSize == 1) {
baseDate.also {
if (currentDate != it) {
- loadData(it)
- reloadView()
+ reloadView(it)
+ loadData()
} else if (!view.isViewEmpty) view.resetView()
}
} else view.popView()
@@ -184,17 +184,30 @@ class AttendancePresenter @Inject constructor(
}.launch("holidays")
}
- private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+ private fun loadData(forceRefresh: Boolean = false) {
Timber.i("Loading attendance data started")
- currentDate = date
flowWithResourceIn {
val student = studentRepository.getCurrentStudent()
val semester = semesterRepository.getCurrentSemester(student)
- attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
+ attendanceRepository.getAttendance(student, semester, currentDate, currentDate, forceRefresh)
}.onEach {
when (it.status) {
- Status.LOADING -> view?.showExcuseButton(false)
+ Status.LOADING -> {
+ view?.showExcuseButton(false)
+ if (!it.data.isNullOrEmpty()) {
+ view?.run {
+ enableSwipe(true)
+ showRefresh(true)
+ showProgress(false)
+ showContent(true)
+ updateData(it.data.let { items ->
+ if (prefRepository.isShowPresent) items
+ else items.filter { item -> !item.presence }
+ }.sortedBy { item -> item.number })
+ }
+ }
+ }
Status.SUCCESS -> {
Timber.i("Loading attendance result: Success")
view?.apply {
@@ -220,7 +233,7 @@ class AttendancePresenter @Inject constructor(
}
}.afterLoading {
view?.run {
- hideRefresh()
+ showRefresh(false)
showProgress(false)
enableSwipe(true)
}
@@ -250,12 +263,12 @@ class AttendancePresenter @Inject constructor(
showContent(true)
showProgress(false)
}
- loadData(currentDate, forceRefresh = true)
+ loadData(forceRefresh = true)
}
Status.ERROR -> {
Timber.i("Excusing for absence result: An exception occurred")
errorHandler.dispatch(it.error!!)
- loadData(currentDate)
+ loadData()
}
}
}.launch("excuse")
@@ -272,11 +285,14 @@ class AttendancePresenter @Inject constructor(
}
}
- private fun reloadView() {
+ private fun reloadView(date: LocalDate) {
+ currentDate = date
+
Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
view?.apply {
showProgress(true)
enableSwipe(false)
+ showRefresh(false)
showContent(false)
showEmpty(false)
showErrorView(false)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index d54fb8bf1..0459dfcf6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -24,7 +24,7 @@ interface AttendanceView : BaseView {
fun clearData()
- fun hideRefresh()
+ fun showRefresh(show: Boolean)
fun resetView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index 2f8622374..118971e62 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -15,6 +15,7 @@ import io.github.wulkanowy.databinding.FragmentAttendanceSummaryBinding
import io.github.wulkanowy.ui.base.BaseFragment
import io.github.wulkanowy.ui.modules.main.MainView
import io.github.wulkanowy.utils.dpToPx
+import io.github.wulkanowy.utils.getThemeAttrColor
import io.github.wulkanowy.utils.setOnItemSelectedListener
import javax.inject.Inject
@@ -56,6 +57,8 @@ class AttendanceSummaryFragment :
with(binding) {
attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+ attendanceSummarySwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+ attendanceSummarySwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
}
@@ -121,8 +124,8 @@ class AttendanceSummaryFragment :
binding.attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
}
- override fun hideRefresh() {
- binding.attendanceSummarySwipe.isRefreshing = false
+ override fun showRefresh(show: Boolean) {
+ binding.attendanceSummarySwipe.isRefreshing = show
}
override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index e5dce9ac8..e53cda749 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -1,14 +1,15 @@
package io.github.wulkanowy.ui.modules.attendance.summary
import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.subject.SubjectRepository
+import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.SubjectRepository
import io.github.wulkanowy.ui.base.BasePresenter
import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.AnalyticsHelper
import io.github.wulkanowy.utils.afterLoading
import io.github.wulkanowy.utils.flowWithResourceIn
import kotlinx.coroutines.flow.onEach
@@ -22,7 +23,7 @@ class AttendanceSummaryPresenter @Inject constructor(
private val attendanceSummaryRepository: AttendanceSummaryRepository,
private val subjectRepository: SubjectRepository,
private val semesterRepository: SemesterRepository,
- private val analytics: FirebaseAnalyticsHelper
+ private val analytics: AnalyticsHelper
) : BasePresenter(errorHandler, studentRepository) {
private var subjects = emptyList()
@@ -74,6 +75,8 @@ class AttendanceSummaryPresenter @Inject constructor(
}
private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
+ Timber.i("Loading attendance summary data started")
+
currentSubjectId = subjectId
flowWithResourceIn {
@@ -82,15 +85,23 @@ class AttendanceSummaryPresenter @Inject constructor(
attendanceSummaryRepository.getAttendanceSummary(student, semester, subjectId, forceRefresh)
}.onEach {
when (it.status) {
- Status.LOADING -> Timber.i("Loading attendance summary data started")
+ Status.LOADING -> {
+ if (!it.data.isNullOrEmpty()) {
+ view?.run {
+ enableSwipe(true)
+ showRefresh(true)
+ showProgress(false)
+ showContent(true)
+ updateDataSet(sortItems(it.data))
+ }
+ }
+ }
Status.SUCCESS -> {
Timber.i("Loading attendance summary result: Success")
view?.apply {
showEmpty(it.data!!.isEmpty())
showContent(it.data.isNotEmpty())
- updateDataSet(it.data.sortedByDescending { item ->
- if (item.month.value <= Month.JUNE.value) item.month.value + 12 else item.month.value
- })
+ updateDataSet(sortItems(it.data))
}
analytics.logEvent(
"load_data",
@@ -106,13 +117,17 @@ class AttendanceSummaryPresenter @Inject constructor(
}
}.afterLoading {
view?.run {
- hideRefresh()
+ showRefresh(false)
showProgress(false)
enableSwipe(true)
}
}.launch()
}
+ private fun sortItems(items: List) = items.sortedByDescending { item ->
+ if (item.month.value <= Month.JUNE.value) item.month.value + 12 else item.month.value
+ }
+
private fun showErrorViewOnError(message: String, error: Throwable) {
view?.run {
if (isViewEmpty) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
index dd4053c72..66f370c5c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@@ -9,7 +9,7 @@ interface AttendanceSummaryView : BaseView {
fun initView()
- fun hideRefresh()
+ fun showRefresh(show: Boolean)
fun showContent(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceAdapter.kt
new file mode 100644
index 000000000..c87286149
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceAdapter.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.ui.modules.conference
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.databinding.ItemConferenceBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class ConferenceAdapter @Inject constructor() :
+ RecyclerView.Adapter() {
+
+ var items = emptyList()
+
+ override fun getItemCount() = items.size
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+ ItemConferenceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+ )
+
+ override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+ val item = items[position]
+ with(holder.binding) {
+ conferenceItemDate.text = item.date.toFormattedString("dd.MM.yyyy HH:mm")
+ conferenceItemName.text = item.presentOnConference
+ conferenceItemTitle.text = item.title
+ conferenceItemSubject.text = item.subject
+ conferenceItemContent.text = item.agenda
+ conferenceItemContent.visibility = if (item.agenda.isBlank()) View.GONE else View.VISIBLE
+ }
+ }
+
+ class ItemViewHolder(val binding: ItemConferenceBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
new file mode 100644
index 000000000..dd10a65e0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
@@ -0,0 +1,105 @@
+package io.github.wulkanowy.ui.modules.conference
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.databinding.FragmentConferenceBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ConferenceFragment : BaseFragment(R.layout.fragment_conference),
+ ConferenceView, MainView.TitledView {
+
+ @Inject
+ lateinit var presenter: ConferencePresenter
+
+ @Inject
+ lateinit var conferencesAdapter: ConferenceAdapter
+
+ companion object {
+ fun newInstance() = ConferenceFragment()
+ }
+
+ override val isViewEmpty: Boolean
+ get() = conferencesAdapter.items.isEmpty()
+
+ override val titleStringId: Int
+ get() = R.string.conferences_title
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ binding = FragmentConferenceBinding.bind(view)
+ messageContainer = binding.conferenceRecycler
+ presenter.onAttachView(this)
+ }
+
+ override fun initView() {
+ with(binding.conferenceRecycler) {
+ layoutManager = LinearLayoutManager(context)
+ adapter = conferencesAdapter
+ addItemDecoration(DividerItemDecoration(context))
+ }
+
+ with(binding) {
+ conferenceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+ conferenceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+ conferenceSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+ conferenceErrorRetry.setOnClickListener { presenter.onRetry() }
+ conferenceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+ }
+ }
+
+ override fun updateData(data: List) {
+ with(conferencesAdapter) {
+ items = data
+ notifyDataSetChanged()
+ }
+ }
+
+ override fun clearData() {
+ with(conferencesAdapter) {
+ items = emptyList()
+ notifyDataSetChanged()
+ }
+ }
+
+ override fun showRefresh(show: Boolean) {
+ binding.conferenceSwipe.isRefreshing = show
+ }
+
+ override fun showProgress(show: Boolean) {
+ binding.conferenceProgress.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun showEmpty(show: Boolean) {
+ binding.conferenceEmpty.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun showErrorView(show: Boolean) {
+ binding.conferenceError.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun setErrorDetails(message: String) {
+ binding.conferenceErrorMessage.text = message
+ }
+
+ override fun enableSwipe(enable: Boolean) {
+ binding.conferenceSwipe.isEnabled = enable
+ }
+
+ override fun showContent(show: Boolean) {
+ binding.conferenceRecycler.visibility = if (show) View.VISIBLE else View.GONE
+ }
+
+ override fun onDestroyView() {
+ presenter.onDetachView()
+ super.onDestroyView()
+ }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
new file mode 100644
index 000000000..cc7e50db5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
@@ -0,0 +1,108 @@
+package io.github.wulkanowy.ui.modules.conference
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.repositories.ConferenceRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class ConferencePresenter @Inject constructor(
+ errorHandler: ErrorHandler,
+ studentRepository: StudentRepository,
+ private val semesterRepository: SemesterRepository,
+ private val conferenceRepository: ConferenceRepository,
+ private val analytics: AnalyticsHelper
+) : BasePresenter