Clean up date/time formatting code

app/src/main/java/org/wikipedia/activitytab/ImpactModule.kt

@@ -166,7 +166,7 @@ fun AllTimeImpactCard(
                     statLabel = pluralStringResource(R.plurals.activity_tab_impact_thanks, totalThanks)
                 )
                 val lastEditedDateString = if (lastEditTimestamp > 0) {
-                    DateUtil.getMDYDateString(Date(lastEditTimestamp * 1000))
+                    DateUtil.getDateString(Date(lastEditTimestamp * 1000))
                 } else {
                     "-"
                 }

app/src/main/java/org/wikipedia/activitytab/ReadingHistoryModule.kt

@@ -1,6 +1,5 @@
 package org.wikipedia.activitytab
 
-import android.text.format.DateFormat
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -55,11 +54,11 @@ import org.wikipedia.compose.theme.WikipediaTheme
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.page.PageTitle
 import org.wikipedia.theme.Theme
+import org.wikipedia.util.DateUtil
 import org.wikipedia.util.StringUtil
 import org.wikipedia.util.UiState
 import org.wikipedia.views.imageservice.ImageService
 import java.time.LocalDate
-import java.time.format.DateTimeFormatter
 import java.util.Locale
 
 @Composable
@@ -252,25 +251,9 @@ private fun ArticleReadThisMonthCard(
                 showChevron = true,
                 subtitle = if (readingHistory.lastArticleReadTime != null) {
                     if (todayDate == readingHistory.lastArticleReadTime.toLocalDate())
-                        readingHistory.lastArticleReadTime
-                            .format(
-                                DateTimeFormatter.ofPattern(
-                                    DateFormat.getBestDateTimePattern(
-                                        Locale.getDefault(),
-                                        "hhmm a"
-                                    )
-                                )
-                            )
+                        DateUtil.getTimeString(readingHistory.lastArticleReadTime)
                     else
-                        readingHistory.lastArticleReadTime
-                            .format(
-                                DateTimeFormatter.ofPattern(
-                                    DateFormat.getBestDateTimePattern(
-                                        Locale.getDefault(),
-                                        "MMMM d"
-                                    )
-                                )
-                            )
+                        DateUtil.getLongMonthDayString(readingHistory.lastArticleReadTime.toLocalDate())
                 } else null
             )
 
@@ -325,25 +308,9 @@ private fun ArticleSavedThisMonthCard(
                 showChevron = true,
                 subtitle = if (readingHistory.lastArticleSavedTime != null) {
                     if (todayDate == readingHistory.lastArticleSavedTime.toLocalDate())
-                        readingHistory.lastArticleSavedTime
-                            .format(
-                                DateTimeFormatter.ofPattern(
-                                    DateFormat.getBestDateTimePattern(
-                                        Locale.getDefault(),
-                                        "hhmm a"
-                                    )
-                                )
-                            )
+                        DateUtil.getTimeString(readingHistory.lastArticleSavedTime)
                     else
-                        readingHistory.lastArticleSavedTime
-                            .format(
-                                DateTimeFormatter.ofPattern(
-                                    DateFormat.getBestDateTimePattern(
-                                        Locale.getDefault(),
-                                        "MMMM d"
-                                    )
-                                )
-                            )
+                        DateUtil.getLongMonthDayString(readingHistory.lastArticleSavedTime.toLocalDate())
                 } else null
             )
 

app/src/main/java/org/wikipedia/activitytab/timeline/TimelineModule.kt

