Эх сурвалжийг харах

Fixed inspection warnings

Vadik Sirekanyan 7 жил өмнө
parent
commit
d96736fa24

+ 0 - 39
app/src/main/java/com/sirekanyan/knigopis/common/android/header/StickyHeader.java

@@ -1,39 +0,0 @@
-package com.sirekanyan.knigopis.common.android.header;
-
-import android.view.View;
-
-public interface StickyHeader {
-
-    /**
-     * This method gets called by {@link HeaderItemDecoration} to fetch the position of the header item in the adapter
-     * that is used for (represents) item at specified position.
-     *
-     * @param itemPosition int. Adapter's position of the item for which to do the search of the position of the header item.
-     * @return int. Position of the header item in the adapter.
-     */
-    int getHeaderPositionForItem(int itemPosition);
-
-    /**
-     * This method gets called by {@link HeaderItemDecoration} to get layout resource id for the header item at specified adapter's position.
-     *
-     * @param headerPosition int. Position of the header item in the adapter.
-     * @return int. Layout resource id.
-     */
-    int getHeaderLayout(int headerPosition);
-
-    /**
-     * This method gets called by {@link HeaderItemDecoration} to setup the header View.
-     *
-     * @param header         View. Header to set the data on.
-     * @param headerPosition int. Position of the header item in the adapter.
-     */
-    void bindHeaderData(View header, int headerPosition);
-
-    /**
-     * This method gets called by {@link HeaderItemDecoration} to verify whether the item represents a header.
-     *
-     * @param itemPosition int.
-     * @return true, if item at the specified adapter's position represents a header.
-     */
-    boolean isHeader(int itemPosition);
-}

+ 40 - 0
app/src/main/java/com/sirekanyan/knigopis/common/android/header/StickyHeader.kt

@@ -0,0 +1,40 @@
+package com.sirekanyan.knigopis.common.android.header
+
+import android.view.View
+
+interface StickyHeader {
+
+    /**
+     * This method gets called by [HeaderItemDecoration] to fetch the position of the header item in the adapter
+     * that is used for (represents) item at specified position.
+     *
+     * @param itemPosition int. Adapter's position of the item for which to do the search of the position of the header item.
+     * @return int. Position of the header item in the adapter.
+     */
+    fun getHeaderPositionForItem(itemPosition: Int): Int
+
+    /**
+     * This method gets called by [HeaderItemDecoration] to get layout resource id for the header item at specified adapter's position.
+     *
+     * @param headerPosition int. Position of the header item in the adapter.
+     * @return int. Layout resource id.
+     */
+    fun getHeaderLayout(headerPosition: Int): Int
+
+    /**
+     * This method gets called by [HeaderItemDecoration] to setup the header View.
+     *
+     * @param header         View. Header to set the data on.
+     * @param headerPosition int. Position of the header item in the adapter.
+     */
+    fun bindHeaderData(header: View, headerPosition: Int)
+
+    /**
+     * This method gets called by [HeaderItemDecoration] to verify whether the item represents a header.
+     *
+     * @param itemPosition int.
+     * @return true, if item at the specified adapter's position represents a header.
+     */
+    fun isHeader(itemPosition: Int): Boolean
+
+}

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

@@ -3,7 +3,6 @@ package com.sirekanyan.knigopis.feature.books
 import android.view.View
 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
 import com.sirekanyan.knigopis.model.BookModel
 import kotlinx.android.extensions.LayoutContainer
@@ -20,13 +19,13 @@ class BookDataViewHolder(
 
     init {
         containerView.setOnClickListener {
-            model?.let {
-                onClick(it as BookDataModel)
+            model?.let { book ->
+                onClick(book as BookDataModel)
             }
         }
         containerView.setOnLongClickListener {
-            model?.let {
-                onLongClick(it as BookDataModel)
+            model?.let { book ->
+                onLongClick(book as BookDataModel)
             }
             true
         }

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

@@ -16,8 +16,8 @@ class NoteViewHolder(
 
     init {
         containerView.setOnClickListener {
-            model?.let {
-                onClick(it)
+            model?.let { note ->
+                onClick(note)
             }
         }
     }

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

@@ -17,8 +17,8 @@ class UserBookDataViewHolder(
 
     init {
         containerView.setOnLongClickListener {
-            model?.let {
-                onClick(it as BookDataModel)
+            model?.let { book ->
+                onClick(book as BookDataModel)
             }
             true
         }

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

@@ -16,13 +16,13 @@ class UserViewHolder(
 
     init {
         containerView.setOnClickListener {
-            model?.let {
-                onClick(it)
+            model?.let { user ->
+                onClick(user)
             }
         }
         containerView.setOnLongClickListener {
-            model?.let {
-                onLongClick(it)
+            model?.let { user ->
+                onLongClick(user)
             }
             true
         }

+ 2 - 1
app/src/main/java/com/sirekanyan/knigopis/repository/NoteRepository.kt

@@ -2,6 +2,7 @@ package com.sirekanyan.knigopis.repository
 
 import com.sirekanyan.knigopis.common.android.NetworkChecker
 import com.sirekanyan.knigopis.model.NoteModel
+import com.sirekanyan.knigopis.model.dto.Note
 import com.sirekanyan.knigopis.model.toNoteModel
 import com.sirekanyan.knigopis.repository.cache.CacheKey
 import com.sirekanyan.knigopis.repository.cache.CommonCache
@@ -27,7 +28,7 @@ class NoteRepositoryImpl(
     override fun observeNotes() = observe()
 
     override fun loadFromNetwork(): Single<List<NoteModel>> =
-        api.getLatestBooksWithNotes().map { it.values.map { it.toNoteModel() } }
+        api.getLatestBooksWithNotes().map { it.values.map(Note::toNoteModel) }
 
     override fun findCached(): Maybe<List<NoteModel>> =
         cache.find(CacheKey.NOTES, genericType<List<NoteModel>>())

+ 2 - 1
app/src/main/java/com/sirekanyan/knigopis/repository/UserRepository.kt

@@ -2,6 +2,7 @@ package com.sirekanyan.knigopis.repository
 
 import com.sirekanyan.knigopis.common.android.NetworkChecker
 import com.sirekanyan.knigopis.model.UserModel
+import com.sirekanyan.knigopis.model.dto.Subscription
 import com.sirekanyan.knigopis.model.toUserModel
 import com.sirekanyan.knigopis.repository.cache.CacheKey
 import com.sirekanyan.knigopis.repository.cache.CommonCache
@@ -28,7 +29,7 @@ class UserRepositoryImpl(
     override fun observeUsers() = observe()
 
     override fun loadFromNetwork(): Single<List<UserModel>> =
-        api.getSubscriptions(auth.getAccessToken()).map { it.map { it.toUserModel() } }
+        api.getSubscriptions(auth.getAccessToken()).map { it.map(Subscription::toUserModel) }
 
     override fun findCached(): Maybe<List<UserModel>> =
         cache.find(CacheKey.USERS, genericType<List<UserModel>>())