Merge pull request #908 from Automattic/update-date-format

Update Date Format

Author: anitaa1990

Simplenote/src/main/java/com/automattic/simplenote/HistoryBottomSheetDialog.java

@@ -114,7 +114,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                     mListener.onHistoryUpdateNote(revisedNote.getContent());
                 }
 
-                mHistoryDate.setText(DateTimeUtils.getDateText(mFragment.getActivity(), noteDate));
+                mHistoryDate.setText(DateTimeUtils.getDateText(requireContext(), noteDate));
             }
 
             @Override
@@ -188,7 +188,7 @@ private void setProgressBar() {
         if (totalRevs > 0) {
             mHistorySeekBar.setMax(totalRevs);
             mHistorySeekBar.setProgress(totalRevs);
-            mHistoryDate.setText(DateTimeUtils.getDateText(mFragment.getActivity(), mNote.getModificationDate()));
+            mHistoryDate.setText(DateTimeUtils.getDateText(requireContext(), mNote.getModificationDate()));
             mLoadingView.setVisibility(View.GONE);
             mSliderView.setVisibility(View.VISIBLE);
         } else {

Simplenote/src/main/java/com/automattic/simplenote/InfoBottomSheetDialog.java

@@ -135,7 +135,7 @@ public void show(FragmentManager manager, Note note) {
         if (mFragment.isAdded()) {
             showNow(manager, TAG);
 
-            String date = DateTimeUtils.getDateText(mFragment.getActivity(), note.getModificationDate());
+            String date = DateTimeUtils.getDateText(requireContext(), note.getModificationDate());
             mInfoModifiedDate.setText(String.format(mFragment.getString(R.string.modified_time), date));
             mInfoPinSwitch.setChecked(note.isPinned());
             mInfoMarkdownSwitch.setChecked(note.isMarkdownEnabled());

Simplenote/src/main/java/com/automattic/simplenote/NoteListFragment.java

@@ -1039,7 +1039,7 @@ public View getView(final int position, View view, ViewGroup parent) {
             mCursor.moveToPosition(position);
             holder.setNoteId(mCursor.getSimperiumKey());
             Calendar date = getDateByPreference(mCursor.getObject());
-            holder.mDate.setText(date != null ? DateTimeUtils.getDateTextShort(date) : "");
+            holder.mDate.setText(date != null ? DateTimeUtils.getDateTextNumeric(date) : "");
             holder.mDate.setVisibility(mIsSearching && date != null ? View.VISIBLE : View.GONE);
             boolean isPinned = mCursor.getObject().isPinned();
             holder.mPinned.setVisibility(!isPinned || mIsSearching ? View.GONE : View.VISIBLE);

Simplenote/src/main/java/com/automattic/simplenote/utils/DateTimeUtils.java

@@ -1,31 +1,32 @@
 package com.automattic.simplenote.utils;
 
-import android.app.Activity;
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.text.format.DateUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 
 public class DateTimeUtils {
-    public static String getDateText(Activity activity, Calendar noteDate) {
-        if (noteDate == null) {
+    public static String getDateText(Context context, Calendar calendar) {
+        if (calendar == null) {
             return "";
         }
 
-        long now = Calendar.getInstance().getTimeInMillis();
-        CharSequence dateText = android.text.format.DateUtils.getRelativeDateTimeString(
-                activity,
-                noteDate.getTimeInMillis(),
-                now,
+        CharSequence dateText = DateUtils.getRelativeDateTimeString(
+                context,
+                calendar.getTimeInMillis(),
+                Calendar.getInstance().getTimeInMillis(),
                 0L,
-                android.text.format.DateUtils.FORMAT_ABBREV_ALL
+                DateUtils.FORMAT_ABBREV_ALL
         );
 
         return dateText.toString();
     }
 
-    public static String getDateTextShort(Calendar date) {
-        SimpleDateFormat formatter = new SimpleDateFormat("MMM d", Locale.getDefault());
-        return formatter.format(date.getTime());
+    public static String getDateTextNumeric(Calendar date) {
+        String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), "MM/dd/YYYY");
+        return new SimpleDateFormat(pattern, Locale.getDefault()).format(date.getTime());
     }
 }