Skip to content

Commit ad68f78

Browse files
StypoxStypox
committed
Extract some utility methods from CommentInfoItemHolder
1 parent 4b6392d commit ad68f78

5 files changed

Lines changed: 80 additions & 81 deletions

File tree

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

Lines changed: 16 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.schabi.newpipe.info_list.holder;
22

33
import static android.text.TextUtils.isEmpty;
4+
import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
45

56
import android.graphics.Paint;
67
import android.text.Layout;
78
import android.text.method.LinkMovementMethod;
89
import android.text.style.URLSpan;
9-
import android.util.Log;
1010
import android.view.View;
1111
import android.view.ViewGroup;
1212
import android.widget.Button;
@@ -15,21 +15,15 @@
1515
import android.widget.TextView;
1616

1717
import androidx.annotation.Nullable;
18-
import androidx.appcompat.app.AppCompatActivity;
1918
import androidx.core.text.HtmlCompat;
19+
import androidx.fragment.app.FragmentActivity;
2020

21-
import org.schabi.newpipe.MainActivity;
2221
import org.schabi.newpipe.R;
23-
import org.schabi.newpipe.error.ErrorUtil;
2422
import org.schabi.newpipe.extractor.InfoItem;
25-
import org.schabi.newpipe.extractor.NewPipe;
26-
import org.schabi.newpipe.extractor.ServiceList;
2723
import org.schabi.newpipe.extractor.StreamingService;
2824
import org.schabi.newpipe.extractor.comments.CommentsInfo;
2925
import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
30-
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
3126
import org.schabi.newpipe.extractor.stream.Description;
32-
import org.schabi.newpipe.fragments.list.comments.CommentRepliesFragment;
3327
import org.schabi.newpipe.info_list.InfoItemBuilder;
3428
import org.schabi.newpipe.local.history.HistoryRecordManager;
3529
import org.schabi.newpipe.util.DeviceUtils;
@@ -46,7 +40,6 @@
4640
import io.reactivex.rxjava3.disposables.CompositeDisposable;
4741

4842
public class CommentInfoItemHolder extends InfoItemHolder {
49-
private static final String TAG = "CommentIIHolder";
5043
private static final String ELLIPSIS = "…";
5144

5245
private static final int COMMENT_DEFAULT_LINES = 2;
@@ -125,30 +118,19 @@ public void updateFromItem(final InfoItem infoItem,
125118

126119
// setup the top row, with pinned icon, author name and comment date
127120
itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
128-
129-
final String uploadDate;
130-
if (item.getUploadDate() != null) {
131-
uploadDate = Localization.relativeTime(item.getUploadDate().offsetDateTime());
132-
} else {
133-
uploadDate = item.getTextualUploadDate();
134-
}
135-
itemTitleView.setText(Localization.concatenateStrings(item.getUploaderName(), uploadDate));
121+
itemTitleView.setText(Localization.concatenateStrings(item.getUploaderName(),
122+
Localization.relativeTimeOrTextual(item.getUploadDate(),
123+
item.getTextualUploadDate(), itemBuilder.getContext())));
136124

137125

138126
// setup bottom row, with likes, heart and replies button
139-
if (item.getLikeCount() >= 0) {
140-
itemLikesCountView.setText(
141-
Localization.shortCount(
142-
itemBuilder.getContext(),
143-
item.getLikeCount()));
144-
} else {
145-
itemLikesCountView.setText("-");
146-
}
127+
itemLikesCountView.setText(
128+
Localization.likeCount(itemBuilder.getContext(), item.getLikeCount()));
147129

148130
itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
149131

150132
final boolean hasReplies = item.getReplies() != null;
151-
repliesButton.setOnClickListener(hasReplies ? v -> openRepliesFragment(item) : null);
133+
repliesButton.setOnClickListener(hasReplies ? v -> openCommentReplies(item) : null);
152134
repliesButton.setVisibility(hasReplies ? View.VISIBLE : View.GONE);
153135
repliesButton.setText(hasReplies
154136
? Localization.replyCount(itemBuilder.getContext(), item.getReplyCount()) : "");
@@ -157,14 +139,7 @@ public void updateFromItem(final InfoItem infoItem,
157139

158140

159141
// setup comment content and click listeners to expand/ellipsize it
160-
try {
161-
streamService = NewPipe.getService(item.getServiceId());
162-
} catch (final ExtractionException e) {
163-
// should never happen
164-
ErrorUtil.showUiErrorSnackbar(itemBuilder.getContext(), "Getting StreamingService", e);
165-
Log.w(TAG, "Cannot obtain service from comment service id, defaulting to YouTube", e);
166-
streamService = ServiceList.YouTube;
167-
}
142+
streamService = getServiceById(item.getServiceId());
168143
streamUrl = item.getUrl();
169144
commentText = item.getCommentText();
170145
ellipsize();
@@ -193,19 +168,13 @@ public void updateFromItem(final InfoItem infoItem,
193168
}
194169

195170
private void openCommentAuthor(final CommentsInfoItem item) {
196-
if (isEmpty(item.getUploaderUrl())) {
197-
return;
198-
}
199-
final AppCompatActivity activity = (AppCompatActivity) itemBuilder.getContext();
200-
try {
201-
NavigationHelper.openChannelFragment(
202-
activity.getSupportFragmentManager(),
203-
item.getServiceId(),
204-
item.getUploaderUrl(),
205-
item.getUploaderName());
206-
} catch (final Exception e) {
207-
ErrorUtil.showUiErrorSnackbar(activity, "Opening channel fragment", e);
208-
}
171+
NavigationHelper.openCommentAuthorIfPresent((FragmentActivity) itemBuilder.getContext(),
172+
item);
173+
}
174+
175+
private void openCommentReplies(final CommentsInfoItem item) {
176+
NavigationHelper.openCommentRepliesFragment((FragmentActivity) itemBuilder.getContext(),
177+
(CommentsInfo) itemBuilder.getSourceListInfo(), item);
209178
}
210179

211180
private void allowLinkFocus() {
@@ -305,17 +274,4 @@ private void linkifyCommentContentView(@Nullable final Consumer<TextView> onComp
305274
onCompletion);
306275
}
307276
}
308-
309-
private void openRepliesFragment(final CommentsInfoItem commentsInfoItem) {
310-
((MainActivity) itemBuilder.getContext())
311-
.getSupportFragmentManager()
312-
.beginTransaction()
313-
.setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out,
314-
R.animator.custom_fade_in, R.animator.custom_fade_out)
315-
.replace(R.id.fragment_holder,
316-
new CommentRepliesFragment((CommentsInfo) itemBuilder.getSourceListInfo(),
317-
commentsInfoItem))
318-
.addToBackStack(null)
319-
.commit();
320-
}
321277
}

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

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
import org.schabi.newpipe.local.history.HistoryRecordManager;
1313
import org.schabi.newpipe.util.Localization;
1414

