Moved server models to dto package

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

@@ -18,8 +18,8 @@ import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.cache.common.CommonCache
 import com.sirekanyan.knigopis.repository.cache.common.CommonCacheImpl
 import com.sirekanyan.knigopis.repository.cache.common.CommonModelDeserializer
-import com.sirekanyan.knigopis.repository.model.FinishedBook
-import com.sirekanyan.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.model.dto.FinishedBook
+import com.sirekanyan.knigopis.model.dto.PlannedBook
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.dsl.context.Context

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

@@ -41,8 +41,8 @@ import com.sirekanyan.knigopis.model.NoteModel
 import com.sirekanyan.knigopis.model.UserModel
 import com.sirekanyan.knigopis.repository.*
 import com.sirekanyan.knigopis.repository.api.Endpoint
-import com.sirekanyan.knigopis.repository.model.CurrentTab
-import com.sirekanyan.knigopis.repository.model.CurrentTab.*
+import com.sirekanyan.knigopis.model.dto.CurrentTab
+import com.sirekanyan.knigopis.model.dto.CurrentTab.*
 import com.tbruyelle.rxpermissions2.RxPermissions
 import io.reactivex.Flowable
 import kotlinx.android.synthetic.main.about.view.*

app/src/main/java/com/sirekanyan/knigopis/feature/book/BookActivity.kt

@@ -13,8 +13,8 @@ import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.repository.BookRepository
 import com.sirekanyan.knigopis.repository.Configuration
 import com.sirekanyan.knigopis.repository.api.createBookImageUrl
-import com.sirekanyan.knigopis.repository.model.FinishedBookToSend
-import com.sirekanyan.knigopis.repository.model.PlannedBookToSend
+import com.sirekanyan.knigopis.model.dto.FinishedBookToSend
+import com.sirekanyan.knigopis.model.dto.PlannedBookToSend
 import kotlinx.android.synthetic.main.book_edit.*
 import org.koin.android.ext.android.inject
 import java.util.*

app/src/main/java/com/sirekanyan/knigopis/feature/profile/ProfileActivity.kt

@@ -11,9 +11,9 @@ import android.view.inputmethod.EditorInfo
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.*
 import com.sirekanyan.knigopis.common.extensions.*
+import com.sirekanyan.knigopis.model.dto.*
 import com.sirekanyan.knigopis.repository.KAuth
 import com.sirekanyan.knigopis.repository.api.Endpoint
-import com.sirekanyan.knigopis.repository.model.*
 import kotlinx.android.synthetic.main.profile_activity.*
 import org.koin.android.ext.android.inject
 
