-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10018 from Stypox/comment-replies
Add support for comment replies
- Loading branch information
Showing
24 changed files
with
717 additions
and
335 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
168 changes: 168 additions & 0 deletions
168
app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentRepliesFragment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| package org.schabi.newpipe.fragments.list.comments; | ||
|
|
||
| import static org.schabi.newpipe.util.ServiceHelper.getServiceById; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.view.ViewGroup; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
| import androidx.annotation.Nullable; | ||
| import androidx.constraintlayout.widget.ConstraintLayout; | ||
| import androidx.core.text.HtmlCompat; | ||
|
|
||
| import org.schabi.newpipe.R; | ||
| import org.schabi.newpipe.databinding.CommentRepliesHeaderBinding; | ||
| import org.schabi.newpipe.error.UserAction; | ||
| import org.schabi.newpipe.extractor.ListExtractor; | ||
| import org.schabi.newpipe.extractor.comments.CommentsInfoItem; | ||
| import org.schabi.newpipe.fragments.list.BaseListInfoFragment; | ||
| import org.schabi.newpipe.info_list.ItemViewMode; | ||
| import org.schabi.newpipe.util.DeviceUtils; | ||
| import org.schabi.newpipe.util.ExtractorHelper; | ||
| import org.schabi.newpipe.util.Localization; | ||
| import org.schabi.newpipe.util.NavigationHelper; | ||
| import org.schabi.newpipe.util.image.ImageStrategy; | ||
| import org.schabi.newpipe.util.image.PicassoHelper; | ||
| import org.schabi.newpipe.util.text.TextLinkifier; | ||
|
|
||
| import java.util.Queue; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import io.reactivex.rxjava3.core.Single; | ||
| import io.reactivex.rxjava3.disposables.CompositeDisposable; | ||
|
|
||
| public final class CommentRepliesFragment | ||
| extends BaseListInfoFragment<CommentsInfoItem, CommentRepliesInfo> { | ||
|
|
||
| public static final String TAG = CommentRepliesFragment.class.getSimpleName(); | ||
|
|
||
| private CommentsInfoItem commentsInfoItem; // the comment to show replies of | ||
| private final CompositeDisposable disposables = new CompositeDisposable(); | ||
|
|
||
|
|
||
| /*////////////////////////////////////////////////////////////////////////// | ||
| // Constructors and lifecycle | ||
| //////////////////////////////////////////////////////////////////////////*/ | ||
|
|
||
| // only called by the Android framework, after which readFrom is called and restores all data | ||
| public CommentRepliesFragment() { | ||
| super(UserAction.REQUESTED_COMMENT_REPLIES); | ||
| } | ||
|
|
||
| public CommentRepliesFragment(@NonNull final CommentsInfoItem commentsInfoItem) { | ||
| this(); | ||
| this.commentsInfoItem = commentsInfoItem; | ||
| // setting "" as title since the title will be properly set right after | ||
| setInitialData(commentsInfoItem.getServiceId(), commentsInfoItem.getUrl(), ""); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public View onCreateView(@NonNull final LayoutInflater inflater, | ||
| @Nullable final ViewGroup container, | ||
| @Nullable final Bundle savedInstanceState) { | ||
| return inflater.inflate(R.layout.fragment_comments, container, false); | ||
| } | ||
|
|
||
| @Override | ||
| public void onDestroyView() { | ||
| disposables.clear(); | ||
| super.onDestroyView(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Supplier<View> getListHeaderSupplier() { | ||
| return () -> { | ||
| final CommentRepliesHeaderBinding binding = CommentRepliesHeaderBinding | ||
| .inflate(activity.getLayoutInflater(), itemsList, false); | ||
| final CommentsInfoItem item = commentsInfoItem; | ||
|
|
||
| // load the author avatar | ||
| PicassoHelper.loadAvatar(item.getUploaderAvatars()).into(binding.authorAvatar); | ||
| binding.authorAvatar.setVisibility(ImageStrategy.shouldLoadImages() | ||
| ? View.VISIBLE : View.GONE); | ||
|
|
||
| // setup author name and comment date | ||
| binding.authorName.setText(item.getUploaderName()); | ||
| binding.uploadDate.setText(Localization.relativeTimeOrTextual( | ||
| getContext(), item.getUploadDate(), item.getTextualUploadDate())); | ||
| binding.authorTouchArea.setOnClickListener( | ||
| v -> NavigationHelper.openCommentAuthorIfPresent(requireActivity(), item)); | ||
|
|
||
| // setup like count, hearted and pinned | ||
| binding.thumbsUpCount.setText( | ||
| Localization.likeCount(requireContext(), item.getLikeCount())); | ||
| // for heartImage goneMarginEnd was used, but there is no way to tell ConstraintLayout | ||
| // not to use a different margin only when both the next two views are gone | ||
| ((ConstraintLayout.LayoutParams) binding.thumbsUpCount.getLayoutParams()) | ||
| .setMarginEnd(DeviceUtils.dpToPx( | ||
| (item.isHeartedByUploader() || item.isPinned() ? 8 : 16), | ||
| requireContext())); | ||
| binding.heartImage.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE); | ||
| binding.pinnedImage.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE); | ||
|
|
||
| // setup comment content | ||
| TextLinkifier.fromDescription(binding.commentContent, item.getCommentText(), | ||
| HtmlCompat.FROM_HTML_MODE_LEGACY, getServiceById(item.getServiceId()), | ||
| item.getUrl(), disposables, null); | ||
|
|
||
| return binding.getRoot(); | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| /*////////////////////////////////////////////////////////////////////////// | ||
| // State saving | ||
| //////////////////////////////////////////////////////////////////////////*/ | ||
|
|
||
| @Override | ||
| public void writeTo(final Queue<Object> objectsToSave) { | ||
| super.writeTo(objectsToSave); | ||
| objectsToSave.add(commentsInfoItem); | ||
| } | ||
|
|
||
| @Override | ||
| public void readFrom(@NonNull final Queue<Object> savedObjects) throws Exception { | ||
| super.readFrom(savedObjects); | ||
| commentsInfoItem = (CommentsInfoItem) savedObjects.poll(); | ||
| } | ||
|
|
||
|
|
||
| /*////////////////////////////////////////////////////////////////////////// | ||
| // Data loading | ||
| //////////////////////////////////////////////////////////////////////////*/ | ||
|
|
||
| @Override | ||
| protected Single<CommentRepliesInfo> loadResult(final boolean forceLoad) { | ||
| return Single.fromCallable(() -> new CommentRepliesInfo(commentsInfoItem, | ||
| // the reply count string will be shown as the activity title | ||
| Localization.replyCount(requireContext(), commentsInfoItem.getReplyCount()))); | ||
| } | ||
|
|
||
| @Override | ||
| protected Single<ListExtractor.InfoItemsPage<CommentsInfoItem>> loadMoreItemsLogic() { | ||
| // commentsInfoItem.getUrl() should contain the url of the original | ||
| // ListInfo<CommentsInfoItem>, which should be the stream url | ||
| return ExtractorHelper.getMoreCommentItems( | ||
| serviceId, commentsInfoItem.getUrl(), currentNextPage); | ||
| } | ||
|
|
||
|
|
||
| /*////////////////////////////////////////////////////////////////////////// | ||
| // Utils | ||
| //////////////////////////////////////////////////////////////////////////*/ | ||
|
|
||
| @Override | ||
| protected ItemViewMode getItemViewMode() { | ||
| return ItemViewMode.LIST; | ||
| } | ||
|
|
||
| /** | ||
| * @return the comment to which the replies are shown | ||
| */ | ||
| public CommentsInfoItem getCommentsInfoItem() { | ||
| return commentsInfoItem; | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentRepliesInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.schabi.newpipe.fragments.list.comments; | ||
|
|
||
| import org.schabi.newpipe.extractor.ListInfo; | ||
| import org.schabi.newpipe.extractor.comments.CommentsInfoItem; | ||
| import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| public final class CommentRepliesInfo extends ListInfo<CommentsInfoItem> { | ||
| /** | ||
| * This class is used to wrap the comment replies page into a ListInfo object. | ||
| * | ||
| * @param comment the comment from which to get replies | ||
| * @param name will be shown as the fragment title | ||
| */ | ||
| public CommentRepliesInfo(final CommentsInfoItem comment, final String name) { | ||
| super(comment.getServiceId(), | ||
| new ListLinkHandler("", "", "", Collections.emptyList(), null), name); | ||
| setNextPage(comment.getReplies()); | ||
| setRelatedItems(Collections.emptyList()); // since it must be non-null | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.