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

Call DateWrapper's offsetDateTime() instead of date().

This commit is contained in:
Isira Seneviratne 2020-11-19 18:35:17 +05:30
parent 493e47f7e6
commit eb1cddd85a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
View File

@ -144,7 +144,8 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
} }
if (item.getUploadDate() != null) { if (item.getUploadDate() != null) {
itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate().date())); itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate()
.offsetDateTime()));
} else { } else {
itemPublishedTime.setText(item.getTextualUploadDate()); itemPublishedTime.setText(item.getTextualUploadDate());
} }

2
app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java
View File

@ -95,7 +95,7 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
private String getFormattedRelativeUploadDate(final StreamInfoItem infoItem) { private String getFormattedRelativeUploadDate(final StreamInfoItem infoItem) {
if (infoItem.getUploadDate() != null) { if (infoItem.getUploadDate() != null) {
String formattedRelativeTime = Localization String formattedRelativeTime = Localization
.relativeTime(infoItem.getUploadDate().date()); .relativeTime(infoItem.getUploadDate().offsetDateTime());
if (DEBUG && PreferenceManager.getDefaultSharedPreferences(itemBuilder.getContext()) if (DEBUG && PreferenceManager.getDefaultSharedPreferences(itemBuilder.getContext())
.getBoolean(itemBuilder.getContext() .getBoolean(itemBuilder.getContext()

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

@ -30,6 +30,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle; import java.time.format.FormatStyle;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -312,12 +313,12 @@ public final class Localization {
prettyTime.removeUnit(Decade.class); prettyTime.removeUnit(Decade.class);
} }
private static PrettyTime getPrettyTime() { public static String relativeTime(final OffsetDateTime offsetDateTime) {
return prettyTime; return relativeTime(GregorianCalendar.from(offsetDateTime.toZonedDateTime()));
} }
public static String relativeTime(final Calendar calendarTime) { public static String relativeTime(final Calendar calendarTime) {
return getPrettyTime().formatUnrounded(calendarTime); return prettyTime.formatUnrounded(calendarTime);
} }
private static void changeAppLanguage(final Locale loc, final Resources res) { private static void changeAppLanguage(final Locale loc, final Resources res) {