@@ -128,7 +128,10 @@ class ProfileActivity : AppCompatActivity() {
         api.updateProfile(
             id,
             auth.getAccessToken(),
-            Profile(profileNicknameEditText.text.toString(), profileUrl.orEmpty())
+            Profile(
+                profileNicknameEditText.text.toString(),
+                profileUrl.orEmpty()
+            )
         ).io2main()
             .subscribe({
                 profileNickname.text = profileNicknameEditText.text

app/src/main/java/com/sirekanyan/knigopis/repository/model/Book.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/Book.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 interface Book {
     val id: String

app/src/main/java/com/sirekanyan/knigopis/repository/model/Credentials.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/Credentials.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/sirekanyan/knigopis/repository/model/CurrentTab.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/CurrentTab.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 import android.support.annotation.IdRes
 import com.sirekanyan.knigopis.R

app/src/main/java/com/sirekanyan/knigopis/repository/model/FinishedBook.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/FinishedBook.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 class FinishedBook(
     override val id: String,

app/src/main/java/com/sirekanyan/knigopis/repository/model/FinishedBookToSend.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/FinishedBookToSend.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 class FinishedBookToSend(
     val title: String,

app/src/main/java/com/sirekanyan/knigopis/repository/model/note/Identity.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/Identity.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model.note
+package com.sirekanyan.knigopis.model.dto
 
 import com.sirekanyan.knigopis.repository.api.createUserImageUrl
 

app/src/main/java/com/sirekanyan/knigopis/repository/model/note/Note.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/Note.kt

@@ -1,6 +1,5 @@
-package com.sirekanyan.knigopis.repository.model.note
+package com.sirekanyan.knigopis.model.dto
 
-import com.sirekanyan.knigopis.repository.model.Book
 import java.util.*
 
 class Note(

app/src/main/java/com/sirekanyan/knigopis/repository/model/PlannedBook.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/PlannedBook.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 import java.util.*
 

app/src/main/java/com/sirekanyan/knigopis/repository/model/PlannedBookToSend.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/PlannedBookToSend.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 class PlannedBookToSend(
     val title: String,

app/src/main/java/com/sirekanyan/knigopis/model/dto/Profile.kt

@@ -0,0 +1,3 @@
+package com.sirekanyan.knigopis.model.dto
+
+class Profile(val nickname: String, val profile: String)

app/src/main/java/com/sirekanyan/knigopis/repository/model/subscription/Subscription.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/Subscription.kt

@@ -1,6 +1,4 @@
-package com.sirekanyan.knigopis.repository.model.subscription
-
-import com.sirekanyan.knigopis.repository.model.User
+package com.sirekanyan.knigopis.model.dto
 
 class Subscription(
     val subUser: User,

app/src/main/java/com/sirekanyan/knigopis/repository/model/User.kt → app/src/main/java/com/sirekanyan/knigopis/model/dto/User.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.repository.model
+package com.sirekanyan.knigopis.model.dto
 
 private val defaultAvatars = setOf(
     "https://lh3.googleusercontent.com/-XdUIqdMkCWA/AAAAAAAAAAI/AAAAAAAAAAA/4252rscbv5M/photo.jpg?sz=100",

app/src/main/java/com/sirekanyan/knigopis/model/mappers.kt

@@ -4,10 +4,10 @@ import android.text.SpannableString
 import android.text.format.DateUtils
 import android.text.style.SuperscriptSpan
 import com.sirekanyan.knigopis.repository.api.createBookImageUrl
-import com.sirekanyan.knigopis.repository.model.FinishedBook
-import com.sirekanyan.knigopis.repository.model.PlannedBook
-import com.sirekanyan.knigopis.repository.model.note.Note
-import com.sirekanyan.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.model.dto.FinishedBook
+import com.sirekanyan.knigopis.model.dto.PlannedBook
+import com.sirekanyan.knigopis.model.dto.Note
+import com.sirekanyan.knigopis.model.dto.Subscription
 
 fun PlannedBook.toBookModel(group: BookGroupModel) =
     BookDataModel(

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

@@ -5,8 +5,8 @@ import com.sirekanyan.knigopis.common.ResourceProvider
 import com.sirekanyan.knigopis.model.BookHeaderModel
 import com.sirekanyan.knigopis.model.BookModel
 import com.sirekanyan.knigopis.model.toBookModel
-import com.sirekanyan.knigopis.repository.model.FinishedBook
-import com.sirekanyan.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.model.dto.FinishedBook
+import com.sirekanyan.knigopis.model.dto.PlannedBook
 
 interface BookOrganizer<T> {
 

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

@@ -7,10 +7,10 @@ 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.repository.model.FinishedBook
-import com.sirekanyan.knigopis.repository.model.FinishedBookToSend
-import com.sirekanyan.knigopis.repository.model.PlannedBook
-import com.sirekanyan.knigopis.repository.model.PlannedBookToSend
+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

app/src/main/java/com/sirekanyan/knigopis/repository/api/Endpoint.kt

@@ -1,8 +1,6 @@
 package com.sirekanyan.knigopis.repository.api
 
-import com.sirekanyan.knigopis.repository.model.*
-import com.sirekanyan.knigopis.repository.model.note.Note
-import com.sirekanyan.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.model.dto.*
 import io.reactivex.Completable
 import io.reactivex.Single
 import retrofit2.http.*

app/src/main/java/com/sirekanyan/knigopis/repository/model/Profile.kt

@@ -1,3 +0,0 @@
-package com.sirekanyan.knigopis.repository.model
-
-class Profile(val nickname: String, val profile: String)