@@ -221,7 +221,7 @@ fun TimelineDateSeparator(
     val (dateHeaderText, showSecondaryDate) = when {
         date.isToday() -> stringResource(R.string.activity_tab_timeline_today) to true
         date.isYesterday() -> stringResource(R.string.activity_tab_timeline_yesterday) to true
-        else -> DateUtil.getMMMMdYYYY(date, false) to false
+        else -> DateUtil.getDateString(date) to false
     }
 
     Column(
@@ -236,7 +236,7 @@ fun TimelineDateSeparator(
         )
         if (showSecondaryDate) {
             Text(
-                text = DateUtil.getMMMMdYYYY(date, false),
+                text = DateUtil.getDateString(date),
                 style = MaterialTheme.typography.bodySmall,
                 color = WikipediaTheme.colors.secondaryColor
             )

app/src/main/java/org/wikipedia/diff/ArticleEditDetailsFragment.kt

@@ -452,7 +452,7 @@ class ArticleEditDetailsFragment : Fragment(), WatchlistExpiryDialog.Callback, M
 
         if (viewModel.revisionFrom != null) {
             binding.usernameFromButton.text = viewModel.revisionFrom!!.user
-            binding.revisionFromTimestamp.text = DateUtil.getTimeAndDateString(requireContext(), viewModel.revisionFrom!!.timeStamp)
+            binding.revisionFromTimestamp.text = DateUtil.getDateAndTimeString(viewModel.revisionFrom!!.localDateTime)
             binding.revisionFromEditComment.text = StringUtil.fromHtml(viewModel.revisionFrom!!.parsedcomment.trim())
             binding.revisionFromTimestamp.setTextColor(ResourceUtil.getThemedColor(requireContext(), R.attr.progressive_color))
             binding.overlayRevisionFromTimestamp.setTextColor(ResourceUtil.getThemedColor(requireContext(), R.attr.progressive_color))
@@ -472,7 +472,7 @@ class ArticleEditDetailsFragment : Fragment(), WatchlistExpiryDialog.Callback, M
 
         viewModel.revisionTo?.let {
             binding.usernameToButton.text = it.user
-            binding.revisionToTimestamp.text = DateUtil.getTimeAndDateString(requireContext(), it.timeStamp)
+            binding.revisionToTimestamp.text = DateUtil.getDateAndTimeString(it.localDateTime)
             binding.overlayRevisionToTimestamp.text = binding.revisionToTimestamp.text
             binding.revisionToEditComment.text = StringUtil.fromHtml(it.parsedcomment.trim())
 

app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.kt

@@ -24,7 +24,7 @@ class OnThisDayCard(val event: OnThisDay.Event, wiki: WikiSite, val age: Int) :
     }
 
     override fun subtitle(): String {
-        return DateUtil.getFeedCardShortDateString(date)
+        return DateUtil.getMediumMonthDayString(date)
     }
 
     override fun dismissHashCode(): Int {

app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.kt

@@ -50,7 +50,7 @@ class OnThisDayFragment : Fragment(), CustomDatePicker.Callback {
             } else if (verticalOffset <= -appBarLayout.totalScrollRange) {
                 binding.dropDownToolbar.visibility = View.VISIBLE
             }
-            val newText = if (verticalOffset <= -appBarLayout.totalScrollRange) DateUtil.getMonthOnlyDateString(viewModel.date.time) else ""
+            val newText = if (verticalOffset <= -appBarLayout.totalScrollRange) DateUtil.getMonthOnlyDateString(viewModel.date) else ""
             if (newText != binding.toolbarDay.text.toString()) {
                 appBarLayout.post { binding.toolbarDay.text = newText }
             }
@@ -138,7 +138,7 @@ class OnThisDayFragment : Fragment(), CustomDatePicker.Callback {
         binding.collapsingToolbarLayout.setCollapsedTitleTextColor(
             ResourceUtil.getThemedColor(requireContext(), R.attr.primary_color)
         )
-        binding.day.text = DateUtil.getMonthOnlyDateString(viewModel.date.time)
+        binding.day.text = DateUtil.getMonthOnlyDateString(viewModel.date)
         maybeHideDateIndicator()
         binding.appBar.addOnOffsetChangedListener(offsetChangedListener)
     }
@@ -161,7 +161,7 @@ class OnThisDayFragment : Fragment(), CustomDatePicker.Callback {
     override fun onDatePicked(calendar: Calendar) {
         binding.eventsRecycler.visibility = View.GONE
         viewModel.date[CustomDatePicker.LEAP_YEAR, calendar[Calendar.MONTH], calendar[Calendar.DATE], 0] = 0
-        binding.day.text = DateUtil.getMonthOnlyDateString(viewModel.date.time)
+        binding.day.text = DateUtil.getMonthOnlyDateString(viewModel.date)
         binding.appBar.setExpanded(true)
         viewModel.loadOnThisDay(calendar)
         maybeHideDateIndicator()

app/src/main/java/org/wikipedia/feed/topread/TopReadListCard.kt

@@ -21,7 +21,7 @@ class TopReadListCard(
     }
 
     override fun subtitle(): String {
-        return DateUtil.getShortDateString(articles.localDate)
+        return DateUtil.getDateString(articles.localDate)
     }
 
     override fun type(): CardType {

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameMainMenuFragment.kt

@@ -70,7 +70,7 @@ class OnThisDayGameMainMenuFragment : OnThisDayGameBaseFragment() {
     }
 
     private fun showGameMenu() {
-        binding.dateText.text = DateUtil.getShortDateString(viewModel.currentDate)
+        binding.dateText.text = DateUtil.getDateString(viewModel.currentDate)
         binding.gameMenuContainer.isVisible = true
         binding.progressBar.isVisible = false
         binding.errorView.isVisible = false

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGamePlayFragment.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.graphics.Color
 import android.media.MediaPlayer
 import android.os.Bundle
-import android.text.format.DateFormat
 import android.text.method.ScrollingMovementMethod
 import android.view.LayoutInflater
 import android.view.View
@@ -29,17 +28,14 @@ import org.wikipedia.analytics.eventplatform.WikiGamesEvent
 import org.wikipedia.databinding.FragmentOnThisDayGamePlayBinding
 import org.wikipedia.feed.onthisday.OnThisDay
 import org.wikipedia.settings.Prefs
+import org.wikipedia.util.DateUtil
 import org.wikipedia.util.DimenUtil
 import org.wikipedia.util.Resource
 import org.wikipedia.util.ResourceUtil
 import org.wikipedia.util.log.L
 import org.wikipedia.views.ViewUtil
 import org.wikipedia.views.WikiCardView
-import java.time.LocalDate
-import java.time.MonthDay
-import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
-import java.util.Locale
 
 class OnThisDayGamePlayFragment : Fragment() {
     private var _binding: FragmentOnThisDayGamePlayBinding? = null
@@ -356,10 +352,7 @@ class OnThisDayGamePlayFragment : Fragment() {
         binding.questionStatusIcon1.isVisible = false
         binding.questionStatusIcon2.isVisible = false
 
-        MonthDay.of(viewModel.currentMonth, viewModel.currentDay).let {
-            val text = it.format(DateTimeFormatter.ofPattern(DateFormat.getBestDateTimePattern(Locale.getDefault(), "MMMM d")))
-            mainActivity?.updateAppBarDateText(text)
-        }
+        mainActivity?.updateAppBarDateText(DateUtil.getLongMonthDayString(viewModel.currentDate))
 
         binding.scoreView.updateScores(gameState.answerState, gameState.currentQuestionIndex, gameState.currentQuestionState.goToNext)
 
@@ -369,7 +362,7 @@ class OnThisDayGamePlayFragment : Fragment() {
         binding.questionCard1.tag = event1
         binding.questionCard2.tag = event2
 
-        binding.questionDate1.text = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(LocalDate.of(event1.year, viewModel.currentMonth, viewModel.currentDay))
+        binding.questionDate1.text = DateUtil.getDateString(viewModel.currentDate.withYear(event1.year), FormatStyle.LONG)
         binding.questionText1.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = 0 }
         binding.questionText1.text = event1.text
         binding.questionText1.scrollY = 0
@@ -383,7 +376,7 @@ class OnThisDayGamePlayFragment : Fragment() {
             ViewUtil.loadImage(binding.questionThumbnail1, thumbnailUrl1, placeholderId = R.mipmap.launcher)
         }
 
-        binding.questionDate2.text = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(LocalDate.of(event2.year, viewModel.currentMonth, viewModel.currentDay))
+        binding.questionDate2.text = DateUtil.getDateString(viewModel.currentDate.withYear(event2.year), FormatStyle.LONG)
         binding.questionText2.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = 0 }
         binding.questionText2.text = event2.text
         binding.questionText2.scrollY = 0

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameResultFragment.kt

@@ -7,7 +7,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -50,6 +49,7 @@ import org.wikipedia.readinglist.LongPressMenu
 import org.wikipedia.readinglist.ReadingListBehaviorsUtil
 import org.wikipedia.readinglist.database.ReadingListPage
 import org.wikipedia.settings.Prefs
+import org.wikipedia.util.DateUtil
 import org.wikipedia.util.DimenUtil
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.Resource
@@ -63,8 +63,6 @@ import java.time.Duration
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
-import java.time.MonthDay
-import java.time.format.DateTimeFormatter
 import java.util.Locale
 
 class OnThisDayGameResultFragment : OnThisDayGameBaseFragment(), OnThisDayGameArticleBottomSheet.Callback {
@@ -180,10 +178,7 @@ class OnThisDayGameResultFragment : OnThisDayGameBaseFragment(), OnThisDayGameAr
 
     private fun onGameEnded(gameState: OnThisDayGameViewModel.GameState, gameStatistics: OnThisDayGameViewModel.GameStatistics) {
         mainActivity?.showAppBarDateText()
-        MonthDay.of(viewModel.currentMonth, viewModel.currentDay).let {
-            val text = it.format(DateTimeFormatter.ofPattern(DateFormat.getBestDateTimePattern(Locale.getDefault(), "MMMM d")))
-            mainActivity?.updateAppBarDateText(text)
-        }
+        mainActivity?.updateAppBarDateText(DateUtil.getLongMonthDayString(viewModel.currentDate))
 
         binding.progressBar.isVisible = false
         binding.errorView.isVisible = false

app/src/main/java/org/wikipedia/page/PageFragmentLoadState.kt

@@ -225,7 +225,7 @@ class PageFragmentLoadState(private var model: PageViewModel,
             return
         }
         val localDate = LocalDate.ofInstant(dateHeader, ZoneId.systemDefault())
-        val dateStr = DateUtil.getShortDateString(localDate)
+        val dateStr = DateUtil.getDateString(localDate)
         Toast.makeText(fragment.requireContext().applicationContext,
             fragment.getString(R.string.page_offline_notice_last_date, dateStr),
             Toast.LENGTH_LONG).show()

app/src/main/java/org/wikipedia/page/edithistory/EditHistoryItemView.kt

@@ -70,7 +70,7 @@ class EditHistoryItemView(context: Context) : FrameLayout(context) {
             StringUtil.setHighlightedAndBoldenedText(binding.editHistoryTitle, historyTitle, currentQuery)
         }
         StringUtil.setHighlightedAndBoldenedText(binding.userNameText, itemRevision.user, currentQuery)
-        binding.editHistoryTimeText.text = DateUtil.getTimeString(context, DateUtil.iso8601DateParse(itemRevision.timeStamp))
+        binding.editHistoryTimeText.text = DateUtil.getTimeString(itemRevision.localDateTime)
     }
 
     fun setSelectedState(selectedState: Int) {

app/src/main/java/org/wikipedia/page/edithistory/EditHistoryListActivity.kt

@@ -53,6 +53,7 @@ import org.wikipedia.views.EditHistoryFilterOverflowView
 import org.wikipedia.views.EditHistoryStatsView
 import org.wikipedia.views.SearchAndFilterActionProvider
 import org.wikipedia.views.WikiErrorView
+import java.time.format.FormatStyle
 
 class EditHistoryListActivity : BaseActivity() {
 
@@ -165,11 +166,13 @@ class EditHistoryListActivity : BaseActivity() {
     private fun updateCompareStateItems() {
         binding.compareFromCard.isVisible = viewModel.selectedRevisionFrom != null
         if (viewModel.selectedRevisionFrom != null) {
-            binding.compareFromText.text = DateUtil.getShortDayWithTimeString(viewModel.selectedRevisionFrom!!.timeStamp)
+            binding.compareFromText.text =
+                DateUtil.getDateAndTimeString(viewModel.selectedRevisionFrom!!.localDateTime, dateStyle = FormatStyle.SHORT)
         }
         binding.compareToCard.isVisible = viewModel.selectedRevisionTo != null
         if (viewModel.selectedRevisionTo != null) {
-            binding.compareToText.text = DateUtil.getShortDayWithTimeString(viewModel.selectedRevisionTo!!.timeStamp)
+            binding.compareToText.text =
+                DateUtil.getDateAndTimeString(viewModel.selectedRevisionTo!!.localDateTime, dateStyle = FormatStyle.SHORT)
         }
         enableCompareButton(binding.compareConfirmButton, viewModel.selectedRevisionFrom != null && viewModel.selectedRevisionTo != null)
     }

app/src/main/java/org/wikipedia/page/edithistory/EditHistoryListViewModel.kt

@@ -81,7 +81,7 @@ class EditHistoryListViewModel(savedStateHandle: SavedStateHandle) : ViewModel()
             val dateBefore = before?.item?.localDateTime?.toLocalDate()
             val dateAfter = after?.item?.localDateTime?.toLocalDate()
             if (dateAfter != null && dateAfter != dateBefore) {
-                EditHistorySeparator(DateUtil.getShortDateString(dateAfter))
+                EditHistorySeparator(DateUtil.getDateString(dateAfter))
             } else {
                 null
             }

app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.kt

@@ -150,7 +150,7 @@ class PageHeaderView(context: Context, attrs: AttributeSet? = null) : LinearLayo
                 context.getString(R.string.donation_reminders_subsequent_milestone_reached_prompt_title, articleText)
             }
 
-            val dateText = DateUtil.getMMMMdYYYY(Date(config.setupTimestamp))
+            val dateText = DateUtil.getDateString(Date(config.setupTimestamp))
             val messageText = context.getString(R.string.donation_reminders_prompt_message, dateText, articleText, donationAmount)
             val positiveButtonText = context.getString(R.string.donation_reminders_prompt_positive_button)
             val negativeButtonText = context.getString(R.string.donation_reminders_prompt_negative_button)

app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.kt

@@ -77,7 +77,7 @@ import org.wikipedia.views.MultiSelectActionModeCallback.Companion.isTagType
 import org.wikipedia.views.PageItemView
 import org.wikipedia.views.SwipeableItemTouchHelperCallback
 import org.wikipedia.yearinreview.YearInReviewViewModel
-import java.util.Date
+import java.time.LocalDateTime
 import java.util.Locale
 
 class ReadingListFragment : Fragment(), MenuProvider, ReadingListItemActionsDialog.Callback {
@@ -503,7 +503,7 @@ class ReadingListFragment : Fragment(), MenuProvider, ReadingListItemActionsDial
             ReadingListMode.PREVIEW -> {
                 if (readingList == null) {
                     val emptyTitle = requireContext().getString(R.string.reading_lists_preview_header_title)
-                    val emptyDescription = DateUtil.getTimeAndDateString(requireContext(), Date())
+                    val emptyDescription = DateUtil.getDateAndTimeString(LocalDateTime.now())
                     viewModel.updateList(emptyTitle, emptyDescription, encoded = true)
                 } else {
                     update()

app/src/main/java/org/wikipedia/readinglist/ReadingListPreviewSaveDialogView.kt

@@ -25,7 +25,7 @@ import org.wikipedia.util.log.L
 import org.wikipedia.views.DefaultViewHolder
 import org.wikipedia.views.DrawableItemDecoration
 import org.wikipedia.views.ViewUtil
-import java.util.Date
+import java.time.LocalDateTime
 
 class ReadingListPreviewSaveDialogView(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
 
@@ -68,7 +68,8 @@ class ReadingListPreviewSaveDialogView(context: Context, attrs: AttributeSet? =
         } else {
             R.string.recommended_reading_list_title
         }
-        val defaultListTitle = context.getString(titleRes).plus(" " + DateUtil.getShortDayWithTimeString(Date()))
+        val defaultListTitle = context.getString(titleRes) + " " +
+                DateUtil.getDateAndTimeString(LocalDateTime.now())
         binding.readingListTitleLayout.editText?.setText(defaultListTitle)
         validateTitleAndList()
         binding.recyclerView.adapter = ReadingListItemAdapter()

app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsCardsItemFragment.kt

@@ -164,7 +164,7 @@ class SuggestedEditsCardsItemFragment : SuggestedEditsItemFragment() {
             binding.viewImageArtist.setTitleText(StringUtil.removeHTMLTags(sourceSummaryForEdit?.metadata?.artist()))
         }
 
-        binding.viewImageDate.setDetailText(DateUtil.getTimeAndDateString(requireContext(), sourceSummaryForEdit?.timestamp.orEmpty()))
+        binding.viewImageDate.setDetailText(DateUtil.getDateAndTimeString(sourceSummaryForEdit?.timestamp.orEmpty()))
         binding.viewImageSource.setDetailText(sourceSummaryForEdit!!.metadata!!.credit())
         binding.viewImageLicense.setDetailText(sourceSummaryForEdit!!.metadata!!.licenseShortName())