From d9a64d9bf04f3e4ccb76d6ed559a391084cf406c Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 7 Sep 2025 09:54:30 +0530 Subject: [PATCH] Fix compilation error --- .../ui/emptystate/EmptyStateComposable.kt | 4 ++++ .../schabi/newpipe/ui/screens/PlaylistScreen.kt | 16 +++------------- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt index 77fa02082..349f96721 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt @@ -96,6 +96,10 @@ enum class EmptyStateSpec( emojiText = "¯\\_(╹x╹)_/¯", descriptionText = R.string.error_unable_to_load_comments, ), + ErrorLoadingItems( + emojiText = "¯\\_(╹x╹)_/¯", + descriptionText = R.string.error_unable_to_load_items, + ), NoSearchResult( emojiText = "╰(°●°╰)", descriptionText = R.string.search_no_results, diff --git a/app/src/main/java/org/schabi/newpipe/ui/screens/PlaylistScreen.kt b/app/src/main/java/org/schabi/newpipe/ui/screens/PlaylistScreen.kt index 40ae069c2..ba0ccb461 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/screens/PlaylistScreen.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/screens/PlaylistScreen.kt @@ -4,7 +4,6 @@ import android.content.res.Configuration import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel @@ -12,7 +11,6 @@ import androidx.paging.PagingData import androidx.paging.compose.collectAsLazyPagingItems import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf -import org.schabi.newpipe.R import org.schabi.newpipe.extractor.stream.Description import org.schabi.newpipe.extractor.stream.StreamInfoItem import org.schabi.newpipe.extractor.stream.StreamType @@ -49,18 +47,10 @@ private fun PlaylistScreen( ) } - is Resource.Loading -> { - LoadingIndicator() - } + is Resource.Loading -> LoadingIndicator() - is Resource.Error -> { - // TODO use error panel instead - EmptyStateComposable( - EmptyStateSpec.NoVideos.copy( - descriptionText = { stringResource(R.string.error_unable_to_load_streams) }, - ) - ) - } + // TODO use error panel instead + is Resource.Error -> EmptyStateComposable(EmptyStateSpec.ErrorLoadingItems) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b9ed82b81..75dbf299b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -871,7 +871,7 @@ SoundCloud has discontinued the original Top 50 charts. The corresponding tab has been removed from your main page. Next NewPipeExtractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently. - Could not load streams + Could not load items Playlist uploader icon %d comment