Skip to content

Commit 8f4cd03

Browse files
StypoxStypox
committed
Remove mini variant and move upload date to top in comments
1 parent 6762993 commit 8f4cd03

7 files changed

Lines changed: 30 additions & 179 deletions

File tree

‎app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
1414
import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
1515
import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
16-
import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
17-
import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
16+
import org.schabi.newpipe.info_list.holder.CommentInfoItemHolder;
1817
import org.schabi.newpipe.info_list.holder.InfoItemHolder;
1918
import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
2019
import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
@@ -87,8 +86,7 @@ private InfoItemHolder holderFromInfoType(@NonNull final ViewGroup parent,
8786
return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent)
8887
: new PlaylistInfoItemHolder(this, parent);
8988
case COMMENT:
90-
return useMiniVariant ? new CommentsMiniInfoItemHolder(this, parent)
91-
: new CommentsInfoItemHolder(this, parent);
89+
return new CommentInfoItemHolder(this, parent);
9290
default:
9391
throw new RuntimeException("InfoType not expected = " + infoType.name());
9492
}

‎app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
2222
import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
2323
import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
24-
import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
25-
import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
24+
import org.schabi.newpipe.info_list.holder.CommentInfoItemHolder;
2625
import org.schabi.newpipe.info_list.holder.InfoItemHolder;
2726
import org.schabi.newpipe.info_list.holder.PlaylistCardInfoItemHolder;
2827
import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
@@ -79,8 +78,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
7978
private static final int PLAYLIST_HOLDER_TYPE = 0x301;
8079
private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
8180
private static final int CARD_PLAYLIST_HOLDER_TYPE = 0x303;
82-
private static final int MINI_COMMENT_HOLDER_TYPE = 0x400;
83-
private static final int COMMENT_HOLDER_TYPE = 0x401;
81+
private static final int COMMENT_HOLDER_TYPE = 0x400;
8482

8583
private final LayoutInflater layoutInflater;
8684
private final InfoItemBuilder infoItemBuilder;
@@ -271,7 +269,7 @@ public int getItemViewType(int position) {
271269
return PLAYLIST_HOLDER_TYPE;
272270
}
273271
case COMMENT:
274-
return useMiniVariant ? MINI_COMMENT_HOLDER_TYPE : COMMENT_HOLDER_TYPE;
272+
return COMMENT_HOLDER_TYPE;
275273
default:
276274
return -1;
277275
}
@@ -320,10 +318,8 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup paren
320318
return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
321319
case CARD_PLAYLIST_HOLDER_TYPE:
322320
return new PlaylistCardInfoItemHolder(infoItemBuilder, parent);
323-
case MINI_COMMENT_HOLDER_TYPE:
324-
return new CommentsMiniInfoItemHolder(infoItemBuilder, parent);
325321
case COMMENT_HOLDER_TYPE:
326-
return new CommentsInfoItemHolder(infoItemBuilder, parent);
322+
return new CommentInfoItemHolder(infoItemBuilder, parent);
327323
default:
328324
return new FallbackViewHolder(new View(parent.getContext()));
329325
}

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java renamed to app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
import io.reactivex.rxjava3.disposables.CompositeDisposable;
4343