15-
import androidx.preference.PreferenceManager;
16-
17-
import static org.schabi.newpipe.MainActivity.DEBUG;
18-
1915
/*
2016
* Created by Christian Schabesberger on 01.08.16.
2117
* <p>
@@ -81,7 +77,8 @@ private String getStreamInfoDetailLine(final StreamInfoItem infoItem) {
8177
}
8278
}
8379

84-
final String uploadDate = getFormattedRelativeUploadDate(infoItem);
80+
final String uploadDate = Localization.relativeTimeOrTextual(infoItem.getUploadDate(),
81+
infoItem.getTextualUploadDate(), itemBuilder.getContext());
8582
if (!TextUtils.isEmpty(uploadDate)) {
8683
if (viewsAndDate.isEmpty()) {
8784
return uploadDate;
@@ -92,20 +89,4 @@ private String getStreamInfoDetailLine(final StreamInfoItem infoItem) {
9289

9390
return viewsAndDate;
9491
}
95-
96-
private String getFormattedRelativeUploadDate(final StreamInfoItem infoItem) {
97-
if (infoItem.getUploadDate() != null) {
98-
String formattedRelativeTime = Localization
99-
.relativeTime(infoItem.getUploadDate().offsetDateTime());
100-
101-
if (DEBUG && PreferenceManager.getDefaultSharedPreferences(itemBuilder.getContext())
102-
.getBoolean(itemBuilder.getContext()
103-
.getString(R.string.show_original_time_ago_key), false)) {
104-
formattedRelativeTime += " (" + infoItem.getTextualUploadDate() + ")";
105-
}
106-
return formattedRelativeTime;
107-
} else {
108-
return infoItem.getTextualUploadDate();
109-
}
110-
}
11192
}

‎app/src/main/java/org/schabi/newpipe/util/Localization.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.schabi.newpipe.util;
22

3+
import static org.schabi.newpipe.MainActivity.DEBUG;
4+
35
import android.annotation.SuppressLint;
46
import android.content.Context;
57
import android.content.SharedPreferences;
@@ -22,6 +24,7 @@
2224
import org.schabi.newpipe.R;
2325
import org.schabi.newpipe.extractor.ListExtractor;
2426
import org.schabi.newpipe.extractor.localization.ContentCountry;
27+
import org.schabi.newpipe.extractor.localization.DateWrapper;
2528
import org.schabi.newpipe.extractor.stream.AudioStream;
2629
import org.schabi.newpipe.extractor.stream.AudioTrackType;
2730

@@ -214,6 +217,14 @@ public static String replyCount(final Context context, final int replyCount) {
214217
String.valueOf(replyCount));
215218
}
216219

220+
public static String likeCount(final Context context, final int likeCount) {
221+
if (likeCount < 0) {
222+
return "-";
223+
} else {
224+
return shortCount(context, likeCount);
225+
}
226+
}
227+
217228
public static String getDurationString(final long duration) {
218229
final String output;
219230

@@ -333,6 +344,20 @@ public static String relativeTime(final OffsetDateTime offsetDateTime) {
333344
return prettyTime.formatUnrounded(offsetDateTime);
334345
}
335346

347+
public static String relativeTimeOrTextual(final DateWrapper parsed,
348+
final String textual,
349+
@Nullable final Context context) {
350+
if (parsed == null) {
351+
return textual;
352+
} else if (DEBUG && context != null && PreferenceManager
353+
.getDefaultSharedPreferences(context)
354+
.getBoolean(context.getString(R.string.show_original_time_ago_key), false)) {
355+
return relativeTime(parsed.offsetDateTime()) + " (" + textual + ")";
356+
} else {
357+
return relativeTime(parsed.offsetDateTime());
358+
}
359+
}
360+
336361
public static void assureCorrectAppLanguage(final Context c) {
337362
final Resources res = c.getResources();
338363
final DisplayMetrics dm = res.getDisplayMetrics();

‎app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.schabi.newpipe.util;
22

3+
import static android.text.TextUtils.isEmpty;
34
import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;
45

56
import android.annotation.SuppressLint;
@@ -17,6 +18,7 @@
1718
import androidx.appcompat.app.AppCompatActivity;
1819
import androidx.core.content.ContextCompat;
1920
import androidx.fragment.app.Fragment;
21+
import androidx.fragment.app.FragmentActivity;
2022
import androidx.fragment.app.FragmentManager;
2123
import androidx.fragment.app.FragmentTransaction;
2224

@@ -29,8 +31,11 @@
2931
import org.schabi.newpipe.about.AboutActivity;
3032
import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
3133
import org.schabi.newpipe.download.DownloadActivity;
34+
import org.schabi.newpipe.error.ErrorUtil;
3235
import org.schabi.newpipe.extractor.NewPipe;
3336
import org.schabi.newpipe.extractor.StreamingService;
37+
import org.schabi.newpipe.extractor.comments.CommentsInfo;
38+
import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
3439
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
3540
import org.schabi.newpipe.extractor.stream.AudioStream;
3641
import org.schabi.newpipe.extractor.stream.DeliveryMethod;
@@ -41,6 +46,7 @@
4146
import org.schabi.newpipe.fragments.MainFragment;
4247
import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
4348
import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
49+
import org.schabi.newpipe.fragments.list.comments.CommentRepliesFragment;
4450
import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
4551
import org.schabi.newpipe.fragments.list.playlist.PlaylistFragment;
4652
import org.schabi.newpipe.fragments.list.search.SearchFragment;
@@ -476,6 +482,29 @@ public static void openChannelFragment(@NonNull final Fragment fragment,
476482
item.getServiceId(), uploaderUrl, item.getUploaderName());
477483
}
478484

485+
public static void openCommentAuthorIfPresent(@NonNull final FragmentActivity activity,
486+
final CommentsInfoItem comment) {
487+
if (isEmpty(comment.getUploaderUrl())) {
488+
return;
489+
}
490+
try {
491+
openChannelFragment(activity.getSupportFragmentManager(), comment.getServiceId(),
492+
comment.getUploaderUrl(), comment.getUploaderName());
493+
} catch (final Exception e) {
494+
ErrorUtil.showUiErrorSnackbar(activity, "Opening channel fragment", e);
495+
}
496+
}
497+
498+
public static void openCommentRepliesFragment(@NonNull final FragmentActivity activity,
499+
final CommentsInfo commentsInfo,
500+
final CommentsInfoItem commentsInfoItem) {
501+
defaultTransaction(activity.getSupportFragmentManager())
502+
.replace(R.id.fragment_holder,
503+
new CommentRepliesFragment(commentsInfo, commentsInfoItem))
504+
.addToBackStack(null)
505+
.commit();
506+
}
507+
479508
public static void openPlaylistFragment(final FragmentManager fragmentManager,
480509
final int serviceId, final String url,
481510
@NonNull final String name) {

‎app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ public static String getNameOfServiceById(final int serviceId) {
144144
.orElse("<unknown>");
145145
}
146146

147+
@NonNull
148+
public static StreamingService getServiceById(final int serviceId) {
149+
return ServiceList.all().stream()
150+
.filter(s -> s.getServiceId() == serviceId)
151+
.findFirst()
152+
.orElseThrow();
153+
}
154+
147155
public static void setSelectedServiceId(final Context context, final int serviceId) {
148156
String serviceName;
149157
try {

0 commit comments

Comments
 (0)