Change method to property

CymChad · Jan 6, 2020 · 49a29eb · 49a29eb
1 parent dedd998
commit 49a29eb
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 87 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+//apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 28

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseNodeAdapter.kt b/library/src/main/java/com/chad/library/adapter/base/BaseNodeAdapter.kt
@@ -113,7 +113,7 @@ abstract class BaseNodeAdapter(nodeList: MutableList<BaseNode>? = null)
      */
     override fun remove(position: Int) {
         val removeCount = removeAt(position)
-        notifyItemRangeRemoved(position + getHeaderLayoutCount(), removeCount)
+        notifyItemRangeRemoved(position + headerLayoutCount, removeCount)
         compatibilityDataSizeChanged(0)
     }
 
@@ -130,10 +130,10 @@ abstract class BaseNodeAdapter(nodeList: MutableList<BaseNode>? = null)
         this.data.addAll(index, newFlatData)
 
         if (removeCount == newFlatData.size) {
-            notifyItemRangeChanged(index + getHeaderLayoutCount(), removeCount)
+            notifyItemRangeChanged(index + headerLayoutCount, removeCount)
         } else {
-            notifyItemRangeRemoved(index + getHeaderLayoutCount(), removeCount)
-            notifyItemRangeInserted(index + getHeaderLayoutCount(), newFlatData.size)
+            notifyItemRangeRemoved(index + headerLayoutCount, removeCount)
+            notifyItemRangeInserted(index + headerLayoutCount, newFlatData.size)
 
 //        notifyItemRangeChanged(index + getHeaderLayoutCount(), max(removeCount, newFlatData.size)
         }
@@ -381,7 +381,7 @@ abstract class BaseNodeAdapter(nodeList: MutableList<BaseNode>? = null)
             val newFlatData = flatData(newData)
             this.data.addAll(parentIndex + 1, newFlatData)
 
-            val positionStart = parentIndex + 1 + getHeaderLayoutCount()
+            val positionStart = parentIndex + 1 + headerLayoutCount
             if (removeCount == newFlatData.size) {
                 notifyItemRangeChanged(positionStart, removeCount)
             } else {
@@ -453,7 +453,7 @@ abstract class BaseNodeAdapter(nodeList: MutableList<BaseNode>? = null)
         val node = this.data[position]
 
         if (node is BaseExpandNode && node.isExpanded) {
-            val adapterPosition = position + getHeaderLayoutCount()
+            val adapterPosition = position + headerLayoutCount
 
             node.isExpanded = false
             if (node.childNode.isNullOrEmpty()) {
@@ -493,7 +493,7 @@ abstract class BaseNodeAdapter(nodeList: MutableList<BaseNode>? = null)
         val node = this.data[position]
 
         if (node is BaseExpandNode && !node.isExpanded) {
-            val adapterPosition = position + getHeaderLayoutCount()
+            val adapterPosition = position + headerLayoutCount
 
             node.isExpanded = true
             if (node.childNode.isNullOrEmpty()) {

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseProviderMultiAdapter.kt b/library/src/main/java/com/chad/library/adapter/base/BaseProviderMultiAdapter.kt
@@ -76,7 +76,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnClickListener
                 }
-                position -= getHeaderLayoutCount()
+                position -= headerLayoutCount
 
                 val itemViewType = viewHolder.itemViewType
                 val provider = mItemProviders.get(itemViewType)
@@ -92,7 +92,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnLongClickListener false
                 }
-                position -= getHeaderLayoutCount()
+                position -= headerLayoutCount
 
                 val itemViewType = viewHolder.itemViewType
                 val provider = mItemProviders.get(itemViewType)
@@ -115,7 +115,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnClickListener
                         }
-                        position -= getHeaderLayoutCount()
+                        position -= headerLayoutCount
                         provider.onChildClick(viewHolder, v, data[position], position)
                     }
                 }
@@ -134,7 +134,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnLongClickListener false
                         }
-                        position -= getHeaderLayoutCount()
+                        position -= headerLayoutCount
                         provider.onChildLongClick(viewHolder, v, data[position], position)
                     }
                 }