Merge pull request #2914 from Isira-Seneviratne/take

Use take() extension.
libre-tube · Jan 30, 2023 · a293480 · a293480
2 parents 3e6fb49 + 02d9aa5
commit a293480
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/WithMaxSize.kt b/app/src/main/java/com/github/libretube/ui/extensions/WithMaxSize.kt
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
@@ -22,7 +22,6 @@ import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
 import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
-import com.github.libretube.ui.extensions.withMaxSize
 import com.github.libretube.util.LocaleHelper
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -73,7 +72,7 @@ class HomeFragment : BaseFragment() {
 
     private suspend fun fetchHome() {
         runOrError {
-            val feed = SubscriptionHelper.getFeed().withMaxSize(20)
+            val feed = SubscriptionHelper.getFeed().take(20)
             if (feed.isEmpty()) return@runOrError
             runOnUiThread {
                 makeVisible(binding.featuredRV, binding.featuredTV)
@@ -90,9 +89,8 @@ class HomeFragment : BaseFragment() {
         }
 
         runOrError {
-            val trending = RetrofitInstance.api.getTrending(
-                LocaleHelper.getTrendingRegion(requireContext())
-            ).withMaxSize(10)
+            val region = LocaleHelper.getTrendingRegion(requireContext())
+            val trending = RetrofitInstance.api.getTrending(region).take(10)
             if (trending.isEmpty()) return@runOrError
             runOnUiThread {
                 makeVisible(binding.trendingRV, binding.trendingTV)
@@ -105,7 +103,7 @@ class HomeFragment : BaseFragment() {
         }
 
         runOrError {
-            val playlists = PlaylistsHelper.getPlaylists().withMaxSize(20)
+            val playlists = PlaylistsHelper.getPlaylists().take(20)
             if (playlists.isEmpty()) return@runOrError
             runOnUiThread {
                 makeVisible(binding.playlistsRV, binding.playlistsTV)