From 0e66006db638bfdeae097c6237a9e0177f0cc7bb Mon Sep 17 00:00:00 2001 From: Petrus Nguyen Thai Hoc Date: Thu, 13 Aug 2020 18:54:22 +0700 Subject: [PATCH] update deps --- .idea/.gitignore | 3 + .idea/codeStyles/Project.xml | 139 ++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 6 + .idea/gradle.xml | 22 +++ .idea/jarRepositories.xml | 30 ++++ .idea/misc.xml | 9 ++ .idea/vcs.xml | 6 + app/build.gradle | 32 ++-- .../ExampleInstrumentedTest.kt | 2 +- app/src/main/AndroidManifest.xml | 4 +- .../Data.kt | 2 +- .../FooterAdapter.kt | 4 +- .../MainActivity.kt | 8 +- .../MainVM.kt | 4 +- .../UserAdapter.kt | 4 +- .../viewModelFactoryProducer.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- .../ExampleUnitTest.kt | 2 +- settings.gradle | 2 +- 20 files changed, 256 insertions(+), 32 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml rename app/src/androidTest/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/ExampleInstrumentedTest.kt (94%) rename app/src/main/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/Data.kt (96%) rename app/src/main/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/FooterAdapter.kt (94%) rename app/src/main/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/MainActivity.kt (92%) rename app/src/main/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/MainVM.kt (97%) rename app/src/main/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/UserAdapter.kt (90%) rename app/src/main/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/viewModelFactoryProducer.kt (92%) rename app/src/test/java/com/hoc/{mergeadapter_sample => concatadapter_sample}/ExampleUnitTest.kt (89%) diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..3c7772a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..41bc71b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..816a2b2 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..19aa6a5 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ae90887..94478df 100644 --- a/app/build.gradle +++ b/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' diff --git a/app/src/androidTest/java/com/hoc/mergeadapter_sample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/hoc/concatadapter_sample/ExampleInstrumentedTest.kt similarity index 94% rename from app/src/androidTest/java/com/hoc/mergeadapter_sample/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/hoc/concatadapter_sample/ExampleInstrumentedTest.kt index cd011fa..f4a4a5c 100644 --- a/app/src/androidTest/java/com/hoc/mergeadapter_sample/ExampleInstrumentedTest.kt +++ b/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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 84a4a20..7c4e29e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.hoc.concatadapter_sample"> + @@ -16,6 +17,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/hoc/mergeadapter_sample/Data.kt b/app/src/main/java/com/hoc/concatadapter_sample/Data.kt similarity index 96% rename from app/src/main/java/com/hoc/mergeadapter_sample/Data.kt rename to app/src/main/java/com/hoc/concatadapter_sample/Data.kt index f29923b..8b5ad14 100644 --- a/app/src/main/java/com/hoc/mergeadapter_sample/Data.kt +++ b/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 diff --git a/app/src/main/java/com/hoc/mergeadapter_sample/FooterAdapter.kt b/app/src/main/java/com/hoc/concatadapter_sample/FooterAdapter.kt similarity index 94% rename from app/src/main/java/com/hoc/mergeadapter_sample/FooterAdapter.kt rename to app/src/main/java/com/hoc/concatadapter_sample/FooterAdapter.kt index f6a4b85..f237606 100644 --- a/app/src/main/java/com/hoc/mergeadapter_sample/FooterAdapter.kt +++ b/app/src/main/java/com/hoc/concatadapter_sample/FooterAdapter.kt @@ -1,4 +1,4 @@ -package com.hoc.mergeadapter_sample +package com.hoc.concatadapter_sample import android.view.LayoutInflater import android.view.View @@ -6,7 +6,7 @@ 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(object : diff --git a/app/src/main/java/com/hoc/mergeadapter_sample/MainActivity.kt b/app/src/main/java/com/hoc/concatadapter_sample/MainActivity.kt similarity index 92% rename from app/src/main/java/com/hoc/mergeadapter_sample/MainActivity.kt rename to app/src/main/java/com/hoc/concatadapter_sample/MainActivity.kt index 400dcda..5b6affa 100644 --- a/app/src/main/java/com/hoc/mergeadapter_sample/MainActivity.kt +++ b/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 diff --git a/app/src/main/java/com/hoc/mergeadapter_sample/MainVM.kt b/app/src/main/java/com/hoc/concatadapter_sample/MainVM.kt similarity index 97% rename from app/src/main/java/com/hoc/mergeadapter_sample/MainVM.kt rename to app/src/main/java/com/hoc/concatadapter_sample/MainVM.kt index a35da1b..11dc23d 100644 --- a/app/src/main/java/com/hoc/mergeadapter_sample/MainVM.kt +++ b/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 diff --git a/app/src/main/java/com/hoc/mergeadapter_sample/UserAdapter.kt b/app/src/main/java/com/hoc/concatadapter_sample/UserAdapter.kt similarity index 90% rename from app/src/main/java/com/hoc/mergeadapter_sample/UserAdapter.kt rename to app/src/main/java/com/hoc/concatadapter_sample/UserAdapter.kt index 76f036d..e590e9e 100644 --- a/app/src/main/java/com/hoc/mergeadapter_sample/UserAdapter.kt +++ b/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(object : DiffUtil.ItemCallback() { diff --git a/app/src/main/java/com/hoc/mergeadapter_sample/viewModelFactoryProducer.kt b/app/src/main/java/com/hoc/concatadapter_sample/viewModelFactoryProducer.kt similarity index 92% rename from app/src/main/java/com/hoc/mergeadapter_sample/viewModelFactoryProducer.kt rename to app/src/main/java/com/hoc/concatadapter_sample/viewModelFactoryProducer.kt index 296cc74..cb26dc9 100644 --- a/app/src/main/java/com/hoc/mergeadapter_sample/viewModelFactoryProducer.kt +++ b/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 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 785a7d0..8a5d87c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - MergeAdapter-sample + ConcatAdapter-sample diff --git a/app/src/test/java/com/hoc/mergeadapter_sample/ExampleUnitTest.kt b/app/src/test/java/com/hoc/concatadapter_sample/ExampleUnitTest.kt similarity index 89% rename from app/src/test/java/com/hoc/mergeadapter_sample/ExampleUnitTest.kt rename to app/src/test/java/com/hoc/concatadapter_sample/ExampleUnitTest.kt index 209be71..70573fa 100644 --- a/app/src/test/java/com/hoc/mergeadapter_sample/ExampleUnitTest.kt +++ b/app/src/test/java/com/hoc/concatadapter_sample/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.hoc.mergeadapter_sample +package com.hoc.concatadapter_sample import org.junit.Test diff --git a/settings.gradle b/settings.gradle index 5ce7420..5b21a56 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name='MergeAdapter-sample' +rootProject.name='ConcatAdapter-sample' include ':app'