Merge pull request #75 from android/yaraki/Motion-update

Motion: Update dependencies

Author: yaraki

.github/workflows/android.yml

@@ -28,10 +28,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: set up JDK 1.8
+      - name: set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Build project
         run: .github/scripts/gradlew_recursive.sh assembleDebug
       - name: Zip artifacts

Motion/.idea/codeStyles/Project.xml

@@ -51,34 +51,33 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.transition:transition:1.3.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.fragment:fragment-ktx:1.3.6'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.transition:transition:1.4.1'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 
-    def lifecycle_version = '2.2.0'
+    def lifecycle_version = '2.3.1'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
-    def paging_version = '2.1.2'
-    implementation "androidx.paging:paging-runtime-ktx:$paging_version"
+    implementation 'androidx.paging:paging-runtime-ktx:3.0.1'
 
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.4.0'
 
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
 
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'com.google.truth:truth:1.0.1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'com.google.truth:truth:1.1.3'
 
-    testImplementation 'androidx.test:core:1.3.0'
-    androidTestImplementation 'androidx.test.ext:truth:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'androidx.test:core:1.4.0'
+    androidTestImplementation 'androidx.test.ext:truth:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

Motion/.idea/codeStyles/codeStyleConfig.xml

@@ -24,14 +24,14 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.animation.doOnEnd
-import androidx.paging.PagedListAdapter
+import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.example.android.motion.R
 import com.example.android.motion.model.Cheese
 
-internal class CheeseAdapter : PagedListAdapter<Cheese, CheeseViewHolder>(Cheese.DIFF_CALLBACK) {
+internal class CheeseAdapter : PagingDataAdapter<Cheese, CheeseViewHolder>(Cheese.DIFF_CALLBACK) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CheeseViewHolder {
         return CheeseViewHolder(parent)
@@ -90,7 +90,7 @@ internal class CheeseViewHolder(parent: ViewGroup) : RecyclerView.ViewHolder(
         // Shift the timing of fade-in/out for each item by its adapter position. We use the
         // elapsed real time to make this independent from the timing of method call.
         animation.currentPlayTime =
-            (SystemClock.elapsedRealtime() - adapterPosition * 30L) % FADE_DURATION
+            (SystemClock.elapsedRealtime() - bindingAdapterPosition * 30L) % FADE_DURATION
         animation.start()
         // Show the placeholder UI.
         image.setImageResource(R.drawable.image_placeholder)

Motion/.idea/misc.xml

@@ -16,37 +16,45 @@
 
 package com.example.android.motion.demo.loading
 
-import android.os.SystemClock
-import androidx.paging.DataSource
-import androidx.paging.PositionalDataSource
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
 import com.example.android.motion.model.Cheese
+import kotlinx.coroutines.delay
 
-class CheeseDataSource : PositionalDataSource<Cheese>() {
+class CheeseDataSource : PagingSource<Int, Cheese>() {
 
-    companion object Factory : DataSource.Factory<Int, Cheese>() {
-        override fun create(): DataSource<Int, Cheese> = CheeseDataSource()
+    override fun getRefreshKey(state: PagingState<Int, Cheese>): Int? {
+        return state.anchorPosition
     }
 
-    override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<Cheese>) {
-        // Simulate a slow network.
-        SystemClock.sleep(3000L)
-        callback.onResult(
-            Cheese.ALL.subList(
-                params.requestedStartPosition,
-                params.requestedStartPosition + params.requestedLoadSize
-            ),
-            params.requestedStartPosition,
-            Cheese.ALL.size
-        )
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Cheese> {
+        return params.key.let { position ->
+            if (position == null) {
+                LoadResult.Page(
+                    emptyList(),
+                    prevKey = null,
+                    nextKey = 0,
+                    itemsBefore = 0,
+                    itemsAfter = Cheese.ALL.size
+                )
+            } else {
+                // Simulate slow network.
+                delay(3000)
+                LoadResult.Page(
+                    Cheese.ALL.subList(
+                        position,
+                        (position + params.loadSize).coerceAtMost(Cheese.ALL.size)
+                    ),
+                    prevKey = (position - params.loadSize).orNullIf { it < 0 },
+                    nextKey = (position + params.loadSize).orNullIf { it >= Cheese.ALL.size },
+                    itemsBefore = position,
+                    itemsAfter = Cheese.ALL.size - position
+                )
+            }
+        }
     }
+}
 
-    override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<Cheese>) {
-        // Simulate a slow network.
-        SystemClock.sleep(3000L)
-        callback.onResult(
-            Cheese.ALL.subList(
-                params.startPosition, params.startPosition + params.loadSize
-            )
-        )
-    }
+private fun Int.orNullIf(condition: (Int) -> Boolean): Int? {
+    return if (condition(this)) null else this
 }

Motion/app/build.gradle

@@ -82,7 +82,7 @@ class LoadingActivity : AppCompatActivity() {
                 list.itemAnimator = null
                 TransitionManager.beginDelayedTransition(list, fade)
             }
-            cheeseAdapter.submitList(cheeses)
+            cheeseAdapter.submitData(lifecycle, cheeses)
         }
     }
 

Motion/app/src/main/java/com/example/android/motion/demo/loading/CheeseAdapter.kt

@@ -19,23 +19,27 @@ package com.example.android.motion.demo.loading
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.ViewModel
-import androidx.paging.PagedList
-import androidx.paging.toLiveData
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.liveData
 import com.example.android.motion.model.Cheese
 
 class LoadingViewModel : ViewModel() {
 
-    private var source: LiveData<PagedList<Cheese>>? = null
-    private val _cheeses = MediatorLiveData<PagedList<Cheese>>()
-    val cheeses: LiveData<PagedList<Cheese>> = _cheeses
+    private var source: LiveData<PagingData<Cheese>>? = null
+    private val _cheeses = MediatorLiveData<PagingData<Cheese>>()
+    val cheeses: LiveData<PagingData<Cheese>> = _cheeses
 
     init {
         refresh()
     }
 
     fun refresh() {
         source?.let { _cheeses.removeSource(it) }
-        val s = CheeseDataSource.toLiveData(pageSize = 15)
+        val s = Pager(PagingConfig(pageSize = 15)) {
+            CheeseDataSource()
+        }.liveData
         source = s
         _cheeses.addSource(s) { _cheeses.postValue(it) }
     }

Motion/app/src/main/java/com/example/android/motion/demo/loading/CheeseDataSource.kt

@@ -15,14 +15,14 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
-    ext.navigation_version = '2.3.1'
+    ext.kotlin_version = '1.5.30'
+    ext.navigation_version = '2.3.5'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
     }