Show comment replies

app/build.gradle

@@ -187,7 +187,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:6a858368c86bc9a55abee586eb6c733e86c26b97'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:eb07d70a2ce03bee3cc74fc33b2e4173e1c21436'
     implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -52,6 +52,7 @@
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
 
 import com.google.android.exoplayer2.PlaybackException;
@@ -82,7 +83,7 @@
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.EmptyFragment;
-import org.schabi.newpipe.fragments.list.comments.CommentsFragment;
+import org.schabi.newpipe.fragments.list.comments.CommentsFragmentContainer;
 import org.schabi.newpipe.fragments.list.videos.RelatedItemsFragment;
 import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
@@ -162,8 +163,12 @@ public final class VideoDetailFragment
     private boolean showRelatedItems;
     private boolean showDescription;
     private String selectedTabTag;
-    @AttrRes @NonNull final List<Integer> tabIcons = new ArrayList<>();
-    @StringRes @NonNull final List<Integer> tabContentDescriptions = new ArrayList<>();
+    @AttrRes
+    @NonNull
+    final List<Integer> tabIcons = new ArrayList<>();
+    @StringRes
+    @NonNull
+    final List<Integer> tabContentDescriptions = new ArrayList<>();
     private boolean tabSettingsChanged = false;
     private int lastAppBarVerticalOffset = Integer.MAX_VALUE; // prevents useless updates
 
@@ -717,8 +722,8 @@ private View.OnTouchListener getOnControlsTouchListener() {
             if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
                 animate(binding.touchAppendDetail, true, 250, AnimationType.ALPHA,
                         0, () ->
-                        animate(binding.touchAppendDetail, false, 1500,
-                                AnimationType.ALPHA, 1000));
+                                animate(binding.touchAppendDetail, false, 1500,
+                                        AnimationType.ALPHA, 1000));
             }
             return false;
         };
@@ -768,6 +773,10 @@ public boolean onBackPressed() {
             Log.d(TAG, "onBackPressed() called");
         }
 
