Parcourir la source

Moved adapter to android package

Vadik Sirekanyan il y a 7 ans
Parent
commit
3e2f4ff5fa
19 fichiers modifiés avec 22 ajouts et 24 suppressions
  1. 0 2
      app/src/main/java/com/sirekanyan/knigopis/common/Presenter.kt
  2. 0 5
      app/src/main/java/com/sirekanyan/knigopis/common/adapter/HeadedModel.kt
  3. 1 1
      app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/CommonViewHolder.kt
  4. 1 1
      app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/HeadedAdapter.kt
  5. 5 0
      app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/HeadedModel.kt
  6. 1 1
      app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/SimpleItemCallback.kt
  7. 1 1
      app/src/main/java/com/sirekanyan/knigopis/common/android/header/StickyHeaderImpl.kt
  8. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/books/BookDataViewHolder.kt
  9. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/books/BookHeaderViewHolder.kt
  10. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/books/BooksAdapter.kt
  11. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/notes/NoteViewHolder.kt
  12. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/notes/NotesAdapter.kt
  13. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/user/UserBookDataViewHolder.kt
  14. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/user/UserBookHeaderViewHolder.kt
  15. 2 2
      app/src/main/java/com/sirekanyan/knigopis/feature/user/UserBooksAdapter.kt
  16. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/users/UserViewHolder.kt
  17. 1 1
      app/src/main/java/com/sirekanyan/knigopis/feature/users/UsersAdapter.kt
  18. 1 1
      app/src/main/java/com/sirekanyan/knigopis/model/BookModel.kt
  19. 1 1
      app/src/main/java/com/sirekanyan/knigopis/repository/cache/HeadedModelDeserializer.kt

+ 0 - 2
app/src/main/java/com/sirekanyan/knigopis/common/Presenter.kt

@@ -1,7 +1,5 @@
 package com.sirekanyan.knigopis.common
 
 interface Presenter {
-
     fun stop()
-
 }

+ 0 - 5
app/src/main/java/com/sirekanyan/knigopis/common/adapter/HeadedModel.kt

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

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/common/adapter/CommonViewHolder.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/CommonViewHolder.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.adapter
+package com.sirekanyan.knigopis.common.android.adapter
 
 import android.support.v7.widget.RecyclerView
 import android.view.View

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/common/adapter/HeadedAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/HeadedAdapter.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.adapter
+package com.sirekanyan.knigopis.common.android.adapter
 
 import android.support.v7.recyclerview.extensions.ListAdapter
 import android.support.v7.util.DiffUtil

+ 5 - 0
app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/HeadedModel.kt

@@ -0,0 +1,5 @@
+package com.sirekanyan.knigopis.common.android.adapter
+
+interface HeadedModel {
+    val isHeader: Boolean
+}

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/common/adapter/SimpleItemCallback.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/adapter/SimpleItemCallback.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.adapter
+package com.sirekanyan.knigopis.common.android.adapter
 
 import android.support.v7.util.DiffUtil.ItemCallback
 

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/common/android/header/StickyHeaderImpl.kt

@@ -2,7 +2,7 @@ package com.sirekanyan.knigopis.common.android.header
 
 import android.view.View
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.adapter.HeadedAdapter
+import com.sirekanyan.knigopis.common.android.adapter.HeadedAdapter
 import com.sirekanyan.knigopis.common.extensions.showNow
 import com.sirekanyan.knigopis.model.BookModel
 import kotlinx.android.synthetic.main.header.view.*

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/books/BookDataViewHolder.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.feature.books
 
 import android.view.View
-import com.sirekanyan.knigopis.common.adapter.CommonViewHolder
+import com.sirekanyan.knigopis.common.android.adapter.CommonViewHolder
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.common.extensions.setProgressSmoothly
 import com.sirekanyan.knigopis.model.BookDataModel

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/books/BookHeaderViewHolder.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.feature.books
 
 import android.view.View
-import com.sirekanyan.knigopis.common.adapter.CommonViewHolder
+import com.sirekanyan.knigopis.common.android.adapter.CommonViewHolder
 import com.sirekanyan.knigopis.model.BookHeaderModel
 import com.sirekanyan.knigopis.model.BookModel
 import kotlinx.android.extensions.LayoutContainer

