From 02d9aa56550373e6c18f3495246c93489ec05a70 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Mon, 30 Jan 2023 20:44:26 +0530 Subject: [PATCH] Use take() extension. --- .../com/github/libretube/ui/extensions/WithMaxSize.kt | 5 ----- .../com/github/libretube/ui/fragments/HomeFragment.kt | 10 ++++------ 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 app/src/main/java/com/github/libretube/ui/extensions/WithMaxSize.kt 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 deleted file mode 100644 index 4eec26c62..000000000 --- a/app/src/main/java/com/github/libretube/ui/extensions/WithMaxSize.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.libretube.ui.extensions - -fun List.withMaxSize(maxSize: Int): List { - return this.filterIndexed { index, _ -> index < maxSize } -} 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 index 4dad21d5a..97f75c4be 100644 --- 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)