Renamed common adapter to headed adapter

app/src/main/java/com/sirekanyan/knigopis/common/adapter/CommonAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/common/adapter/HeadedAdapter.kt

@@ -4,7 +4,7 @@ import android.support.v7.recyclerview.extensions.ListAdapter
 import android.support.v7.util.DiffUtil
 import android.view.ViewGroup
 
-abstract class CommonAdapter<T : CommonModel>(
+abstract class HeadedAdapter<T : HeadedModel>(
     itemCallback: DiffUtil.ItemCallback<T>
 ) : ListAdapter<T, CommonViewHolder<T>>(itemCallback) {
 

app/src/main/java/com/sirekanyan/knigopis/common/adapter/CommonModel.kt → app/src/main/java/com/sirekanyan/knigopis/common/adapter/HeadedModel.kt

@@ -1,6 +1,5 @@
 package com.sirekanyan.knigopis.common.adapter
 
-interface CommonModel {
-    val id: String
+interface HeadedModel {
     val isHeader: Boolean
 }

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

@@ -19,7 +19,7 @@ import com.sirekanyan.knigopis.repository.*
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.cache.CommonCache
 import com.sirekanyan.knigopis.repository.cache.CommonCacheImpl
-import com.sirekanyan.knigopis.repository.cache.CommonModelDeserializer
+import com.sirekanyan.knigopis.repository.cache.HeadedModelDeserializer
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.dsl.context.Context
@@ -55,7 +55,7 @@ val appModule = applicationContext {
     bean {
         GsonBuilder().registerTypeAdapter(
             BookModel::class.java,
-            CommonModelDeserializer<BookModel>(
+            HeadedModelDeserializer<BookModel>(
                 BookHeaderModel::class.java,
                 BookDataModel::class.java
             )

app/src/main/java/com/sirekanyan/knigopis/feature/books/BooksAdapter.kt

@@ -2,7 +2,7 @@ package com.sirekanyan.knigopis.feature.books
 
 import android.view.ViewGroup
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.adapter.CommonAdapter
+import com.sirekanyan.knigopis.common.adapter.HeadedAdapter
 import com.sirekanyan.knigopis.common.extensions.inflate
 import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.model.BookModel
@@ -10,7 +10,7 @@ import com.sirekanyan.knigopis.model.BookModel
 class BooksAdapter(
     private val onClick: (BookDataModel) -> Unit,
     private val onLongClick: (BookDataModel) -> Unit
-) : CommonAdapter<BookModel>(BookItemCallback()) {
+) : HeadedAdapter<BookModel>(BookItemCallback()) {
 
     override fun onCreateHeaderViewHolder(parent: ViewGroup) =
         BookHeaderViewHolder(parent.inflate(R.layout.header))

app/src/main/java/com/sirekanyan/knigopis/feature/user/UserBooksAdapter.kt

@@ -2,7 +2,7 @@ package com.sirekanyan.knigopis.feature.user
 
 import android.view.ViewGroup
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.adapter.CommonAdapter
+import com.sirekanyan.knigopis.common.adapter.HeadedAdapter
 import com.sirekanyan.knigopis.common.adapter.SimpleItemCallback
 import com.sirekanyan.knigopis.common.extensions.inflate
 import com.sirekanyan.knigopis.model.BookDataModel
@@ -10,7 +10,7 @@ import com.sirekanyan.knigopis.model.BookModel
 
 class UserBooksAdapter(
     private val onLongClick: (BookDataModel) -> Unit
-) : CommonAdapter<BookModel>(SimpleItemCallback { it.id }) {
+) : HeadedAdapter<BookModel>(SimpleItemCallback { it.id }) {
 
     override fun onCreateHeaderViewHolder(parent: ViewGroup) =
         UserBookHeaderViewHolder(parent.inflate(R.layout.header))

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

@@ -2,7 +2,7 @@ package com.sirekanyan.knigopis.model
 
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.ResourceProvider
-import com.sirekanyan.knigopis.common.adapter.CommonModel
+import com.sirekanyan.knigopis.common.adapter.HeadedModel
 import com.sirekanyan.knigopis.common.orDefault
 import com.sirekanyan.knigopis.repository.api.createBookImageUrl
 
@@ -13,10 +13,10 @@ fun createBookHeaderModel(resources: ResourceProvider, title: String, count: Int
 }
 
 sealed class BookModel(
-    override val id: String,
+    val id: String,
     override val isHeader: Boolean,
     val group: BookGroupModel
-) : CommonModel
+) : HeadedModel
 
 class BookHeaderModel(
     val title: String,

app/src/main/java/com/sirekanyan/knigopis/repository/cache/CommonModelDeserializer.kt → app/src/main/java/com/sirekanyan/knigopis/repository/cache/HeadedModelDeserializer.kt

@@ -4,10 +4,10 @@ import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
-import com.sirekanyan.knigopis.common.adapter.CommonModel
+import com.sirekanyan.knigopis.common.adapter.HeadedModel
 import java.lang.reflect.Type
 
-class CommonModelDeserializer<T : CommonModel>(
+class HeadedModelDeserializer<T : HeadedModel>(
     private val headerType: Type,
     private val dataType: Type
 ) : JsonDeserializer<T> {