Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10952 from bg172/release-0.27.0 

Add an intuitive prefix for the duration of lists in the UI
This commit is contained in:
Stypox 2024-04-11 09:27:54 +02:00 committed by GitHub
parent d9da84c412 13baaa31cd
commit 5bf77160f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,7 +506,7 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
Localization.concatenateStrings( Localization.concatenateStrings(
Localization.localizeStreamCount(activity, streamCount), Localization.localizeStreamCount(activity, streamCount),
Localization.getDurationString(playlistOverallDurationSeconds, Localization.getDurationString(playlistOverallDurationSeconds,
isDurationComplete)) isDurationComplete, true))
); );
} }
} }

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

@ -837,7 +837,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
headerBinding.playlistStreamCount.setText( headerBinding.playlistStreamCount.setText(
Localization.concatenateStrings( Localization.concatenateStrings(
Localization.localizeStreamCount(activity, streamCount), Localization.localizeStreamCount(activity, streamCount),
Localization.getDurationString(playlistOverallDurationSeconds)) Localization.getDurationString(playlistOverallDurationSeconds,
true, true))
); );
} }
} }

9
app/src/main/java/org/schabi/newpipe/util/Localization.java
View File

@ -245,7 +245,7 @@ public final class Localization {
* @return a formatted duration String or {@code 0:00} if the duration is zero. * @return a formatted duration String or {@code 0:00} if the duration is zero.
*/ */
public static String getDurationString(final long duration) { public static String getDurationString(final long duration) {
return getDurationString(duration, true); return getDurationString(duration, true, false);
} }
/** /**
@ -254,9 +254,11 @@ public final class Localization {
* duration string. * duration string.
* @param duration the duration in seconds * @param duration the duration in seconds
* @param isDurationComplete whether the given duration is complete or whether info is missing * @param isDurationComplete whether the given duration is complete or whether info is missing
* @param showDurationPrefix whether the duration-prefix shall be shown
* @return a formatted duration String or {@code 0:00} if the duration is zero. * @return a formatted duration String or {@code 0:00} if the duration is zero.
*/ */
public static String getDurationString(final long duration, final boolean isDurationComplete) { public static String getDurationString(final long duration, final boolean isDurationComplete,
final boolean showDurationPrefix) {
final String output; final String output;
final long days = duration / (24 * 60 * 60L); /* greater than a day */ final long days = duration / (24 * 60 * 60L); /* greater than a day */
@ -274,8 +276,9 @@ public final class Localization {
} else { } else {
output = String.format(Locale.US, "%d:%02d", minutes, seconds); output = String.format(Locale.US, "%d:%02d", minutes, seconds);
} }
final String durationPrefix = showDurationPrefix ? "⏱ " : "";
final String durationPostfix = isDurationComplete ? "" : "+"; final String durationPostfix = isDurationComplete ? "" : "+";
return output + durationPostfix; return durationPrefix + output + durationPostfix;
} }
/** /**