Merge pull request #1030 from dlam/dlam/update-paging

dlam · web-flow · commit 79e64a6b3277 · 2021-10-27T11:24:03.000-07:00
Cleanup + bump paging to 3.1.0-beta01
diff --git a/BasicRxJavaSample/versions.gradle b/BasicRxJavaSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/BasicRxJavaSampleKotlin/versions.gradle b/BasicRxJavaSampleKotlin/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/BasicSample/versions.gradle b/BasicSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/GithubBrowserSample/versions.gradle b/GithubBrowserSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/LiveDataSample/versions.gradle b/LiveDataSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/MADSkillsNavigationSample/versions.gradle b/MADSkillsNavigationSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/NavigationAdvancedSample/versions.gradle b/NavigationAdvancedSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/NavigationBasicSample/versions.gradle b/NavigationBasicSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/PagingSample/versions.gradle b/PagingSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/ui/RedditActivity.kt b/PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/ui/RedditActivity.kt
@@ -136,7 +136,7 @@ class RedditActivity : AppCompatActivity() {
 
     private fun updatedSubredditFromInput() {
         binding.input.text.trim().toString().let {
-            if (it.isNotBlank() && model.shouldShowSubreddit(it)) {
+            if (it.isNotBlank()) {
                 model.showSubreddit(it)
             }
         }
diff --git a/PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/ui/SubRedditViewModel.kt b/PagingWithNetworkSample/app/src/main/java/com/android/example/paging/pagingwithnetwork/reddit/ui/SubRedditViewModel.kt
@@ -20,14 +20,10 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.viewModelScope
-import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import com.android.example.paging.pagingwithnetwork.reddit.repository.RedditPostRepository
-import com.android.example.paging.pagingwithnetwork.reddit.vo.RedditPost
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.flatMapLatest
 
 class SubRedditViewModel(
     private val repository: RedditPostRepository,
@@ -44,28 +40,20 @@ class SubRedditViewModel(
         }
     }
 
-    private val clearListCh = Channel<Unit>(Channel.CONFLATED)
-
-    @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
-    val posts = flowOf(
-        clearListCh.receiveAsFlow().map { PagingData.empty<RedditPost>() },
-        savedStateHandle.getLiveData<String>(KEY_SUBREDDIT)
-            .asFlow()
-            .flatMapLatest { repository.postsOfSubreddit(it, 30) }
-            // cachedIn() shares the paging state across multiple consumers of posts,
-            // e.g. different generations of UI across rotation config change
-            .cachedIn(viewModelScope)
-    ).flattenMerge(2)
-
-    fun shouldShowSubreddit(
-        subreddit: String
-    ) = savedStateHandle.get<String>(KEY_SUBREDDIT) != subreddit
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val posts = savedStateHandle.getLiveData<String>(KEY_SUBREDDIT)
+        .asFlow()
+        .flatMapLatest { repository.postsOfSubreddit(it, 30) }
+        // cachedIn() shares the paging state across multiple consumers of posts,
+        // e.g. different generations of UI across rotation config change
+        .cachedIn(viewModelScope)
 
     fun showSubreddit(subreddit: String) {
         if (!shouldShowSubreddit(subreddit)) return
-
-        clearListCh.offer(Unit)
-
         savedStateHandle.set(KEY_SUBREDDIT, subreddit)
     }
+
+    private fun shouldShowSubreddit(subreddit: String): Boolean {
+        return savedStateHandle.get<String>(KEY_SUBREDDIT) != subreddit
+    }
 }
diff --git a/PagingWithNetworkSample/versions.gradle b/PagingWithNetworkSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/PersistenceContentProviderSample/versions.gradle b/PersistenceContentProviderSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/PersistenceMigrationsSample/versions.gradle b/PersistenceMigrationsSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/ViewBindingSample/versions.gradle b/ViewBindingSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/WorkManagerMultiprocessSample/versions.gradle b/WorkManagerMultiprocessSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/WorkManagerSample/versions.gradle b/WorkManagerSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"
diff --git a/versions.gradle b/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.1.0-alpha04"
+versions.paging = "3.1.0-beta01"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ class RedditActivity : AppCompatActivity() {`
`136`	`136`
`137`	`137`	`private fun updatedSubredditFromInput() {`
`138`	`138`	`binding.input.text.trim().toString().let {`
`139`		`- if (it.isNotBlank() && model.shouldShowSubreddit(it)) {`
	`139`	`+ if (it.isNotBlank()) {`
`140`	`140`	`model.showSubreddit(it)`
`141`	`141`	`}`
`142`	`142`	`}`