update deps

app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.1"
 
     defaultConfig {
-        applicationId "com.hoc.mergeadapter_sample"
+        applicationId "com.hoc.concatdapter_sample"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -42,19 +42,21 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.4'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
+    implementation 'androidx.core:core-ktx:1.5.0-alpha01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
+
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha06'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha06'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha06'
+
+    implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha07'
 
     // coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

app/src/androidTest/java/com/hoc/mergeadapter_sample/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/hoc/concatadapter_sample/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.mergeadapter_sample">
+    package="com.hoc.concatadapter_sample">
 
     <application
         android:allowBackup="true"
@@ -9,13 +9,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>

app/src/main/java/com/hoc/mergeadapter_sample/Data.kt → app/src/main/java/com/hoc/concatadapter_sample/Data.kt

@@ -1,4 +1,4 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import android.util.Log
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/hoc/mergeadapter_sample/FooterAdapter.kt → app/src/main/java/com/hoc/concatadapter_sample/FooterAdapter.kt

@@ -1,12 +1,12 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.hoc.mergeadapter_sample.databinding.ItemFooterBinding
+import com.hoc.concatadapter_sample.databinding.ItemFooterBinding
 
 class FooterAdapter(private val onRetry: () -> Unit) :
   ListAdapter<PlaceholderState, FooterAdapter.VH>(object :

app/src/main/java/com/hoc/mergeadapter_sample/MainActivity.kt → app/src/main/java/com/hoc/concatadapter_sample/MainActivity.kt

@@ -1,14 +1,14 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import android.os.Bundle
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.MergeAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.hoc.mergeadapter_sample.databinding.ActivityMainBinding
+import com.hoc.concatadapter_sample.databinding.ActivityMainBinding
 import kotlin.LazyThreadSafetyMode.NONE
 
 class MainActivity : AppCompatActivity() {
@@ -27,7 +27,7 @@ class MainActivity : AppCompatActivity() {
     binding.recyclerView.run {
       setHasFixedSize(true)
       layoutManager = linearLayoutManager
-      adapter = MergeAdapter(userAdapter, footerAdapter)
+      adapter = ConcatAdapter(userAdapter, footerAdapter)
     }
 
     // observe livedatas

app/src/main/java/com/hoc/mergeadapter_sample/MainVM.kt → app/src/main/java/com/hoc/concatadapter_sample/MainVM.kt

@@ -1,8 +1,8 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import androidx.annotation.MainThread
 import androidx.lifecycle.*
-import com.hoc.mergeadapter_sample.PlaceholderState.*
+import com.hoc.concatadapter_sample.PlaceholderState.*
 import kotlinx.coroutines.launch
 import kotlin.LazyThreadSafetyMode.NONE
 

app/src/main/java/com/hoc/mergeadapter_sample/UserAdapter.kt → app/src/main/java/com/hoc/concatadapter_sample/UserAdapter.kt

@@ -1,11 +1,11 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.hoc.mergeadapter_sample.databinding.ItemUserBinding
+import com.hoc.concatadapter_sample.databinding.ItemUserBinding
 
 class UserAdapter :
   ListAdapter<User, UserAdapter.VH>(object : DiffUtil.ItemCallback<User>() {

app/src/main/java/com/hoc/mergeadapter_sample/viewModelFactoryProducer.kt → app/src/main/java/com/hoc/concatadapter_sample/viewModelFactoryProducer.kt

@@ -1,4 +1,4 @@
-package com.hoc.mergeadapter_sample
+package com.hoc.concatadapter_sample
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider