Sort repositories (#244)

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

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

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

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

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

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

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

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

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<List<Attendance>> {

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

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

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<List<AttendanceSummary>> {

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

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

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

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

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

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<List<Exam>> {

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<List<Exam>> {

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

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

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

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

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

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

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

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

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

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

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

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

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

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<Message> {
         return messagesDb.loadOne(studentId, id)
     }
 
-    fun getMessages(studentId: Int, folder: MessagesRepository.MessageFolder): Maybe<List<Message>> {
+    fun getMessages(studentId: Int, folder: MessageRepository.MessageFolder): Maybe<List<Message>> {
         return when (folder) {
-            MessagesRepository.MessageFolder.TRASHED -> messagesDb.loadDeleted(studentId)
+            MessageRepository.MessageFolder.TRASHED -> messagesDb.loadDeleted(studentId)
             else -> messagesDb.load(studentId, folder.id)
         }.filter { !it.isEmpty() }
     }

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<List<Message>> {
+    fun getMessages(studentId: Int, folder: MessageRepository.MessageFolder): Single<List<Message>> {
         return api.getMessages(Folder.valueOf(folder.name)).map { messages ->
             messages.map {
                 Message(

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 local: MessageLocal,
-    private val remote: MessagesRemote,
+    private val remote: MessageRemote,
     private val apiHelper: ApiHelper
 ) {
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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<List<Timetable>> {

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<List<Timetable>> {

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

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

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.attendance.AttendanceRepository
-import io.github.wulkanowy.data.repositories.CompletedLessonsRepository
+import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
-import io.github.wulkanowy.data.repositories.ExamRepository
+import io.github.wulkanowy.data.repositories.exam.ExamRepository
-import io.github.wulkanowy.data.repositories.GradeRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.HomeworkRepository
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
-import io.github.wulkanowy.data.repositories.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.MessagesRepository
+import io.github.wulkanowy.data.repositories.message.MessageRepository
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.repositories.message.MessageRepository.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.NoteRepository
+import io.github.wulkanowy.data.repositories.note.NoteRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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

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.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory
 import javax.inject.Inject
 

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

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.attendance.AttendanceRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.attendancesummary.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.SubjectRepostory
+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

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.exam.ExamRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.GradeSummaryRepository
+import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.homework.HomeworkRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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

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.semester.SemesterRepository
-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

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

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.luckynumber.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-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.session.SessionErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper

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.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.message.MessageRepository.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.SENT
+import io.github.wulkanowy.data.repositories.message.MessageRepository.MessageFolder.SENT
-import io.github.wulkanowy.data.repositories.MessagesRepository.MessageFolder.TRASHED
+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

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.message.MessageRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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<MessagePreviewView>(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) }

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) ?: ""
         ))
     }

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.message.MessageRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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<MessageTabView>(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") })

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.note.NoteRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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

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

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.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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

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.completedlessons.CompletedLessonsRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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.semester.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.utils.toFormattedString
 import io.reactivex.Single
 import io.reactivex.disposables.CompositeDisposable

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

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

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

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

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

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

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

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.semester.SemesterRepository
-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.Completable

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.preferences.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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

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