From 43e2d1015ef40bf186ec90ed027127979c240004 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 11 Jan 2019 11:35:24 +0100 Subject: [PATCH] instead of a flickering date header, show relative date beside time for older messages --- .../securesms/ConversationFragment.java | 16 ++++++++-------- .../components/ConversationItemFooter.java | 10 +++++----- .../thoughtcrime/securesms/util/DateUtils.java | 12 ++++++++---- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 825bb0574..29d58737e 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -605,9 +605,9 @@ public class ConversationFragment extends Fragment ViewUtil.animateIn(scrollToBottomButton, scrollButtonInAnimation); } - if (positionId != lastPositionId) { - bindScrollHeader(conversationDateHeader, positionId); - } +// if (positionId != lastPositionId) { +// bindScrollHeader(conversationDateHeader, positionId); +// } wasAtBottom = currentlyAtBottom; wasAtZoomScrollHeight = currentlyAtZoomScrollHeight; @@ -618,11 +618,11 @@ public class ConversationFragment extends Fragment @Override public void onScrollStateChanged(RecyclerView recyclerView, int newState) { - if (newState == RecyclerView.SCROLL_STATE_DRAGGING) { - conversationDateHeader.show(); - } else if (newState == RecyclerView.SCROLL_STATE_IDLE) { - conversationDateHeader.hide(); - } +// if (newState == RecyclerView.SCROLL_STATE_DRAGGING) { +// conversationDateHeader.show(); +// } else if (newState == RecyclerView.SCROLL_STATE_IDLE) { +// conversationDateHeader.hide(); +// } } private boolean isAtBottom() { diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java index 679534350..8f34469e8 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java +++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java @@ -71,12 +71,12 @@ public class ConversationItemFooter extends LinearLayout { private void presentDate(@NonNull DcMsg messageRecord, @NonNull Locale locale) { dateView.forceLayout(); - if(messageRecord.hasDeviatingTimestamp()) { +// if(messageRecord.hasDeviatingTimestamp()) { dateView.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp())); - } - else { - dateView.setText(DateUtils.getTimeOfDayTimeSpanString(getContext(), locale, messageRecord.getTimestamp())); - } +// } +// else { +// dateView.setText(DateUtils.getTimeOfDayTimeSpanString(getContext(), locale, messageRecord.getTimestamp())); +// } } private void presentSecureIndicator(@NonNull DcMsg messageRecord) { diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index 1613ba1be..f59598bb4 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -80,7 +80,8 @@ public class DateUtils extends android.text.format.DateUtils { return c.getResources().getQuantityString(R.plurals.n_minutes, mins, mins); } else { StringBuilder format = new StringBuilder(); - if (isWithin(timestamp, 6, TimeUnit.DAYS)) format.append("EEE "); + if (DateUtils.isToday(timestamp)) {} + else if (isWithin(timestamp, 6, TimeUnit.DAYS)) format.append("EEE "); else if (isWithin(timestamp, 365, TimeUnit.DAYS)) format.append("MMM d, "); else format.append("MMM d, yyyy, "); @@ -143,7 +144,7 @@ public class DateUtils extends android.text.format.DateUtils { } else if (isYesterday(timestamp)) { return context.getString(R.string.yesterday); } else { - return getFormattedDateTime(timestamp, "EEE, MMM d, yyyy", locale); + return getFormattedDateTime(timestamp, "EEEE, MMMM d, yyyy", locale); } } @@ -156,10 +157,13 @@ public class DateUtils extends android.text.format.DateUtils { } private static String getLocalizedPattern(String template, Locale locale) { + String ret; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - return DateFormat.getBestDateTimePattern(locale, template); + ret = DateFormat.getBestDateTimePattern(locale, template); } else { - return new SimpleDateFormat(template, locale).toLocalizedPattern(); + ret = new SimpleDateFormat(template, locale).toLocalizedPattern(); } + ret.replace(".,", ","); + return ret; } }