.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: cimg/android:2023.04
     environment:
       JVM_OPTS: -Xmx3200m
     steps:

.travis.yml

@@ -1,21 +1,20 @@
 language: android
 dist: trusty
-jdk: oraclejdk8
+jdk: oraclejdk11
 sudo: false
 
 android:
 components:
     - tools
     - platform-tools
-    - build-tools-28.0.3
-    - android-28
+    - build-tools-33.0.0
+    - android-32
     - extra-android-m2repository
-    - extra-android-support
 before_install:
   - chmod +x gradlew
   - mkdir "$ANDROID_HOME/licenses" || true
   # Hack to accept Android licenses
-  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-32"
 
 script:
   - ./gradlew assembleRelease

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 陈宇明
+Copyright (c) 2023 陈宇明
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,34 +1,33 @@
 ![](https://user-images.githubusercontent.com/7698209/33198075-ef8f2230-d123-11e7-85a3-4cb9b22f877d.png)
-[![](https://jitpack.io/v/CymChad/BaseRecyclerViewAdapterHelper.svg)](https://jitpack.io/#CymChad/BaseRecyclerViewAdapterHelper)![](https://travis-ci.org/CymChad/BaseRecyclerViewAdapterHelper.svg?branch=master)[![API](https://img.shields.io/badge/API-14%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=14)[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BaseRecyclerViewAdapterHelper-green.svg?style=true)](https://android-arsenal.com/details/1/3644)[![CircleCI](https://circleci.com/gh/CymChad/BaseRecyclerViewAdapterHelper/tree/master.svg?style=svg)](https://circleci.com/gh/CymChad/BaseRecyclerViewAdapterHelper/tree/master)[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2302d0084d0048eaa0f9bac4350837a0)](https://www.codacy.com/app/CymChad/BaseRecyclerViewAdapterHelper?utm_source=github.com&utm_medium=referral&utm_content=CymChad/BaseRecyclerViewAdapterHelper&utm_campaign=Badge_Grade)[![](https://img.shields.io/badge/%E4%BD%9C%E8%80%85-%E9%99%88%E5%AE%87%E6%98%8E-7AD6FD.svg)](https://mp.weixin.qq.com/s/5UlMx9HDgEcvxJb4w5-gBA)  
+[![](https://img.shields.io/maven-central/v/io.github.cymchad/BaseRecyclerViewAdapterHelper4)](https://repo.maven.apache.org/maven2/io/github/cymchad/BaseRecyclerViewAdapterHelper4/) [![API](https://img.shields.io/badge/API-16%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=16) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BaseRecyclerViewAdapterHelper-green.svg?style=true)](https://android-arsenal.com/details/1/3644) [![CircleCI](https://circleci.com/gh/CymChad/BaseRecyclerViewAdapterHelper/tree/master.svg?style=svg)](https://circleci.com/gh/CymChad/BaseRecyclerViewAdapterHelper/tree/master) [![](https://img.shields.io/badge/%E4%BD%9C%E8%80%85-%E9%99%88%E5%AE%87%E6%98%8E-7AD6FD.svg)](https://mp.weixin.qq.com/s/U4QAPlu5WDm8U5Ljc7TuAQ) [![](https://img.shields.io/badge/%E4%BD%9C%E8%80%85-limuyang2-7AD6FD)](https://github.com/limuyang2)  
 # BRVAH
-http://www.recyclerview.org/
 
 Powerful and flexible RecyclerView Adapter,
 Please feel free to use this. (Welcome to **Star** and **Fork**)  
 
 强大而灵活的RecyclerView Adapter（欢迎 **Star** 和 **Fork**）
 
-
 ​    
-新版4.x.x已发布 alpha 版本，完美兼容`ConcatAdapter`，解决了许多遗留问题，拆分了功能模块，BaseAdapter更加简洁干净。“多类型布局”更加灵活。向上、向下加载得到极大加强。
+新版4.x.x已发布，完美兼容`ConcatAdapter`，解决了许多遗留问题，拆分了功能模块，BaseAdapter更加简洁干净。“多类型布局”更加灵活。向上、向下加载得到极大加强。
 v4版本已经上传 maven 中央仓库，不需要再引入三方仓库配置了。欢迎尝试。
-**注意，4.0为非兼容升级，建议在新项目尝试**
 ```
-implementation "io.github.cymchad:BaseRecyclerViewAdapterHelper:4.0.0-beta02"
+implementation "io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4"
 ```
 
 
 Of course, you can continue to use the [2.x](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/tree/2.x) version.
 
-当然，你也可以继续使用[2.x](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/tree/2.x) 版本、[3.x.x](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/blob/master/readme/0-BaseRecyclerViewAdapterHelper.md)版本。
+当然，你也可以继续使用[2.x](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/tree/2.x) 版本、[3.x](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/blob/3.x/readme/0-BaseRecyclerViewAdapterHelper.md)版本。
 
 # Document
 - English Writing ...
-- [中文](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/blob/master/readme/0-BaseRecyclerViewAdapterHelper.md)
+- [3.0版本 中文](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/blob/3.x/readme/0-BaseRecyclerViewAdapterHelper.md)
+- [4.0版本 中文](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/wiki)
+
 
 (由于各位项目成员工作较为繁忙，请各位同学谅解)
 
-## 4.x Demo
+## v4 版本 Demo
 [wiki](https://github.com/CymChad/BaseRecyclerViewAdapterHelper/wiki)
 
 

app/build.gradle

@@ -1,17 +1,19 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
+}
 
 android {
-    compileSdkVersion 31
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.chad.baserecyclerviewadapterhelper"
-        minSdkVersion 16
-        targetSdkVersion 31
-        versionCode 9
-        versionName "3.0"
+        minSdk 21
+        targetSdk 34
+        versionCode 10
+        versionName "4.0"
     }
     buildTypes {
         release {
@@ -27,26 +29,34 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     buildFeatures {
         viewBinding = true
         dataBinding = true
     }
+    namespace 'com.chad.baserecyclerviewadapterhelper'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation project(path: ':library')
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.kyleduo.switchbutton:library:2.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "androidx.core:core-ktx:1.13.1"
+
+    implementation 'com.kyleduo.switchbutton:library:2.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+
+    implementation("com.squareup.moshi:moshi:1.15.1")
+    ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.1")
+
+    implementation 'com.jaredrummler:material-spinner:1.3.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,46 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.chad.baserecyclerviewadapterhelper">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:allowBackup="true"
+        android:name=".MyApplication"
         android:icon="@mipmap/logo"
         android:label="BRVAH"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:name=".MyApplication"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name=".activity.WelcomeActivity"
-            android:exported="true">
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:name=".activity.WelcomeActivity"
+            android:exported="true"
+            android:theme="@style/WelcomeTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".activity.HomeActivity" />
-        <activity android:name=".activity.multi.ChooseMultipleItemUseTypeActivity" />
-        <activity android:name=".activity.AnimationUseActivity" />
-        <activity android:name=".activity.multi.MultiItemQuickUseActivity" />
-        <activity android:name=".activity.multi.MultiItemDelegateUseActivity" />
-        <activity android:name=".activity.multi.MultiItemProviderUseActivity" />
-        <activity android:name=".activity.HeaderAndFooterUseActivity" />
-        <activity android:name=".activity.LoadMoreRefreshUseActivity" />
-        <activity android:name=".activity.SectionQuickUseActivity" />
-        <activity android:name=".activity.EmptyViewUseActivity" />
-        <activity android:name=".activity.ItemClickActivity" />
-        <activity android:name=".activity.DataBindingUseActivity" />
-        <activity android:name=".activity.DragAndSwipeUseActivity" />
-        <activity android:name=".activity.UpFetchUseActivity" />
-        <activity android:name=".activity.node.NodeSectionUseActivity" />
-        <activity android:name=".activity.DiffUtilActivity" />
-        <activity android:name=".activity.node.ChooseNodeUseTypeActivity" />
-        <activity android:name=".activity.node.NodeTreeUseActivity" />
-        <activity android:name=".activity.multi.BinderUseActivity" />
+        <activity
+            android:name=".activity.home.HomeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.animation.AnimationUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.headerfooter.HeaderAndFooterUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.loadmore.AutoLoadMoreRefreshUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.emptyview.EmptyViewUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.itemclick.ItemClickActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.databinding.DataBindingUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.dragswipe.ManualDragAndSwipeUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.upfetch.UpFetchUseActivity"
+            android:exported="false" /> <!-- <activity android:name=".activity.node.NodeSectionUseActivity" /> -->
+        <activity
+            android:name=".activity.differ.DifferActivity"
+            android:exported="false" /> <!-- <activity android:name=".activity.node.ChooseNodeUseTypeActivity" /> -->
+        <activity
+            android:name=".activity.loadmore.NoAutoAutoLoadMoreRefreshUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.dragswipe.DragAndSwipeDifferActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.dragswipe.HeaderDragAndSwipeActivity"
+            android:exported="false" />
+
+        <activity
+            android:name=".activity.dragswipe.DragAndSwipeUseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.dragswipe.DefaultDragAndSwipeActivity"
+            android:exported="false" />
+        <activity android:name=".activity.scene.GroupDemoActivity" />
     </application>
 
 </manifest>

app/src/main/java/com/chad/baserecyclerviewadapterhelper/MyApplication.java → app/src/main/java/com/chad/baserecyclerviewadapterhelper/MyApplication.kt

@@ -12,10 +12,10 @@
 **------------------------------------------------------------------------------
 ********************************End of Head************************************\
 */
-package com.chad.baserecyclerviewadapterhelper;
+package com.chad.baserecyclerviewadapterhelper
 
-import android.app.Application;
-import com.chad.baserecyclerviewadapterhelper.utils.Utils;
+import android.app.Application
+import com.chad.baserecyclerviewadapterhelper.utils.AppUtils
 
 /**
  * 文 件 名: MyApplication
@@ -25,18 +25,9 @@
  * 修改时间：
  * 修改备注：
  */
-public class MyApplication extends Application {
-    private static MyApplication appContext;
-
-    public static MyApplication getInstance() {
-        return appContext;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        appContext = this;
-        Utils.init(this);
-
+class MyApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        AppUtils.init(this)
     }
-}
+}