Renamed subscription repository to user repository

app/src/main/java/com/sirekanyan/knigopis/dependency.kt

@@ -42,7 +42,7 @@ val appModule = applicationContext {
             get()
         ) as BookRepository
     }
-    bean { SubscriptionRepositoryImpl(get(), get(), get(), get()) as SubscriptionRepository }
+    bean { UserRepositoryImpl(get(), get(), get(), get()) as UserRepository }
     bean { NoteRepositoryImpl(get(), get(), get()) as NoteRepository }
     bean { KAuthImpl(get(), get()) as KAuth }
     bean { createMainEndpoint(get()) }

app/src/main/java/com/sirekanyan/knigopis/feature/MainActivity.kt

@@ -35,14 +35,10 @@ import com.sirekanyan.knigopis.feature.profile.createProfileIntent
 import com.sirekanyan.knigopis.feature.user.createUserIntent
 import com.sirekanyan.knigopis.feature.users.UriItem
 import com.sirekanyan.knigopis.feature.users.UsersAdapter
-import com.sirekanyan.knigopis.model.BookDataModel
-import com.sirekanyan.knigopis.model.BookModel
-import com.sirekanyan.knigopis.model.NoteModel
-import com.sirekanyan.knigopis.model.UserModel
+import com.sirekanyan.knigopis.model.*
+import com.sirekanyan.knigopis.model.CurrentTab.*
 import com.sirekanyan.knigopis.repository.*
 import com.sirekanyan.knigopis.repository.api.Endpoint
-import com.sirekanyan.knigopis.model.CurrentTab
-import com.sirekanyan.knigopis.model.CurrentTab.*
 import com.tbruyelle.rxpermissions2.RxPermissions
 import io.reactivex.Flowable
 import kotlinx.android.synthetic.main.about.view.*
@@ -66,7 +62,7 @@ class MainActivity : AppCompatActivity(), Router {
     private val auth by inject<KAuth>()
     private val dialogs by inject<DialogFactory> { mapOf("activity" to this) }
     private val bookRepository by inject<BookRepository>()
-    private val userRepository by inject<SubscriptionRepository>()
+    private val userRepository by inject<UserRepository>()
     private val noteRepository by inject<NoteRepository>()
     private val resourceProvider by inject<ResourceProvider>()
     private val allBooks = mutableListOf<BookModel>()
@@ -390,7 +386,7 @@ class MainActivity : AppCompatActivity(), Router {
     }
 
     private fun refreshHomeTab() {
-        bookRepository.loadBooks()
+        bookRepository.observeBooks()
             .io2main()
             .showProgressBar()
             .subscribe({ books ->
@@ -406,7 +402,7 @@ class MainActivity : AppCompatActivity(), Router {
     }
 
     private fun refreshUsersTab() {
-        userRepository.getSubscriptions()
+        userRepository.observeUsers()
             .io2main()
             .showProgressBar()
             .subscribe({ users ->
@@ -420,7 +416,7 @@ class MainActivity : AppCompatActivity(), Router {
     }
 
     private fun refreshNotesTab() {
-        noteRepository.getNotes()
+        noteRepository.observeNotes()
             .io2main()
             .showProgressBar()
             .subscribe({ notes ->

app/src/main/java/com/sirekanyan/knigopis/repository/BookRepository.kt

@@ -2,15 +2,15 @@ package com.sirekanyan.knigopis.repository
 
 import com.sirekanyan.knigopis.common.NetworkChecker
 import com.sirekanyan.knigopis.model.BookModel
+import com.sirekanyan.knigopis.model.dto.FinishedBook
+import com.sirekanyan.knigopis.model.dto.FinishedBookToSend
+import com.sirekanyan.knigopis.model.dto.PlannedBook
+import com.sirekanyan.knigopis.model.dto.PlannedBookToSend
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.cache.common.CacheKey
 import com.sirekanyan.knigopis.repository.cache.common.CommonCache
 import com.sirekanyan.knigopis.repository.cache.common.genericType
 import com.sirekanyan.knigopis.repository.common.CommonRepository
-import com.sirekanyan.knigopis.model.dto.FinishedBook
-import com.sirekanyan.knigopis.model.dto.FinishedBookToSend
-import com.sirekanyan.knigopis.model.dto.PlannedBook
-import com.sirekanyan.knigopis.model.dto.PlannedBookToSend
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Maybe
@@ -19,7 +19,7 @@ import io.reactivex.rxkotlin.Singles
 
 interface BookRepository {
 
-    fun loadBooks(): Flowable<List<BookModel>>
+    fun observeBooks(): Flowable<List<BookModel>>
 
     fun saveBook(bookId: String?, book: FinishedBookToSend, done: Boolean?): Completable
 
@@ -37,7 +37,7 @@ class BookRepositoryImpl(
 ) : CommonRepository<List<BookModel>>(networkChecker),
     BookRepository {
 
-    override fun loadBooks() = observe()
+    override fun observeBooks() = observe()
 
     override fun saveBook(bookId: String?, book: FinishedBookToSend, done: Boolean?): Completable =
         when {

app/src/main/java/com/sirekanyan/knigopis/repository/NoteRepository.kt

@@ -15,7 +15,7 @@ import io.reactivex.Single
 
 interface NoteRepository {
 
-    fun getNotes(): Flowable<List<NoteModel>>
+    fun observeNotes(): Flowable<List<NoteModel>>
 
 }
 
@@ -26,7 +26,7 @@ class NoteRepositoryImpl(
 ) : CommonRepository<List<NoteModel>>(networkChecker),
     NoteRepository {
 
-    override fun getNotes() = observe()
+    override fun observeNotes() = observe()
 
     override fun loadFromNetwork(): Single<List<NoteModel>> =
         api.getLatestBooksWithNotes().map { it.values.map { it.toNoteModel() } }

app/src/main/java/com/sirekanyan/knigopis/repository/SubscriptionRepository.kt → app/src/main/java/com/sirekanyan/knigopis/repository/UserRepository.kt

@@ -13,21 +13,21 @@ import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.reactivex.Single
 
-interface SubscriptionRepository {
+interface UserRepository {
 
-    fun getSubscriptions(): Flowable<List<UserModel>>
+    fun observeUsers(): Flowable<List<UserModel>>
 
 }
 
-class SubscriptionRepositoryImpl(
+class UserRepositoryImpl(
     private val api: Endpoint,
     private val cache: CommonCache,
     private val auth: KAuth,
     networkChecker: NetworkChecker
 ) : CommonRepository<List<UserModel>>(networkChecker),
-    SubscriptionRepository {
+    UserRepository {
 
-    override fun getSubscriptions() = observe()
+    override fun observeUsers() = observe()
 
     override fun loadFromNetwork(): Single<List<UserModel>> =
         api.getSubscriptions(auth.getAccessToken()).map { it.map { it.toUserModel() } }