+        if (callCommentFragmentOnBack()) {
+            return true;
+        }
+
         // If we are in fullscreen mode just exit from it via first back press
         if (isFullscreen()) {
             if (!DeviceUtils.isTablet(activity)) {
@@ -800,6 +809,18 @@ public boolean onBackPressed() {
         return true;
     }
 
+    private boolean callCommentFragmentOnBack() {
+        final String currentPage = pageAdapter.getItemTitle(binding.viewPager.getCurrentItem());
+        if (COMMENTS_TAB_TAG.equals(currentPage)) {
+            final Fragment fragment = getFM()
+                    .findFragmentById(R.id.fragment_container_view);
+            if (fragment instanceof BackPressable) {
+                return ((BackPressable) fragment).onBackPressed();
+            }
+        }
+        return false;
+    }
+
     private void setupFromHistoryItem(final StackItem item) {
         setAutoPlay(false);
         hideMainPlayerOnLoadingNewStream();
@@ -960,7 +981,7 @@ private void initTabs() {
 
         if (shouldShowComments()) {
             pageAdapter.addFragment(
-                    CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
+                    CommentsFragmentContainer.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
             tabIcons.add(R.drawable.ic_comment);
             tabContentDescriptions.add(R.string.comments_tab_description);
         }

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

@@ -246,6 +246,12 @@ protected void onItemSelected(final InfoItem selectedItem) {
         }
     }
 
+    protected void onItemCallback(final InfoItem selectedItem) throws Exception {
+        if (DEBUG) {
+            Log.d(TAG, "onItemCallback() called with: selectedItem = [" + selectedItem + "]");
+        }
+    }
+
     @Override
     protected void initListeners() {
         super.initListeners();
@@ -283,6 +289,14 @@ public void held(final StreamInfoItem selectedItem) {
 
         infoListAdapter.setOnCommentsSelectedListener(this::onItemSelected);
 
+        infoListAdapter.setOnCommentsReplyListener(selectedItem -> {
+            try {
+                onItemCallback(selectedItem);
+            } catch (final Exception e) {
+                ErrorUtil.showUiErrorSnackbar(this, "Opening comment reply fragment", e);
+            }
+        });
+
         // Ensure that there is always a scroll listener (e.g. when rotating the device)
         useNormalItemListScrollListener();
     }

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentReplyFragment.java

@@ -0,0 +1,101 @@
+package org.schabi.newpipe.fragments.list.comments;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.BaseFragment;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.Page;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.fragments.BackPressable;
+import org.schabi.newpipe.util.Constants;
+
+import java.io.IOException;
+
+import icepick.State;
+
+public class CommentReplyFragment extends BaseFragment implements BackPressable {
+
+    @State
+    protected int serviceId = Constants.NO_SERVICE_ID;
+    @State
+    protected String name;
+    @State
+    protected String url;
+    @State
+    protected CommentsInfoItem comment;
+    @State
+    protected Page replies;
+
+    public static CommentReplyFragment getInstance(
+            final int serviceId, final String url,
+            final String name,
+            final CommentsInfoItem comment,
+            final Page replies
+    ) throws IOException, ClassNotFoundException {
+        final CommentReplyFragment instance = new CommentReplyFragment();
+        instance.setInitialData(serviceId, url, name, comment, replies);
+        return instance;
+    }
+
+    public static CommentsFragmentContainer newInstance(final int serviceId, final String url,
+                                                        final String name) {
+        final CommentsFragmentContainer fragment = new CommentsFragmentContainer();
+        fragment.serviceId = serviceId;
+        fragment.url = url;
+        fragment.name = name;
+        return new CommentsFragmentContainer();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.fragment_comments_reply, container,
+                false);
+        final ImageButton backButton = view.findViewById(R.id.backButton);
+        backButton.setOnClickListener(v -> closeSelf());
+        final CommentsFragment commentsFragment = CommentsFragment.getInstance(
+                serviceId, url, name, comment
+        );
+        final CommentsFragment commentsReplyFragment = CommentsFragment.getInstance(
+                serviceId, url, name, replies
+        );
+        getChildFragmentManager().beginTransaction()
+                .add(R.id.commentFragment, commentsFragment).commit();
+        getChildFragmentManager().beginTransaction()
+                .add(R.id.commentReplyFragment, commentsReplyFragment).commit();
+        return view;
+    }
+
+    protected void setInitialData(final int sid, final String u, final String title,
+                                  final CommentsInfoItem preComment,
+                                  final Page repliesPage
+    ) throws IOException, ClassNotFoundException {
+        this.serviceId = sid;
+        this.url = u;
+        this.name = !TextUtils.isEmpty(title) ? title : "";
+        // clone comment object to avoid replies actually set null
+        this.comment = CommentUtils.clone(preComment);
+        comment.setReplies(null);
+        this.replies = repliesPage;
+    }
+
+    @Override
+    public boolean onBackPressed() {
+        closeSelf();
+        return true;
+    }
+
+    private void closeSelf() {
+        getFM().beginTransaction().remove(this).commit();
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentUtils.java

@@ -0,0 +1,24 @@
+package org.schabi.newpipe.fragments.list.comments;
+
+import org.schabi.newpipe.extractor.comments.CommentsInfo;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.util.SerializedUtils;
+
+import java.io.IOException;
+
+final class CommentUtils {
+    private CommentUtils() {
+    }
+
+    public static CommentsInfo clone(
+            final CommentsInfo item
+    ) throws IOException, SecurityException, NullPointerException, ClassNotFoundException {
+        return SerializedUtils.clone(item, CommentsInfo.class);
+    }
+
+    public static CommentsInfoItem clone(
+            final CommentsInfoItem item
+    ) throws IOException, SecurityException, NullPointerException, ClassNotFoundException {
+        return SerializedUtils.clone(item, CommentsInfoItem.class);
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java

@@ -13,32 +13,68 @@
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.comments.CommentsInfo;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 
+import java.util.List;
+
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 public class CommentsFragment extends BaseListInfoFragment<CommentsInfoItem, CommentsInfo> {
     private final CompositeDisposable disposables = new CompositeDisposable();
 
+    private Page replies;
+    private CommentsInfoItem preComment;
+
     private TextView emptyStateDesc;
 
     public static CommentsFragment getInstance(final int serviceId, final String url,
                                                final String name) {
         final CommentsFragment instance = new CommentsFragment();
-        instance.setInitialData(serviceId, url, name);
+        instance.setInitialData(serviceId, url, name, null, null);
+        return instance;
+    }
+
+    public static CommentsFragment getInstance(final int serviceId, final String url,
+                                               final String name,
+                                               final CommentsInfoItem preComment) {
+        final CommentsFragment instance = new CommentsFragment();
+        instance.setInitialData(serviceId, url, name, null, preComment);
         return instance;
     }
 
+    public static CommentsFragment getInstance(final int serviceId, final String url,
+                                               final String name,
+                                               final Page replyPage) {
+        final CommentsFragment instance = new CommentsFragment();
+        instance.setInitialData(serviceId, url, name, replyPage, null);
+        return instance;
+    }
+
+    @Override
+    protected void onItemCallback(final InfoItem selectedItem) throws Exception {
+        super.onItemCallback(selectedItem);
+        CommentsFragmentContainer.setFragment(getFM(), (CommentsInfoItem) selectedItem);
+    }
+
     public CommentsFragment() {
         super(UserAction.REQUESTED_COMMENTS);
     }
 
+    protected void setInitialData(final int sid, final String u, final String title,
+                                  final Page repliesPage, final CommentsInfoItem comment) {
+        this.replies = repliesPage;
+        this.preComment = comment;
+        super.setInitialData(sid, u, title);
+    }
+
     @Override
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
@@ -74,7 +110,25 @@ protected Single<ListExtractor.InfoItemsPage<CommentsInfoItem>> loadMoreItemsLog
 
     @Override
     protected Single<CommentsInfo> loadResult(final boolean forceLoad) {
-        return ExtractorHelper.getCommentsInfo(serviceId, url, forceLoad);
+        if (replies == null) {
+            if (preComment == null) {
+                return ExtractorHelper.getCommentsInfo(serviceId, url, forceLoad);
+            } else {
+                return Single.fromCallable(() -> {
+                    // get a info template
+                    var info = ExtractorHelper.getCommentsInfo(
+                            serviceId, url, forceLoad).blockingGet();
+                    // clone comment object to avoid relatedItems and nextPage actually set null
+                    info = CommentUtils.clone(info);
+                    // push preComment
+                    info.setRelatedItems(List.of(preComment));
+                    info.setNextPage(null);
+                    return info;
+                });
+            }
+        } else {
+            return ExtractorHelper.getCommentsReplyInfo(serviceId, url, forceLoad, replies);
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -99,11 +153,13 @@ public void handleResult(@NonNull final CommentsInfo result) {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void setTitle(final String title) { }
+    public void setTitle(final String title) {
+    }
 
     @Override
     public void onCreateOptionsMenu(@NonNull final Menu menu,
-                                    @NonNull final MenuInflater inflater) { }
+                                    @NonNull final MenuInflater inflater) {
+    }
 
     @Override
     protected boolean isGridLayout() {