Skip to content

Commit 13baaa3

Browse files
author
bg1722
committed
add an intuitive prefix for the duration of lists on UI, and avoid using the new prefix for single videos
1 parent f704721 commit 13baaa3

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ private void setStreamCountAndOverallDuration(final List<StreamInfoItem> list,
506506
Localization.concatenateStrings(
507507
Localization.localizeStreamCount(activity, streamCount),
508508
Localization.getDurationString(playlistOverallDurationSeconds,
509-
isDurationComplete))
509+
isDurationComplete, true))
510510
);
511511
}
512512
}

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,8 @@ private void setStreamCountAndOverallDuration(final ArrayList<LocalItem> itemsLi
837837
headerBinding.playlistStreamCount.setText(
838838
Localization.concatenateStrings(
839839
Localization.localizeStreamCount(activity, streamCount),
840-
Localization.getDurationString(playlistOverallDurationSeconds))
840+
Localization.getDurationString(playlistOverallDurationSeconds,
841+
true, true))
841842
);
842843
}
843844
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public static String likeCount(@NonNull final Context context, final int likeCou
245245
* @return a formatted duration String or {@code 0:00} if the duration is zero.
246246
*/
247247
public static String getDurationString(final long duration) {
248-
return getDurationString(duration, true);
248+
return getDurationString(duration, true, false);
249249
}
250250

251251
/**
@@ -254,9 +254,11 @@ public static String getDurationString(final long duration) {
254254
* duration string.
255255
* @param duration the duration in seconds
256256
* @param isDurationComplete whether the given duration is complete or whether info is missing
257+
* @param showDurationPrefix whether the duration-prefix shall be shown
257258
* @return a formatted duration String or {@code 0:00} if the duration is zero.
258259
*/
259-
public static String getDurationString(final long duration, final boolean isDurationComplete) {
260+
public static String getDurationString(final long duration, final boolean isDurationComplete,
261+
final boolean showDurationPrefix) {
260262
final String output;
261263

262264
final long days = duration / (24 * 60 * 60L); /* greater than a day */
@@ -274,8 +276,9 @@ public static String getDurationString(final long duration, final boolean isDura
274276
} else {
275277
output = String.format(Locale.US, "%d:%02d", minutes, seconds);
276278
}
279+
final String durationPrefix = showDurationPrefix ? "⏱ " : "";
277280
final String durationPostfix = isDurationComplete ? "" : "+";
278-
return output + durationPostfix;
281+
return durationPrefix + output + durationPostfix;
279282
}
280283

281284
/**

0 commit comments

Comments
 (0)