From f305a7a5992f0a682bd70f578fbd353c8b81f922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Wed, 13 Feb 2019 21:44:40 +0100 Subject: [PATCH] Sort repositories (#244) --- .../repositories/local/AttendanceLocalTest.kt | 1 + .../local/CompletedLessonsLocalTest.kt | 1 + .../data/repositories/local/ExamLocalTest.kt | 1 + .../local/LuckyNumberLocalTest.kt | 1 + .../repositories/local/StudentLocalTest.kt | 1 + .../repositories/local/TimetableLocalTest.kt | 1 + .../java/io/github/wulkanowy/WulkanowyApp.kt | 2 +- .../github/wulkanowy/data/RepositoryModule.kt | 2 +- .../{local => attendance}/AttendanceLocal.kt | 4 ++- .../AttendanceRemote.kt | 2 +- .../{ => attendance}/AttendanceRepository.kt | 4 +-- .../AttendanceSummaryLocal.kt | 4 ++- .../AttendanceSummaryRemote.kt | 2 +- .../AttendanceSummaryRepository.kt | 4 +-- .../CompletedLessonsLocal.kt | 2 +- .../CompletedLessonsRemote.kt | 2 +- .../CompletedLessonsRepository.kt | 4 +-- .../repositories/{local => exam}/ExamLocal.kt | 4 ++- .../{remote => exam}/ExamRemote.kt | 4 ++- .../repositories/{ => exam}/ExamRepository.kt | 4 +-- .../{local => grade}/GradeLocal.kt | 2 +- .../{remote => grade}/GradeRemote.kt | 2 +- .../{ => grade}/GradeRepository.kt | 4 +-- .../GradeSummaryLocal.kt | 2 +- .../GradeSummaryRemote.kt | 2 +- .../GradeSummaryRepository.kt | 4 +-- .../{local => homework}/HomeworkLocal.kt | 2 +- .../{remote => homework}/HomeworkRemote.kt | 2 +- .../{ => homework}/HomeworkRepository.kt | 4 +-- .../LuckyNumberLocal.kt | 2 +- .../LuckyNumberRemote.kt | 2 +- .../LuckyNumberRepository.kt | 4 +-- .../MessageLocal.kt} | 9 +++--- .../MessageRemote.kt} | 9 +++--- .../MessageRepository.kt} | 10 +++---- .../repositories/{local => note}/NoteLocal.kt | 2 +- .../{remote => note}/NoteRemote.kt | 2 +- .../repositories/{ => note}/NoteRepository.kt | 4 +-- .../PreferencesRepository.kt | 2 +- .../{local => semester}/SemesterLocal.kt | 2 +- .../{remote => semester}/SemesterRemote.kt | 2 +- .../{ => semester}/SemesterRepository.kt | 4 +-- .../{local => student}/StudentLocal.kt | 2 +- .../{remote => student}/StudentRemote.kt | 2 +- .../{ => student}/StudentRepository.kt | 4 +-- .../{local => subject}/SubjectLocal.kt | 2 +- .../{remote => subject}/SubjectRemote.kt | 2 +- .../{ => subject}/SubjectRepostory.kt | 4 +-- .../{local => timetable}/TimetableLocal.kt | 4 ++- .../{remote => timetable}/TimetableRemote.kt | 4 ++- .../{ => timetable}/TimetableRepository.kt | 4 +-- .../wulkanowy/services/job/ServiceHelper.kt | 2 +- .../wulkanowy/services/job/SyncWorker.kt | 30 +++++++++---------- .../widgets/TimetableWidgetService.kt | 6 ++-- .../ui/modules/account/AccountPresenter.kt | 2 +- .../modules/attendance/AttendancePresenter.kt | 8 ++--- .../summary/AttendanceSummaryPresenter.kt | 8 ++--- .../ui/modules/exam/ExamPresenter.kt | 6 ++-- .../ui/modules/grade/GradePresenter.kt | 4 +-- .../grade/details/GradeDetailsPresenter.kt | 8 ++--- .../grade/summary/GradeSummaryPresenter.kt | 10 +++---- .../ui/modules/homework/HomeworkPresenter.kt | 6 ++-- .../modules/login/form/LoginFormPresenter.kt | 2 +- .../LoginStudentSelectPresenter.kt | 4 +-- .../login/symbol/LoginSymbolPresenter.kt | 2 +- .../luckynumber/LuckyNumberPresenter.kt | 6 ++-- .../ui/modules/main/MainPresenter.kt | 4 +-- .../ui/modules/message/MessageFragment.kt | 6 ++-- .../preview/MessagePreviewPresenter.kt | 8 ++--- .../modules/message/tab/MessageTabFragment.kt | 6 ++-- .../message/tab/MessageTabPresenter.kt | 14 ++++----- .../ui/modules/note/NotePresenter.kt | 6 ++-- .../ui/modules/settings/SettingsPresenter.kt | 2 +- .../ui/modules/splash/SplashPresenter.kt | 2 +- .../modules/timetable/TimetablePresenter.kt | 6 ++-- .../completed/CompletedLessonsPresenter.kt | 6 ++-- .../timetable/TimetableWidgetFactory.kt | 6 ++-- .../remote/AttendanceRemoteTest.kt | 1 + .../remote/CompletedLessonsRemoteTest.kt | 1 + .../repositories/remote/ExamRemoteTest.kt | 1 + .../remote/LuckyNumberRemoteTest.kt | 1 + .../repositories/remote/StudentRemoteTest.kt | 1 + .../remote/TimetableRemoteTest.kt | 1 + .../login/form/LoginFormPresenterTest.kt | 2 +- .../LoginStudentSelectPresenterTest.kt | 4 +-- .../ui/modules/main/MainPresenterTest.kt | 4 +-- .../ui/modules/splash/SplashPresenterTest.kt | 2 +- 87 files changed, 170 insertions(+), 174 deletions(-) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => attendance}/AttendanceLocal.kt (89%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => attendance}/AttendanceRemote.kt (95%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => attendance}/AttendanceRepository.kt (91%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => attendancesummary}/AttendanceSummaryLocal.kt (88%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => attendancesummary}/AttendanceSummaryRemote.kt (95%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => attendancesummary}/AttendanceSummaryRepository.kt (88%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => completedlessons}/CompletedLessonsLocal.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => completedlessons}/CompletedLessonsRemote.kt (95%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => completedlessons}/CompletedLessonsRepository.kt (91%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => exam}/ExamLocal.kt (88%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => exam}/ExamRemote.kt (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => exam}/ExamRepository.kt (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => grade}/GradeLocal.kt (95%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => grade}/GradeRemote.kt (96%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => grade}/GradeRepository.kt (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => gradessummary}/GradeSummaryLocal.kt (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => gradessummary}/GradeSummaryRemote.kt (94%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => gradessummary}/GradeSummaryRepository.kt (88%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => homework}/HomeworkLocal.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => homework}/HomeworkRemote.kt (95%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => homework}/HomeworkRepository.kt (89%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => luckynumber}/LuckyNumberLocal.kt (94%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => luckynumber}/LuckyNumberRemote.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => luckynumber}/LuckyNumberRepository.kt (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local/MessagesLocal.kt => message/MessageLocal.kt} (72%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote/MessagesRemote.kt => message/MessageRemote.kt} (82%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{MessagesRepository.kt => message/MessageRepository.kt} (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => note}/NoteLocal.kt (95%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => note}/NoteRemote.kt (94%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => note}/NoteRepository.kt (91%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => preferences}/PreferencesRepository.kt (97%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => semester}/SemesterLocal.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => semester}/SemesterRemote.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => semester}/SemesterRepository.kt (90%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => student}/StudentLocal.kt (96%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => student}/StudentRemote.kt (94%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => student}/StudentRepository.kt (91%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => subject}/SubjectLocal.kt (92%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => subject}/SubjectRemote.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => subject}/SubjectRepostory.kt (88%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{local => timetable}/TimetableLocal.kt (88%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{remote => timetable}/TimetableRemote.kt (93%) rename app/src/main/java/io/github/wulkanowy/data/repositories/{ => timetable}/TimetableRepository.kt (92%) diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt index 8cbd13cd3..bbae53fd6 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/AttendanceLocalTest.kt @@ -6,6 +6,7 @@ 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 io.github.wulkanowy.data.repositories.attendance.AttendanceLocal import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocalTest.kt index 9da6fdf6e..dd6c00b08 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocalTest.kt @@ -6,6 +6,7 @@ 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 io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsLocal import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt index c60348e3a..4ad83f995 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/ExamLocalTest.kt @@ -6,6 +6,7 @@ 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 io.github.wulkanowy.data.repositories.exam.ExamLocal import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocalTest.kt index 67ac4c2b4..0b498f8c9 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocalTest.kt @@ -6,6 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import io.github.wulkanowy.data.db.AppDatabase import io.github.wulkanowy.data.db.entities.LuckyNumber import io.github.wulkanowy.data.db.entities.Semester +import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberLocal import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt index 3d4427116..d7aca30a3 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/StudentLocalTest.kt @@ -7,6 +7,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import io.github.wulkanowy.data.db.AppDatabase import io.github.wulkanowy.data.db.SharedPrefHelper import io.github.wulkanowy.data.db.entities.Student +import io.github.wulkanowy.data.repositories.student.StudentLocal import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt index df0a79948..76874df11 100644 --- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt +++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/local/TimetableLocalTest.kt @@ -6,6 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import io.github.wulkanowy.data.db.AppDatabase import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Timetable +import io.github.wulkanowy.data.repositories.timetable.TimetableLocal import org.junit.After import org.junit.Before import org.junit.Test diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt index 628d6ce6f..59478a515 100644 --- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt +++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt @@ -12,7 +12,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.utils.Log import io.fabric.sdk.android.Fabric import io.github.wulkanowy.BuildConfig.DEBUG -import io.github.wulkanowy.data.repositories.PreferencesRepository +import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository import io.github.wulkanowy.di.DaggerAppComponent import io.github.wulkanowy.utils.CrashlyticsTree import io.github.wulkanowy.utils.DebugLogTree diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt index fc458c694..27bab352a 100644 --- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt +++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt @@ -13,7 +13,7 @@ import dagger.Module import dagger.Provides import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.AppDatabase -import io.github.wulkanowy.data.repositories.PreferencesRepository +import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository import okhttp3.logging.HttpLoggingInterceptor import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC import okhttp3.logging.HttpLoggingInterceptor.Level.NONE diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt similarity index 89% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt index 9a318dba2..6d953bf51 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.attendance import io.github.wulkanowy.data.db.dao.AttendanceDao import io.github.wulkanowy.data.db.entities.Attendance @@ -6,7 +6,9 @@ import io.github.wulkanowy.data.db.entities.Semester import io.reactivex.Maybe import org.threeten.bp.LocalDate import javax.inject.Inject +import javax.inject.Singleton +@Singleton class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) { fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe> { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt similarity index 95% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt index 79047606f..b3544c3f5 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.attendance import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Attendance diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt similarity index 91% rename from app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt index eb7230ae5..f6eb07dae 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.attendance import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Attendance import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.AttendanceLocal -import io.github.wulkanowy.data.repositories.remote.AttendanceRemote import io.github.wulkanowy.utils.friday import io.github.wulkanowy.utils.monday import io.reactivex.Single diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt similarity index 88% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt index 2bb9f1220..60da5ef29 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/AttendanceSummaryLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt @@ -1,11 +1,13 @@ -package io.github.wulkanowy.data.repositories.local +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 io.reactivex.Maybe import javax.inject.Inject +import javax.inject.Singleton +@Singleton class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) { fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe> { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt similarity index 95% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt index 079eb4b8e..d38dd3a4b 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/AttendanceSummaryRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.attendancesummary import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.AttendanceSummary diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt similarity index 88% rename from app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt index 8e21b12c6..04b6e4ed0 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.attendancesummary import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.AttendanceSummary import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.AttendanceSummaryLocal -import io.github.wulkanowy.data.repositories.remote.AttendanceSummaryRemote import io.reactivex.Single import java.net.UnknownHostException import javax.inject.Inject diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt index f3ff42ff3..8ebefb317 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/CompletedLessonsLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.completedlessons import io.github.wulkanowy.data.db.dao.CompletedLessonsDao import io.github.wulkanowy.data.db.entities.CompletedLesson diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt similarity index 95% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt index 0d9b28ac2..58dd5a9d1 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.completedlessons import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.toLocalDate diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt similarity index 91% rename from app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt index b8253d8da..5b5941076 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.completedlessons import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.CompletedLesson import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.CompletedLessonsLocal -import io.github.wulkanowy.data.repositories.remote.CompletedLessonsRemote import io.github.wulkanowy.utils.friday import io.github.wulkanowy.utils.monday import io.reactivex.Single diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt similarity index 88% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt index 3e32a6357..0f484d323 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/ExamLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.exam import io.github.wulkanowy.data.db.dao.ExamDao import io.github.wulkanowy.data.db.entities.Exam @@ -6,7 +6,9 @@ import io.github.wulkanowy.data.db.entities.Semester import io.reactivex.Maybe import org.threeten.bp.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): Maybe> { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt index 3937b768d..f6d653a61 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/ExamRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.exam import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Exam @@ -7,7 +7,9 @@ import io.github.wulkanowy.utils.toLocalDate import io.reactivex.Single import org.threeten.bp.LocalDate import javax.inject.Inject +import javax.inject.Singleton +@Singleton class ExamRemote @Inject constructor(private val api: Api) { fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single> { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt index cb78df53d..a0cb5ba11 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.exam import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Exam import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.ExamLocal -import io.github.wulkanowy.data.repositories.remote.ExamRemote import io.github.wulkanowy.utils.friday import io.github.wulkanowy.utils.monday import io.reactivex.Single diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt similarity index 95% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt index d6d46340f..cdd583aaf 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.grade import io.github.wulkanowy.data.db.dao.GradeDao import io.github.wulkanowy.data.db.entities.Grade diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt similarity index 96% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt index 9c417b3cf..570ab7a77 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.grade import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Grade diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt index 42266955e..6f01e0794 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.grade import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Grade import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.GradeLocal -import io.github.wulkanowy.data.repositories.remote.GradeRemote import io.reactivex.Completable import io.reactivex.Single import java.net.UnknownHostException diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt index 6a72416d2..7ccf7154a 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/GradeSummaryLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.gradessummary import io.github.wulkanowy.data.db.dao.GradeSummaryDao import io.github.wulkanowy.data.db.entities.GradeSummary diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt similarity index 94% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt index af45ca737..d395decf8 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/GradeSummaryRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.gradessummary import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.GradeSummary diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt similarity index 88% rename from app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt index a59a2cd54..b19e07f00 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeSummaryRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.gradessummary import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.GradeSummary import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.GradeSummaryLocal -import io.github.wulkanowy.data.repositories.remote.GradeSummaryRemote import io.reactivex.Single import java.net.UnknownHostException import javax.inject.Inject diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt index ea18d8145..2508b18e2 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/HomeworkLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.homework import io.github.wulkanowy.data.db.dao.HomeworkDao import io.github.wulkanowy.data.db.entities.Homework diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt similarity index 95% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt index 0fdc02512..79884c9ea 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/HomeworkRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.homework import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Homework diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt similarity index 89% rename from app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt index a2a477b56..72c09114a 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.homework import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Homework import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.HomeworkLocal -import io.github.wulkanowy.data.repositories.remote.HomeworkRemote import io.reactivex.Single import org.threeten.bp.LocalDate import java.net.UnknownHostException diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt similarity index 94% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt index a04ea7404..c645736e4 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/LuckyNumberLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.luckynumber import io.github.wulkanowy.data.db.dao.LuckyNumberDao import io.github.wulkanowy.data.db.entities.LuckyNumber diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt index 36ff57f94..1b0f12b3e 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.luckynumber import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.LuckyNumber diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt index 737dc925b..7b69a0586 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.luckynumber import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.LuckyNumber import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.LuckyNumberLocal -import io.github.wulkanowy.data.repositories.remote.LuckyNumberRemote import io.reactivex.Completable import io.reactivex.Maybe import org.threeten.bp.LocalDate diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt similarity index 72% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt index 531cd8b0d..7bac6615f 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/MessagesLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt @@ -1,23 +1,22 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.message import io.github.wulkanowy.data.db.dao.MessagesDao import io.github.wulkanowy.data.db.entities.Message import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.MessagesRepository import io.reactivex.Maybe import javax.inject.Inject import javax.inject.Singleton @Singleton -class MessagesLocal @Inject constructor(private val messagesDb: MessagesDao) { +class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) { fun getMessage(studentId: Int, id: Int): Maybe { return messagesDb.loadOne(studentId, id) } - fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Maybe> { + fun getMessages(studentId: Int, folder: MessageRepository.MessageFolder): Maybe> { return when (folder) { - MessagesRepository.MessageFolder.TRASHED -> messagesDb.loadDeleted(studentId) + MessageRepository.MessageFolder.TRASHED -> messagesDb.loadDeleted(studentId) else -> messagesDb.load(studentId, folder.id) }.filter { !it.isEmpty() } } diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt similarity index 82% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt index bc0f3400a..6f7222a1b 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/MessagesRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt @@ -1,17 +1,18 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.message import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.messages.Folder import io.github.wulkanowy.data.db.entities.Message -import io.github.wulkanowy.data.repositories.MessagesRepository import io.github.wulkanowy.utils.toLocalDateTime import io.reactivex.Single import javax.inject.Inject +import javax.inject.Singleton import io.github.wulkanowy.api.messages.Message as ApiMessage -class MessagesRemote @Inject constructor(private val api: Api) { +@Singleton +class MessageRemote @Inject constructor(private val api: Api) { - fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Single> { + fun getMessages(studentId: Int, folder: MessageRepository.MessageFolder): Single> { return api.getMessages(Folder.valueOf(folder.name)).map { messages -> messages.map { Message( diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt index 85a1e076c..24e8c6bd1 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessagesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt @@ -1,12 +1,10 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.message import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.ApiHelper import io.github.wulkanowy.data.db.entities.Message import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.local.MessagesLocal -import io.github.wulkanowy.data.repositories.remote.MessagesRemote import io.reactivex.Completable import io.reactivex.Single import java.net.UnknownHostException @@ -14,10 +12,10 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class MessagesRepository @Inject constructor( +class MessageRepository @Inject constructor( private val settings: InternetObservingSettings, - private val local: MessagesLocal, - private val remote: MessagesRemote, + private val local: MessageLocal, + private val remote: MessageRemote, private val apiHelper: ApiHelper ) { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt similarity index 95% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt index 543eab9b3..05e061167 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/NoteLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.note import io.github.wulkanowy.data.db.dao.NoteDao import io.github.wulkanowy.data.db.entities.Note diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt similarity index 94% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt index 31f28e113..44ecbde15 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/NoteRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.note import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Note diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt similarity index 91% rename from app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt index 2836894f2..9979d99da 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.note import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Note import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.local.NoteLocal -import io.github.wulkanowy.data.repositories.remote.NoteRemote import io.reactivex.Completable import io.reactivex.Single import java.net.UnknownHostException diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt similarity index 97% rename from app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt index d83ae667d..571059bfa 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.preferences import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt index 77000478f..5be82d7f9 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SemesterLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.semester import io.github.wulkanowy.data.db.dao.SemesterDao import io.github.wulkanowy.data.db.entities.Semester diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt index 1cf105014..a62db433b 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SemesterRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.semester import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Semester diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt similarity index 90% rename from app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt index b79021064..2ebcfc63c 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt @@ -1,12 +1,10 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.semester import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.ApiHelper import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.local.SemesterLocal -import io.github.wulkanowy.data.repositories.remote.SemesterRemote import io.reactivex.Maybe import io.reactivex.Single import java.net.UnknownHostException diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt similarity index 96% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt index 29ca43fe4..e05e72234 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/StudentLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.student import android.content.Context import io.github.wulkanowy.data.db.dao.StudentDao diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt similarity index 94% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt index 8575b65c6..455c8c662 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/StudentRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.student import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Student diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt similarity index 91% rename from app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt index dc421d993..7ddff0aa4 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.student import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.ApiHelper import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.local.StudentLocal -import io.github.wulkanowy.data.repositories.remote.StudentRemote import io.reactivex.Completable import io.reactivex.Maybe import io.reactivex.Single diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt index 7ca7c1b06..63e334019 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/SubjectLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.subject import io.github.wulkanowy.data.db.dao.SubjectDao import io.github.wulkanowy.data.db.entities.Semester diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt index ae565d48c..88fbb196b 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/SubjectRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.subject import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Semester diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepostory.kt similarity index 88% rename from app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepostory.kt index e3e8a2a7b..7571ecf14 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepostory.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepostory.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.subject import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Subject -import io.github.wulkanowy.data.repositories.local.SubjectLocal -import io.github.wulkanowy.data.repositories.remote.SubjectRemote import io.reactivex.Single import java.net.UnknownHostException import javax.inject.Inject diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt similarity index 88% rename from app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt index 63cc7c94b..a090a55e9 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/local/TimetableLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.local +package io.github.wulkanowy.data.repositories.timetable import io.github.wulkanowy.data.db.dao.TimetableDao import io.github.wulkanowy.data.db.entities.Semester @@ -6,7 +6,9 @@ import io.github.wulkanowy.data.db.entities.Timetable import io.reactivex.Maybe import org.threeten.bp.LocalDate import javax.inject.Inject +import javax.inject.Singleton +@Singleton class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) { fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe> { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt similarity index 93% rename from app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt index aa8949fd8..5e0481036 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/remote/TimetableRemote.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt @@ -1,4 +1,4 @@ -package io.github.wulkanowy.data.repositories.remote +package io.github.wulkanowy.data.repositories.timetable import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Semester @@ -8,7 +8,9 @@ import io.github.wulkanowy.utils.toLocalDateTime import io.reactivex.Single import org.threeten.bp.LocalDate import javax.inject.Inject +import javax.inject.Singleton +@Singleton class TimetableRemote @Inject constructor(private val api: Api) { fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single> { diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt similarity index 92% rename from app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt rename to app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt index 6cc6a0435..405f7faea 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt @@ -1,11 +1,9 @@ -package io.github.wulkanowy.data.repositories +package io.github.wulkanowy.data.repositories.timetable import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Timetable -import io.github.wulkanowy.data.repositories.local.TimetableLocal -import io.github.wulkanowy.data.repositories.remote.TimetableRemote import io.github.wulkanowy.utils.friday import io.github.wulkanowy.utils.monday import io.reactivex.Single diff --git a/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt b/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt index d81b4b6d4..ecb177ccb 100644 --- a/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt +++ b/app/src/main/java/io/github/wulkanowy/services/job/ServiceHelper.kt @@ -6,7 +6,7 @@ import com.firebase.jobdispatcher.FirebaseJobDispatcher import com.firebase.jobdispatcher.Lifetime.FOREVER import com.firebase.jobdispatcher.RetryStrategy.DEFAULT_EXPONENTIAL import com.firebase.jobdispatcher.Trigger.executionWindow -import io.github.wulkanowy.data.repositories.PreferencesRepository +import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository import io.github.wulkanowy.utils.isHolidays import org.threeten.bp.LocalDate import timber.log.Timber diff --git a/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt index c38185602..22c6840ff 100644 --- a/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt +++ b/app/src/main/java/io/github/wulkanowy/services/job/SyncWorker.kt @@ -3,20 +3,20 @@ package io.github.wulkanowy.services.job import com.firebase.jobdispatcher.JobParameters import com.firebase.jobdispatcher.SimpleJobService import dagger.android.AndroidInjection -import io.github.wulkanowy.data.repositories.AttendanceRepository -import io.github.wulkanowy.data.repositories.CompletedLessonsRepository -import io.github.wulkanowy.data.repositories.ExamRepository -import io.github.wulkanowy.data.repositories.GradeRepository -import io.github.wulkanowy.data.repositories.GradeSummaryRepository -import io.github.wulkanowy.data.repositories.HomeworkRepository -import io.github.wulkanowy.data.repositories.LuckyNumberRepository -import io.github.wulkanowy.data.repositories.MessagesRepository -import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED -import io.github.wulkanowy.data.repositories.NoteRepository -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.data.repositories.attendance.AttendanceRepository +import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository +import io.github.wulkanowy.data.repositories.exam.ExamRepository +import io.github.wulkanowy.data.repositories.grade.GradeRepository +import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository +import io.github.wulkanowy.data.repositories.homework.HomeworkRepository +import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository +import io.github.wulkanowy.data.repositories.message.MessageRepository +import io.github.wulkanowy.data.repositories.message.MessageRepository.MessageFolder.RECEIVED +import io.github.wulkanowy.data.repositories.note.NoteRepository +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.services.notification.GradeNotification import io.github.wulkanowy.services.notification.LuckyNumberNotification import io.github.wulkanowy.services.notification.MessageNotification @@ -55,7 +55,7 @@ class SyncWorker : SimpleJobService() { lateinit var timetable: TimetableRepository @Inject - lateinit var message: MessagesRepository + lateinit var message: MessageRepository @Inject lateinit var note: NoteRepository 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 d1e275b71..da009f7fe 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,9 +4,9 @@ import android.content.Intent import android.widget.RemoteViewsService import dagger.android.AndroidInjection import io.github.wulkanowy.data.db.SharedPrefHelper -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.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository +import io.github.wulkanowy.data.repositories.timetable.TimetableRepository import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory import javax.inject.Inject 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 c5f9b35dd..23ef30ce7 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 @@ -1,7 +1,7 @@ package io.github.wulkanowy.ui.modules.account import eu.davidea.flexibleadapter.items.AbstractFlexibleItem -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.ErrorHandler import io.github.wulkanowy.utils.SchedulersProvider 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 66c6b8ae3..5825c3188 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 @@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.attendance import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE import eu.davidea.flexibleadapter.items.AbstractFlexibleItem -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.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.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper 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 ce44cde31..0d8d827af 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 @@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.attendance.summary import io.github.wulkanowy.data.db.entities.AttendanceSummary import io.github.wulkanowy.data.db.entities.Subject -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.SubjectRepostory +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.SubjectRepostory import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt index 898549c23..0e99b0011 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt @@ -3,9 +3,9 @@ package io.github.wulkanowy.ui.modules.exam import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import io.github.wulkanowy.data.db.entities.Exam -import io.github.wulkanowy.data.repositories.ExamRepository -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.exam.ExamRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt index 63ddd5ae9..7413f056b 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt @@ -1,8 +1,8 @@ package io.github.wulkanowy.ui.modules.grade import io.github.wulkanowy.data.db.entities.Semester -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt index f395b8ad4..88f38c43f 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt @@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.grade.details import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import io.github.wulkanowy.data.db.entities.Grade -import io.github.wulkanowy.data.repositories.GradeRepository -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.grade.GradeRepository +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.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt index d9ff4aafa..ba22f45b3 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt @@ -1,11 +1,11 @@ package io.github.wulkanowy.ui.modules.grade.summary import io.github.wulkanowy.data.db.entities.GradeSummary -import io.github.wulkanowy.data.repositories.GradeRepository -import io.github.wulkanowy.data.repositories.GradeSummaryRepository -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.grade.GradeRepository +import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository +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.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt index 74d3b0847..036ebdc28 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt @@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.homework import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE import eu.davidea.flexibleadapter.items.AbstractFlexibleItem -import io.github.wulkanowy.data.repositories.HomeworkRepository -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.homework.HomeworkRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt index 02188b723..a2dbc7f34 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt @@ -1,7 +1,7 @@ package io.github.wulkanowy.ui.modules.login.form import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt index 82ffcd619..336f9c90c 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt @@ -3,8 +3,8 @@ package io.github.wulkanowy.ui.modules.login.studentselect import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt index fe03b6f75..ad3a76e9d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt @@ -1,7 +1,7 @@ package io.github.wulkanowy.ui.modules.login.symbol import com.google.firebase.analytics.FirebaseAnalytics.Param.SUCCESS -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt index ec7011088..d034723f4 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt @@ -1,8 +1,8 @@ package io.github.wulkanowy.ui.modules.luckynumber -import io.github.wulkanowy.data.repositories.LuckyNumberRepository -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt index 731ca88ab..57019f000 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt @@ -2,8 +2,8 @@ package io.github.wulkanowy.ui.modules.main import com.google.firebase.analytics.FirebaseAnalytics.Event.APP_OPEN import com.google.firebase.analytics.FirebaseAnalytics.Param.DESTINATION -import io.github.wulkanowy.data.repositories.PreferencesRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.services.job.ServiceHelper import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.ErrorHandler diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt index 7a890339e..7905a3444 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt @@ -7,9 +7,9 @@ import android.view.View.INVISIBLE import android.view.View.VISIBLE import android.view.ViewGroup import io.github.wulkanowy.R -import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED -import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.SENT -import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.TRASHED +import io.github.wulkanowy.data.repositories.message.MessageRepository.MessageFolder.RECEIVED +import io.github.wulkanowy.data.repositories.message.MessageRepository.MessageFolder.SENT +import io.github.wulkanowy.data.repositories.message.MessageRepository.MessageFolder.TRASHED import io.github.wulkanowy.ui.base.BaseFragment import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter import io.github.wulkanowy.ui.modules.main.MainView diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt index 786d052df..6e6075245 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt @@ -1,8 +1,8 @@ package io.github.wulkanowy.ui.modules.message.preview import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE -import io.github.wulkanowy.data.repositories.MessagesRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.message.MessageRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper @@ -14,7 +14,7 @@ import javax.inject.Inject class MessagePreviewPresenter @Inject constructor( private val errorHandler: SessionErrorHandler, private val schedulers: SchedulersProvider, - private val messagesRepository: MessagesRepository, + private val messageRepository: MessageRepository, private val studentRepository: StudentRepository, private val analytics: FirebaseAnalyticsHelper ) : BaseSessionPresenter(errorHandler) { @@ -32,7 +32,7 @@ class MessagePreviewPresenter @Inject constructor( disposable.apply { clear() add(studentRepository.getCurrentStudent() - .flatMap { messagesRepository.getMessage(it, messageId, true) } + .flatMap { messageRepository.getMessage(it, messageId, true) } .subscribeOn(schedulers.backgroundThread) .observeOn(schedulers.mainThread) .doFinally { view?.showProgress(false) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt index d3e2f471c..b808ed781 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt @@ -11,7 +11,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import io.github.wulkanowy.R -import io.github.wulkanowy.data.repositories.MessagesRepository +import io.github.wulkanowy.data.repositories.message.MessageRepository import io.github.wulkanowy.ui.base.session.BaseSessionFragment import io.github.wulkanowy.ui.modules.main.MainActivity import io.github.wulkanowy.ui.modules.message.MessageFragment @@ -33,7 +33,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me companion object { const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id" - fun newInstance(folder: MessagesRepository.MessageFolder): MessageTabFragment { + fun newInstance(folder: MessageRepository.MessageFolder): MessageTabFragment { return MessageTabFragment().apply { arguments = Bundle().apply { putString(MESSAGE_TAB_FOLDER_ID, folder.name) @@ -55,7 +55,7 @@ class MessageTabFragment : BaseSessionFragment(), MessageTabView, MessageView.Me override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) messageContainer = messageTabRecycler - presenter.onAttachView(this, MessagesRepository.MessageFolder.valueOf( + presenter.onAttachView(this, MessageRepository.MessageFolder.valueOf( (savedInstanceState ?: arguments)?.getString(MessageTabFragment.MESSAGE_TAB_FOLDER_ID) ?: "" )) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt index 45301a315..07e362580 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt @@ -2,8 +2,8 @@ package io.github.wulkanowy.ui.modules.message.tab import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import io.github.wulkanowy.data.db.entities.Message -import io.github.wulkanowy.data.repositories.MessagesRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.message.MessageRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.ui.modules.message.MessageItem @@ -15,14 +15,14 @@ import javax.inject.Inject class MessageTabPresenter @Inject constructor( private val errorHandler: SessionErrorHandler, private val schedulers: SchedulersProvider, - private val messagesRepository: MessagesRepository, + private val messageRepository: MessageRepository, private val studentRepository: StudentRepository, private val analytics: FirebaseAnalyticsHelper ) : BaseSessionPresenter(errorHandler) { - lateinit var folder: MessagesRepository.MessageFolder + lateinit var folder: MessageRepository.MessageFolder - fun onAttachView(view: MessageTabView, folder: MessagesRepository.MessageFolder) { + fun onAttachView(view: MessageTabView, folder: MessageRepository.MessageFolder) { super.onAttachView(view) view.initView() this.folder = folder @@ -38,7 +38,7 @@ class MessageTabPresenter @Inject constructor( disposable.apply { clear() add(studentRepository.getCurrentStudent() - .flatMap { messagesRepository.getMessages(it, folder, forceRefresh) } + .flatMap { messageRepository.getMessages(it, folder, forceRefresh) } .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } } .subscribeOn(schedulers.backgroundThread) .observeOn(schedulers.mainThread) @@ -81,7 +81,7 @@ class MessageTabPresenter @Inject constructor( private fun updateMessage(message: Message) { Timber.i("Attempt to update message ${message.realId}") - disposable.add(messagesRepository.updateMessage(message) + disposable.add(messageRepository.updateMessage(message) .subscribeOn(schedulers.backgroundThread) .observeOn(schedulers.mainThread) .subscribe({ Timber.d("Update message ${message.realId} result: Success") }) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt index 08148f273..6542c6a69 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt @@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.note import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import io.github.wulkanowy.data.db.entities.Note -import io.github.wulkanowy.data.repositories.NoteRepository -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.note.NoteRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt index 61c7c37b3..f75e566ff 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt @@ -1,7 +1,7 @@ package io.github.wulkanowy.ui.modules.settings import com.readystatesoftware.chuck.api.ChuckCollector -import io.github.wulkanowy.data.repositories.PreferencesRepository +import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository import io.github.wulkanowy.services.job.ServiceHelper import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.ErrorHandler diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt index 4c3b240c4..b6bf0e2a3 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt @@ -1,6 +1,6 @@ package io.github.wulkanowy.ui.modules.splash -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.ErrorHandler import io.github.wulkanowy.utils.SchedulersProvider diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt index 776dd8908..a5c60e1ec 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt @@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.timetable import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE import eu.davidea.flexibleadapter.items.AbstractFlexibleItem -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.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository +import io.github.wulkanowy.data.repositories.timetable.TimetableRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.ui.base.session.SessionErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt index 2da0b74f2..6fdfa1305 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt @@ -2,9 +2,9 @@ package io.github.wulkanowy.ui.modules.timetable.completed import com.google.firebase.analytics.FirebaseAnalytics.Param.START_DATE import eu.davidea.flexibleadapter.items.AbstractFlexibleItem -import io.github.wulkanowy.data.repositories.CompletedLessonsRepository -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.session.BaseSessionPresenter import io.github.wulkanowy.utils.FirebaseAnalyticsHelper import io.github.wulkanowy.utils.SchedulersProvider diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt index 21b41c2e8..88d6fd8d9 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt @@ -12,9 +12,9 @@ import android.widget.RemoteViewsService import io.github.wulkanowy.R import io.github.wulkanowy.data.db.SharedPrefHelper import io.github.wulkanowy.data.db.entities.Timetable -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.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository +import io.github.wulkanowy.data.repositories.timetable.TimetableRepository import io.github.wulkanowy.utils.toFormattedString import io.reactivex.Single import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt index f15f4ea7a..4842d305c 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/AttendanceRemoteTest.kt @@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.attendance.Attendance import io.github.wulkanowy.data.db.entities.Semester +import io.github.wulkanowy.data.repositories.attendance.AttendanceRemote import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt index 7794163db..f4c161bc4 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/CompletedLessonsRemoteTest.kt @@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.timetable.CompletedLesson import io.github.wulkanowy.data.db.entities.Semester +import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRemote import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt index 71fcd6d56..0cc785482 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/ExamRemoteTest.kt @@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.exams.Exam import io.github.wulkanowy.data.db.entities.Semester +import io.github.wulkanowy.data.repositories.exam.ExamRemote import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt index b4f0b0cec..054f8890d 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/LuckyNumberRemoteTest.kt @@ -2,6 +2,7 @@ package io.github.wulkanowy.data.repositories.remote import io.github.wulkanowy.api.Api import io.github.wulkanowy.data.db.entities.Semester +import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRemote import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt index 252bd216f..3a26836de 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/StudentRemoteTest.kt @@ -2,6 +2,7 @@ package io.github.wulkanowy.data.repositories.remote import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.register.Student +import io.github.wulkanowy.data.repositories.student.StudentRemote import io.reactivex.Single import org.junit.Assert.assertEquals import org.junit.Before diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt index 4a5bb6ef3..942b28ed9 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/remote/TimetableRemoteTest.kt @@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories.remote import io.github.wulkanowy.api.Api import io.github.wulkanowy.api.timetable.Timetable import io.github.wulkanowy.data.db.entities.Semester +import io.github.wulkanowy.data.repositories.timetable.TimetableRemote import io.mockk.MockKAnnotations import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt index d1b9eba4d..76aeb7b49 100644 --- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt +++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt @@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.login.form import io.github.wulkanowy.TestSchedulersProvider import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper import io.reactivex.Single diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt index 0eff5662a..f8eeb6e1f 100644 --- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt +++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt @@ -3,8 +3,8 @@ package io.github.wulkanowy.ui.modules.login.studentselect import io.github.wulkanowy.TestSchedulersProvider import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Student -import io.github.wulkanowy.data.repositories.SemesterRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.semester.SemesterRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper import io.reactivex.Completable diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt index 203ce3048..2fd6dee68 100644 --- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt +++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt @@ -1,8 +1,8 @@ package io.github.wulkanowy.ui.modules.main import io.github.wulkanowy.TestSchedulersProvider -import io.github.wulkanowy.data.repositories.PreferencesRepository -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.services.job.ServiceHelper import io.github.wulkanowy.ui.base.ErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt index 28ab5f437..fc25c0953 100644 --- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt +++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt @@ -1,7 +1,7 @@ package io.github.wulkanowy.ui.modules.splash import io.github.wulkanowy.TestSchedulersProvider -import io.github.wulkanowy.data.repositories.StudentRepository +import io.github.wulkanowy.data.repositories.student.StudentRepository import io.github.wulkanowy.ui.base.ErrorHandler import io.reactivex.Single import org.junit.Before