更新SDK

Author: xiaoxiaoying

README.md

@@ -1,8 +1,8 @@
 # RecyclerArrayAdapter
 
 ###### `Java 8.0`
-###### `Kotlin 1.7.0`
-###### `SDk 31`
+###### `Kotlin 1.7.10`
+###### `SDk 33`
 ###### `Androidx`
 
 * 方便快捷的 `ArrayAdapter`
@@ -37,5 +37,5 @@
 #### 使用
 
 ```
-implementation 'com.github.xiaoxiaoying:Page-RecyclerView-ArrayAdpter:1.4.1'
+implementation 'com.github.xiaoxiaoying:Page-RecyclerView-ArrayAdpter:1.4.2'
 ```

app/build.gradle

@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         applicationId "com.xiaoxiaoying.recyclerarrayadapter.demo"
         minSdkVersion 15
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -31,10 +31,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation project(path: ':recyclerarrayadapter')
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.0'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.1.2"
+        classpath "com.android.tools.build:gradle:7.3.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 //        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 //        classpath 'com.novoda:bintray-release:0.9.2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Jan 14 12:10:13 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

recyclerarrayadapter/build.gradle

@@ -8,13 +8,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 //apply plugin: 'com.github.dcendents.android-maven'
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 31
-        versionCode 21
-        versionName "1.4.1"
+        targetSdkVersion 33
+        versionCode 22
+        versionName "1.4.2"
 
     }
     compileOptions {
@@ -42,11 +42,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }
 

recyclerarrayadapter/src/main/java/com/xiaoxiaoying/recyclerarrayadapter/adapter/ArrayAdapter.kt

@@ -16,14 +16,11 @@ import java.util.*
  * create by xiaoxiaoying on 2019-06-21
  * @author xiaoxiaoying
  */
-abstract class ArrayAdapter<T, H : ArrayAdapter.ViewHolder<T>>(
+abstract class ArrayAdapter<T, H : ArrayAdapter.ViewHolder<T>> @JvmOverloads constructor(
     private val context: Context,
     @LayoutRes private val resId: Int = 0,
-    private val arrays: MutableList<T>
+    private val arrays: MutableList<T> = mutableListOf()
 ) : RecyclerView.Adapter<H>() {
-    constructor(context: Context) : this(context, 0)
-    constructor(context: Context, resource: Int) : this(context, resource, ArrayList<T>())
-
 
     companion object {
         private val mLock = Any()
@@ -73,6 +70,26 @@ abstract class ArrayAdapter<T, H : ArrayAdapter.ViewHolder<T>>(
         notifyItemRangeInserted(index, 1)
     }
 
+    fun insert(vararg objects: T, startIndex: Int) {
+        if (startIndex > arrays.size) return
+        synchronized(mLock)
+        {
+            objects.forEachIndexed { index, t ->
+                insert(t, index + startIndex)
+            }
+        }
+    }
+
+    fun insert(collection: Collection<T>, startIndex: Int) {
+        if (startIndex > arrays.size) return
+        synchronized(mLock)
+        {
+            collection.forEachIndexed { index, t ->
+                insert(t, index + startIndex)
+            }
+        }
+    }
+
     /**
      * Removes the specified object from the array.
      *
@@ -114,12 +131,14 @@ abstract class ArrayAdapter<T, H : ArrayAdapter.ViewHolder<T>>(
     fun removeItem(count: Int, startPosition: Int) {
         synchronized(mLock)
         {
-            for (position in 0 until count) {
-                val deletePosition = position + startPosition
-                if (arrays.size <= deletePosition) return
-                arrays.removeAt(deletePosition)
+            repeat(count) {
+                val deletePosition = it - 1 + startPosition
+                if (arrays.size > deletePosition) {
+                    arrays.removeAt(deletePosition)
+                }
 
             }
+
             notifyItemRangeRemoved(startPosition, count)
         }
     }
@@ -132,6 +151,10 @@ abstract class ArrayAdapter<T, H : ArrayAdapter.ViewHolder<T>>(
      */
     fun findItemPosition(item: T): Int = arrays.indexOf(item)
 
+    fun find(predicate: (T) -> Boolean) {
+        arrays.find(predicate)
+    }
+
     fun clean() {
         synchronized(mLock)
         {