+ 1 - 1
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.HeadedAdapter
+import com.sirekanyan.knigopis.common.android.adapter.HeadedAdapter
 import com.sirekanyan.knigopis.common.extensions.inflate
 import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.model.BookModel

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/notes/NoteViewHolder.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.feature.notes
 
 import android.view.View
-import com.sirekanyan.knigopis.common.adapter.CommonViewHolder
+import com.sirekanyan.knigopis.common.android.adapter.CommonViewHolder
 import com.sirekanyan.knigopis.common.extensions.setCircleImage
 import com.sirekanyan.knigopis.common.extensions.setSquareImage
 import com.sirekanyan.knigopis.model.NoteModel

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/notes/NotesAdapter.kt

@@ -3,7 +3,7 @@ package com.sirekanyan.knigopis.feature.notes
 import android.support.v7.recyclerview.extensions.ListAdapter
 import android.view.ViewGroup
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.adapter.SimpleItemCallback
+import com.sirekanyan.knigopis.common.android.adapter.SimpleItemCallback
 import com.sirekanyan.knigopis.common.extensions.inflate
 import com.sirekanyan.knigopis.model.NoteModel
 

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/user/UserBookDataViewHolder.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.feature.user
 
 import android.view.View
-import com.sirekanyan.knigopis.common.adapter.CommonViewHolder
+import com.sirekanyan.knigopis.common.android.adapter.CommonViewHolder
 import com.sirekanyan.knigopis.common.extensions.setSquareImage
 import com.sirekanyan.knigopis.common.extensions.showNow
 import com.sirekanyan.knigopis.model.BookDataModel

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/user/UserBookHeaderViewHolder.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.feature.user
 
 import android.view.View
-import com.sirekanyan.knigopis.common.adapter.CommonViewHolder
+import com.sirekanyan.knigopis.common.android.adapter.CommonViewHolder
 import com.sirekanyan.knigopis.common.extensions.showNow
 import com.sirekanyan.knigopis.model.BookHeaderModel
 import com.sirekanyan.knigopis.model.BookModel

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

@@ -2,8 +2,8 @@ package com.sirekanyan.knigopis.feature.user
 
 import android.view.ViewGroup
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.adapter.HeadedAdapter
-import com.sirekanyan.knigopis.common.adapter.SimpleItemCallback
+import com.sirekanyan.knigopis.common.android.adapter.HeadedAdapter
+import com.sirekanyan.knigopis.common.android.adapter.SimpleItemCallback
 import com.sirekanyan.knigopis.common.extensions.inflate
 import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.model.BookModel

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/users/UserViewHolder.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.feature.users
 
 import android.view.View
-import com.sirekanyan.knigopis.common.adapter.CommonViewHolder
+import com.sirekanyan.knigopis.common.android.adapter.CommonViewHolder
 import com.sirekanyan.knigopis.common.extensions.setCircleImage
 import com.sirekanyan.knigopis.model.UserModel
 import kotlinx.android.extensions.LayoutContainer

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/users/UsersAdapter.kt

@@ -3,7 +3,7 @@ package com.sirekanyan.knigopis.feature.users
 import android.support.v7.recyclerview.extensions.ListAdapter
 import android.view.ViewGroup
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.adapter.SimpleItemCallback
+import com.sirekanyan.knigopis.common.android.adapter.SimpleItemCallback
 import com.sirekanyan.knigopis.common.extensions.inflate
 import com.sirekanyan.knigopis.model.UserModel
 

+ 1 - 1
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.android.ResourceProvider
-import com.sirekanyan.knigopis.common.adapter.HeadedModel
+import com.sirekanyan.knigopis.common.android.adapter.HeadedModel
 import com.sirekanyan.knigopis.common.extensions.orDefault
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
 

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/repository/cache/HeadedModelDeserializer.kt

@@ -4,7 +4,7 @@ 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.HeadedModel
+import com.sirekanyan.knigopis.common.android.adapter.HeadedModel
 import java.lang.reflect.Type
 
 class HeadedModelDeserializer<T : HeadedModel>(