update dependencies; add one more example

README.md

@@ -93,6 +93,7 @@ Now you can use DiffUtilCompositeAdapter just like the base RecyclerView.Adapter
 
 ![example](https://github.com/Liverm0r/DelegateAdapters/blob/master/feed_example.jpg)
 
+
 ## Example of usage in Java
 
 Write a Model:

build.gradle

@@ -1,25 +1,27 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.40'
     repositories {
         jcenter()
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 ext {
     minSdk = "14"
-    compileSdk = 28
-    targetSdk = 28
-    supportLib = "28.0.0"
-    buildTool = "27.0.3"
+    compileSdk = 29
+    targetSdk = 29
+    buildTool = "29.0.0"
+    androidX = "1.0.2"
+    recycler = "1.0.0"
 }
 
 allprojects {

delegateadapter/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 group='com.github.Liverm0r'
 
@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -31,9 +31,11 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$supportLib"
-    implementation "com.android.support:recyclerview-v7:$supportLib"
+    implementation "androidx.appcompat:appcompat:$androidX"
+    implementation "androidx.recyclerview:recyclerview:$recycler"
+    testImplementation 'junit:junit:4.12'
+    implementation "androidx.core:core-ktx:$androidX"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
     mavenCentral()

delegateadapter/src/main/java/com/example/delegateadapter/delegate/BaseDelegateAdapter.java

@@ -1,12 +1,13 @@
 package com.example.delegateadapter.delegate;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 /**

delegateadapter/src/main/java/com/example/delegateadapter/delegate/BaseViewHolder.java

@@ -1,8 +1,9 @@
 package com.example.delegateadapter.delegate;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * @author dumchev on 04.11.17.
  */

delegateadapter/src/main/java/com/example/delegateadapter/delegate/CompositeDelegateAdapter.java

@@ -1,10 +1,11 @@
 package com.example.delegateadapter.delegate;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.ArrayList;
 import java.util.List;
 

delegateadapter/src/main/java/com/example/delegateadapter/delegate/IDelegateAdapter.java

@@ -1,9 +1,10 @@
 package com.example.delegateadapter.delegate;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 /**

delegateadapter/src/main/java/com/example/delegateadapter/delegate/diff/DiffUtilCallback.java

@@ -1,7 +1,8 @@
 package com.example.delegateadapter.delegate.diff;
 
-import android.support.annotation.NonNull;
-import android.support.v7.util.DiffUtil;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
 
 import java.util.List;
 

delegateadapter/src/main/java/com/example/delegateadapter/delegate/diff/DiffUtilCompositeAdapter.java

@@ -1,9 +1,10 @@
 package com.example.delegateadapter.delegate.diff;
 
-import android.support.annotation.NonNull;
-import android.support.v7.util.DiffUtil;
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+
 import com.example.delegateadapter.delegate.CompositeDelegateAdapter;
 import com.example.delegateadapter.delegate.IDelegateAdapter;
 

example/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion compileSdk
@@ -11,7 +11,7 @@ android {
         targetSdkVersion targetSdk
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -27,7 +27,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':delegateadapter')
-    implementation "com.android.support:recyclerview-v7:$supportLib"
-    implementation "com.android.support:appcompat-v7:$supportLib"
+    implementation "androidx.recyclerview:recyclerview:$recycler"
+    implementation "androidx.appcompat:appcompat:$androidX"
     testImplementation 'junit:junit:4.12'
+    implementation "androidx.core:core-ktx:$androidX"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
 }

example/src/main/AndroidManifest.xml

@@ -21,6 +21,11 @@
             android:label="@string/title_activity_base_example"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
+        <activity
+            android:name=".base.KotlinBaseExampleActivity"
+            android:label="@string/title_activity_base_example"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
     </application>
 
 </manifest>

example/src/main/java/com/example/dumchev/delegateadapters/MainActivity.java

@@ -2,16 +2,17 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
-import com.example.dumchev.delegateadapters.base.BaseExampleActivity;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.dumchev.delegateadapters.base.KotlinBaseExampleActivity;
 
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        startActivity(new Intent(this, BaseExampleActivity.class));
+        startActivity(new Intent(this, KotlinBaseExampleActivity.class));
     }
 }

example/src/main/java/com/example/dumchev/delegateadapters/base/BadAdapter.java

@@ -1,13 +1,14 @@
 package com.example.dumchev.delegateadapters.base;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.example.delegateadapter.delegate.diff.IComparableItem;
 import com.example.dumchev.delegateadapters.R;
 import com.example.dumchev.delegateadapters.base.model.ImageViewModel;

example/src/main/java/com/example/dumchev/delegateadapters/base/BaseExampleActivity.java

@@ -1,13 +1,14 @@
 package com.example.dumchev.delegateadapters.base;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.example.delegateadapter.delegate.diff.DiffUtilCompositeAdapter;
 import com.example.dumchev.delegateadapters.R;
 import com.example.dumchev.delegateadapters.base.adapter.CheckDelegateAdapter;

example/src/main/java/com/example/dumchev/delegateadapters/base/KotlinBaseExampleActivity.kt

@@ -0,0 +1,42 @@
+package com.example.dumchev.delegateadapters.base
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.delegateadapter.delegate.diff.DiffUtilCompositeAdapter
+import com.example.dumchev.delegateadapters.base.adapter.CheckDelegateAdapter
+import com.example.dumchev.delegateadapters.base.adapter.GenerateItemsDelegateAdapter
+import com.example.dumchev.delegateadapters.base.adapter.TextDelegateAdapter
+import kotlinx.android.synthetic.main.activity_base_example.*
+
+class KotlinBaseExampleActivity : AppCompatActivity() {
+
+    private val diffAdapter by lazy {
+        DiffUtilCompositeAdapter.Builder()
+                .add(GenerateItemsDelegateAdapter { generateNewData() })
+                .add(TextDelegateAdapter())
+                .add(CheckDelegateAdapter())
+                .build()
+    }
+
+    private fun generateNewData() {
+        diffAdapter.swapData(MockDataFactory.prepareData())
+        rv.scrollToPosition(0)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(com.example.dumchev.delegateadapters.R.layout.activity_base_example)
+        rv.run {
+            layoutManager = LinearLayoutManager(this@KotlinBaseExampleActivity)
+            adapter  = diffAdapter
+            generateNewData()
+        }
+    }
+
+    fun onGenerateButtonClicked(view: View) {
+        diffAdapter.swapData(MockDataFactory.prepareData())
+        rv.scrollToPosition(0)
+    }
+}

example/src/main/java/com/example/dumchev/delegateadapters/base/MockDataFactory.java

@@ -3,7 +3,6 @@
 import com.example.delegateadapter.delegate.diff.IComparableItem;
 import com.example.dumchev.delegateadapters.R;
 import com.example.dumchev.delegateadapters.base.model.CheckViewModel;
-import com.example.dumchev.delegateadapters.base.model.IViewModel;
 import com.example.dumchev.delegateadapters.base.model.ImageViewModel;
 import com.example.dumchev.delegateadapters.base.model.TextViewModel;
 

example/src/main/java/com/example/dumchev/delegateadapters/base/adapter/GenerateItemsDelegateAdapter.kt

@@ -0,0 +1,20 @@
+package com.example.dumchev.delegateadapters.base.adapter
+
+import com.example.delegateadapter.delegate.KDelegateAdapter
+import com.example.dumchev.delegateadapters.R
+import com.example.dumchev.delegateadapters.base.model.ImageViewModel
+import kotlinx.android.synthetic.main.image_item.*
+
+class GenerateItemsDelegateAdapter(private val generateNewItems: () -> Unit) :
+        KDelegateAdapter<ImageViewModel>() {
+
+    override fun onBind(item: ImageViewModel, viewHolder: KViewHolder) = with(viewHolder) {
+        tv_title.text = item.title
+        img_bg.setImageResource(item.imageRes)
+        itemView.setOnClickListener { generateNewItems() }
+    }
+
+    override fun getLayoutId(): Int = R.layout.image_item
+
+    override fun isForViewType(items: List<*>, position: Int) = items[position] is ImageViewModel
+}

example/src/main/java/com/example/dumchev/delegateadapters/base/adapter/TextDelegateAdapter.java

@@ -1,8 +1,8 @@
 package com.example.dumchev.delegateadapters.base.adapter;
 
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
 
 import com.example.delegateadapter.delegate.BaseDelegateAdapter;
 import com.example.delegateadapter.delegate.BaseViewHolder;

example/src/main/java/com/example/dumchev/delegateadapters/base/model/ImageViewModel.kt

@@ -1,7 +1,6 @@
 package com.example.dumchev.delegateadapters.base.model
 
-import android.support.annotation.DrawableRes
-
+import androidx.annotation.DrawableRes
 import com.example.delegateadapter.delegate.diff.IComparableItem
 
 /**