Migrate playlist fragment to Jetpack Compose

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -767,7 +767,7 @@ private void handleIntent(final Intent intent) {
                         break;
                     case PLAYLIST:
                         NavigationHelper.openPlaylistFragment(getSupportFragmentManager(),
-                                serviceId, url, title);
+                                serviceId, url);
                         break;
                 }
             } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -279,7 +279,7 @@ public void held(final StreamInfoItem selectedItem) {
             try {
                 onItemSelected(selectedItem);
                 NavigationHelper.openPlaylistFragment(getFM(), selectedItem.getServiceId(),
-                        selectedItem.getUrl(), selectedItem.getName());
+                        selectedItem.getUrl());
             } catch (final Exception e) {
                 ErrorUtil.showUiErrorSnackbar(this, "Opening playlist fragment", e);
             }

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.kt

@@ -0,0 +1,31 @@
+package org.schabi.newpipe.fragments.list.playlist
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import androidx.fragment.compose.content
+import org.schabi.newpipe.ui.screens.PlaylistScreen
+import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.util.KEY_SERVICE_ID
+import org.schabi.newpipe.util.KEY_URL
+
+class PlaylistFragment : Fragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ) = content {
+        AppTheme {
+            PlaylistScreen()
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun getInstance(serviceId: Int, url: String?) = PlaylistFragment().apply {
+            arguments = bundleOf(KEY_SERVICE_ID to serviceId, KEY_URL to url)
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/ItemViewMode.java

@@ -5,7 +5,7 @@
  */
 public enum ItemViewMode {
     /**
-     * Default mode.
+     * View mode is automatically determined based on the device configuration.
      */
     AUTO,
     /**

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -15,7 +15,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -141,20 +140,14 @@ protected void initListeners() {
         itemListAdapter.setSelectedListener(new OnClickGesture<>() {
             @Override
             public void selected(final LocalItem selectedItem) {
-                final FragmentManager fragmentManager = getFM();
+                final var fragmentManager = getFM();
 
-                if (selectedItem instanceof PlaylistMetadataEntry) {
-                    final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
+                if (selectedItem instanceof PlaylistMetadataEntry entry) {
                     NavigationHelper.openLocalPlaylistFragment(fragmentManager, entry.getUid(),
                             entry.name);
-
-                } else if (selectedItem instanceof PlaylistRemoteEntity) {
-                    final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
-                    NavigationHelper.openPlaylistFragment(
-                            fragmentManager,
-                            entry.getServiceId(),
-                            entry.getUrl(),
-                            entry.getName());
+                } else if (selectedItem instanceof PlaylistRemoteEntity entry) {
+                    NavigationHelper.openPlaylistFragment(fragmentManager, entry.getServiceId(),
+                            entry.getUrl());
                 }
             }
 

app/src/main/java/org/schabi/newpipe/paging/PlaylistItemsSource.kt

@@ -0,0 +1,29 @@
+package org.schabi.newpipe.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.schabi.newpipe.extractor.NewPipe
+import org.schabi.newpipe.extractor.Page
+import org.schabi.newpipe.extractor.stream.StreamInfoItem
+import org.schabi.newpipe.ui.components.playlist.PlaylistInfo
+import org.schabi.newpipe.extractor.playlist.PlaylistInfo as ExtractorPlaylistInfo
+
+class PlaylistItemsSource(
+    private val playlistInfo: PlaylistInfo,
+) : PagingSource<Page, StreamInfoItem>() {
+    private val service = NewPipe.getService(playlistInfo.serviceId)
+
+    override suspend fun load(params: LoadParams<Page>): LoadResult<Page, StreamInfoItem> {
+        return params.key?.let {
+            withContext(Dispatchers.IO) {
+                val response = ExtractorPlaylistInfo
+                    .getMoreItems(service, playlistInfo.url, playlistInfo.nextPage)
+                LoadResult.Page(response.items, null, response.nextPage)
+            }
+        } ?: LoadResult.Page(playlistInfo.relatedItems, null, playlistInfo.nextPage)
+    }
+
+    override fun getRefreshKey(state: PagingState<Page, StreamInfoItem>) = null
+}

app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java

@@ -577,9 +577,8 @@ public int getTabIconRes(final Context context) {
         public Fragment getFragment(final Context context) {
             if (playlistType == LocalItemType.PLAYLIST_LOCAL_ITEM) {
                 return LocalPlaylistFragment.getInstance(playlistId, playlistName);
-
             } else { // playlistType == LocalItemType.PLAYLIST_REMOTE_ITEM
-                return PlaylistFragment.getInstance(playlistServiceId, playlistUrl, playlistName);
+                return PlaylistFragment.getInstance(playlistServiceId, playlistUrl);
             }
         }
 
@@ -606,12 +605,10 @@ protected void readDataFromJson(final JsonObject jsonObject) {
 
         @Override
         public boolean equals(final Object obj) {
-            if (!(obj instanceof PlaylistTab)) {
+            if (!(obj instanceof PlaylistTab other)) {
                 return false;
             }
 
-            final PlaylistTab other = (PlaylistTab) obj;
-
             return super.equals(obj)
                     && playlistServiceId == other.playlistServiceId // Remote
                     && playlistId == other.playlistId // Local

app/src/main/java/org/schabi/newpipe/ui/components/comment/Comment.kt

@@ -0,0 +1,211 @@
+package org.schabi.newpipe.ui.components.comment
+
+import android.content.res.Configuration
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentActivity
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.cachedIn
+import coil3.compose.AsyncImage
+import org.schabi.newpipe.R
+import org.schabi.newpipe.extractor.Page
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem
+import org.schabi.newpipe.extractor.stream.Description
+import org.schabi.newpipe.paging.CommentRepliesSource
+import org.schabi.newpipe.ui.components.common.DescriptionText
+import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.util.Localization
+import org.schabi.newpipe.util.NavigationHelper
+import org.schabi.newpipe.util.image.ImageStrategy
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun Comment(comment: CommentsInfoItem) {
+    val context = LocalContext.current
+    var isExpanded by rememberSaveable { mutableStateOf(false) }
+    var showReplies by rememberSaveable { mutableStateOf(false) }
+
+    Row(
+        modifier = Modifier
+            .animateContentSize()
+            .clickable { isExpanded = !isExpanded }
+            .padding(8.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        if (ImageStrategy.shouldLoadImages()) {
+            AsyncImage(
+                model = ImageStrategy.choosePreferredImage(comment.uploaderAvatars),
+                contentDescription = null,
+                placeholder = painterResource(R.drawable.placeholder_person),
+                error = painterResource(R.drawable.placeholder_person),
+                modifier = Modifier
+                    .size(42.dp)
+                    .clip(CircleShape)
+                    .clickable {
+                        NavigationHelper.openCommentAuthorIfPresent(
+                            context as FragmentActivity, comment
+                        )
+                    }
+            )
+        }
+
+        Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+            Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
+                if (comment.isPinned) {
+                    Image(
+                        painter = painterResource(R.drawable.ic_pin),
+                        contentDescription = stringResource(R.string.detail_pinned_comment_view_description)
+                    )
+                }
+
+                val nameAndDate = remember(comment) {
+                    val date = Localization.relativeTimeOrTextual(
+                        context, comment.uploadDate, comment.textualUploadDate
+                    )
+                    Localization.concatenateStrings(comment.uploaderName, date)
+                }
+                Text(text = nameAndDate, color = MaterialTheme.colorScheme.secondary)
+            }
+
+            DescriptionText(
+                description = comment.commentText,
+                // If the comment is expanded, we display all its content
+                // otherwise we only display the first two lines
+                maxLines = if (isExpanded) Int.MAX_VALUE else 2,
+                overflow = TextOverflow.Ellipsis,
+                style = MaterialTheme.typography.bodyMedium,
+            )
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Image(
+                        painter = painterResource(R.drawable.ic_thumb_up),
+                        contentDescription = stringResource(R.string.detail_likes_img_view_description)
+                    )
+                    Text(text = Localization.likeCount(context, comment.likeCount))
+
+                    if (comment.isHeartedByUploader) {
+                        Image(
+                            painter = painterResource(R.drawable.ic_heart),
+                            contentDescription = stringResource(R.string.detail_heart_img_view_description)
+                        )
+                    }
+                }
+
+                if (comment.replies != null) {
+                    TextButton(onClick = { showReplies = true }) {
+                        val text = pluralStringResource(
+                            R.plurals.replies, comment.replyCount, comment.replyCount.toString()
+                        )
+                        Text(text = text)
+                    }
+                }
+            }
+        }
+    }
+
+    if (showReplies) {
+        ModalBottomSheet(onDismissRequest = { showReplies = false }) {
+            val coroutineScope = rememberCoroutineScope()
+            val flow = remember {
+                Pager(PagingConfig(pageSize = 20, enablePlaceholders = false)) {
+                    CommentRepliesSource(comment)
+                }.flow
+                    .cachedIn(coroutineScope)
+            }
+
+            CommentSection(parentComment = comment, commentsFlow = flow)
+        }
+    }
+}
+
+fun CommentsInfoItem(
+    serviceId: Int = 1,
+    url: String = "",
+    name: String = "",
+    commentText: Description,
+    uploaderName: String,
+    textualUploadDate: String = "5 months ago",
+    likeCount: Int = 0,
+    isHeartedByUploader: Boolean = false,
+    isPinned: Boolean = false,
+    replies: Page? = null,
+    replyCount: Int = 0,
+) = CommentsInfoItem(serviceId, url, name).apply {
+    this.commentText = commentText
+    this.uploaderName = uploaderName
+    this.textualUploadDate = textualUploadDate
+    this.likeCount = likeCount
+    this.isHeartedByUploader = isHeartedByUploader
+    this.isPinned = isPinned
+    this.replies = replies
+    this.replyCount = replyCount
+}
+
+private class DescriptionPreviewProvider : PreviewParameterProvider<Description> {
+    override val values = sequenceOf(
+        Description("Hello world!<br><br>This line should be hidden by default.", Description.HTML),
+        Description("Hello world!\n\nThis line should be hidden by default.", Description.PLAIN_TEXT),
+    )
+}
+
+@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun CommentPreview(
+    @PreviewParameter(DescriptionPreviewProvider::class) description: Description
+) {
+    val comment = CommentsInfoItem(
+        commentText = description,
+        uploaderName = "Test",
+        likeCount = 100,
+        isPinned = true,
+        isHeartedByUploader = true,
+        replies = Page(""),
+        replyCount = 10
+    )
+
+    AppTheme {
+        Surface(color = MaterialTheme.colorScheme.background) {
+            Comment(comment)
+        }
+    }
+}