44-
public class CommentsMiniInfoItemHolder extends InfoItemHolder {
45-
private static final String TAG = "CommentsMiniIIHolder";
44+
public class CommentInfoItemHolder extends InfoItemHolder {
45+
private static final String TAG = "CommentIIHolder";
4646
private static final String ELLIPSIS = "…";
4747

4848
private static final int COMMENT_DEFAULT_LINES = 2;
@@ -58,22 +58,26 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
5858
private final ImageView itemThumbnailView;
5959
private final TextView itemContentView;
6060
private final TextView itemLikesCountView;
61-
private final TextView itemPublishedTime;
61+
private final TextView itemTitleView;
62+
private final ImageView itemHeartView;
63+
private final ImageView itemPinnedView;
6264

6365
private final CompositeDisposable disposables = new CompositeDisposable();
6466
@Nullable private Description commentText;
6567
@Nullable private StreamingService streamService;
6668
@Nullable private String streamUrl;
6769

68-
CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder, final int layoutId,
69-
final ViewGroup parent) {
70-
super(infoItemBuilder, layoutId, parent);
70+
public CommentInfoItemHolder(final InfoItemBuilder infoItemBuilder,
71+
final ViewGroup parent) {
72+
super(infoItemBuilder, R.layout.list_comment_item, parent);
7173

7274
itemRoot = itemView.findViewById(R.id.itemRoot);
7375
itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
74-
itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
75-
itemPublishedTime = itemView.findViewById(R.id.itemPublishedTime);
7676
itemContentView = itemView.findViewById(R.id.itemCommentContentView);
77+
itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
78+
itemTitleView = itemView.findViewById(R.id.itemTitleView);
79+
itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
80+
itemPinnedView = itemView.findViewById(R.id.detail_pinned_view);
7781

7882
commentHorizontalPadding = (int) infoItemBuilder.getContext()
7983
.getResources().getDimension(R.dimen.comments_horizontal_padding);
@@ -85,11 +89,6 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
8589
ellipsisWidthPx = paintAtContentSize.measureText(ELLIPSIS);
8690
}
8791

88-
public CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder,
89-
final ViewGroup parent) {
90-
this(infoItemBuilder, R.layout.list_comments_mini_item, parent);
91-
}
92-
9392
@Override
9493
public void updateFromItem(final InfoItem infoItem,
9594
final HistoryRecordManager historyRecordManager) {
@@ -108,9 +107,18 @@ public void updateFromItem(final InfoItem infoItem,
108107
itemRoot.setPadding(commentHorizontalPadding, commentVerticalPadding,
109108
commentHorizontalPadding, commentVerticalPadding);
110109
}
110+
itemThumbnailView.setOnClickListener(view -> openCommentAuthor(item));
111111

112+
final String uploadDate;
113+
if (item.getUploadDate() != null) {
114+
uploadDate = Localization.relativeTime(item.getUploadDate().offsetDateTime());
115+
} else {
116+
uploadDate = item.getTextualUploadDate();
117+
}
118+
itemTitleView.setText(Localization.concatenateStrings(item.getUploaderName(), uploadDate));
112119

113-
itemThumbnailView.setOnClickListener(view -> openCommentAuthor(item));
120+
itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
121+
itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
114122

115123
try {
116124
streamService = NewPipe.getService(item.getServiceId());
@@ -136,12 +144,6 @@ public void updateFromItem(final InfoItem infoItem,
136144
itemLikesCountView.setText("-");
137145
}
138146

139-
if (item.getUploadDate() != null) {
140-
itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate()
141-
.offsetDateTime()));
142-
} else {
143-
itemPublishedTime.setText(item.getTextualUploadDate());
144-
}
145147

146148
itemView.setOnClickListener(view -> {
147149
toggleEllipsize();
@@ -150,7 +152,6 @@ public void updateFromItem(final InfoItem infoItem,
150152
}
151153
});
152154

153-
154155
itemView.setOnLongClickListener(view -> {
155156
if (DeviceUtils.isTv(itemBuilder.getContext())) {
156157
openCommentAuthor(item);

‎app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎app/src/main/res/layout/fragment_comments.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"
1111
android:scrollbars="vertical"
12-
tools:listitem="@layout/list_comments_item" />
12+
tools:listitem="@layout/list_comment_item" />
1313

1414
<ProgressBar
1515
android:id="@+id/loading_progress_bar"

app/src/main/res/layout/list_comments_item.xml renamed to app/src/main/res/layout/list_comment_item.xml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
android:lines="1"
4848
android:textAppearance="?android:attr/textAppearanceSmall"
4949
android:textSize="@dimen/comment_item_title_text_size"
50-
tools:text="Author Name, Lorem ipsum" />
50+
tools:text="Author Name, Lorem ipsum · 5 months ago" />
5151

5252
<org.schabi.newpipe.views.NewPipeTextView
5353
android:id="@+id/itemCommentContentView"
@@ -96,16 +96,4 @@
9696
android:visibility="gone"
9797
tools:visibility="visible" />
9898

99-
<org.schabi.newpipe.views.NewPipeTextView
100-
android:id="@+id/itemPublishedTime"
101-
android:layout_width="wrap_content"
102-
android:layout_height="wrap_content"
103-
android:layout_below="@id/itemCommentContentView"
104-
android:layout_marginLeft="12dp"
105-
android:layout_toRightOf="@id/detail_heart_image_view"
106-
android:lines="1"
107-
android:textAppearance="?android:attr/textAppearanceSmall"
108-
android:textSize="@dimen/video_item_search_upload_date_text_size"
109-
tools:text="1 year ago" />
110-
11199
</RelativeLayout>

‎app/src/main/res/layout/list_comments_mini_item.xml‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)