Skip to content

fix: Group notifications older then 2 days by date #22212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

fix: Group notifications older then 2 days by date #22212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d167720
fix: Group notifications older then 2 days by date
timurgilfanov Sep 16, 2025
5caa2eb
Replace function call with indexed accessor
timurgilfanov Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 40 additions & 17 deletions WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NoteViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import android.view.ViewGroup
import android.view.ViewTreeObserver
import android.widget.ImageView
import android.widget.TextView
import androidx.annotation.StringRes
import androidx.core.text.BidiFormatter
import androidx.core.text.trimmedLength
import androidx.core.view.isVisible
Expand All @@ -26,11 +25,15 @@ import org.wordpress.android.ui.comments.CommentUtils
import org.wordpress.android.ui.notifications.NotificationsListViewModel
import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan
import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
import org.wordpress.android.util.DateUtils.isSameDay
import org.wordpress.android.util.GravatarUtils
import org.wordpress.android.util.RtlUtils
import org.wordpress.android.util.extensions.getColorFromAttribute
import org.wordpress.android.util.image.ImageManager
import org.wordpress.android.util.image.ImageType
import java.text.DateFormat
import java.util.Calendar
import java.util.Date
import javax.inject.Inject
import kotlin.math.roundToInt

Expand Down Expand Up @@ -141,25 +144,27 @@ class NoteViewHolder(
binding.root.context.getString(if (liked) R.string.mnu_comment_liked else R.string.reader_label_like)
}

@StringRes
private fun timeGroupHeaderText(note: Note, previousNote: Note?) =
previousNote?.timeGroup.let { previousTimeGroup ->
val timeGroup = note.timeGroup
if (previousTimeGroup?.let { it == timeGroup } == true) {
// If the previous time group exists and is the same, we don't need a new one
null
} else {
// Otherwise, we create a new one
when (timeGroup) {
Note.NoteTimeGroup.GROUP_TODAY -> R.string.stats_timeframe_today
Note.NoteTimeGroup.GROUP_YESTERDAY -> R.string.stats_timeframe_yesterday
Note.NoteTimeGroup.GROUP_OLDER_TWO_DAYS -> R.string.older_two_days
Note.NoteTimeGroup.GROUP_OLDER_WEEK -> R.string.older_last_week
Note.NoteTimeGroup.GROUP_OLDER_MONTH -> R.string.older_month
}
private fun timeGroupHeaderText(note: Note, previousNote: Note?): String? {
val noteDate = Date(note.timestamp * MILLISECOND)

// If we have a previous note, check if it's from the same calendar day
previousNote?.let { prevNote ->
val prevNoteDate = Date(prevNote.timestamp * MILLISECOND)
if (isSameDay(noteDate, prevNoteDate)) {
// Same day as previous note, don't show a header
return null
}
}

return when (note.timeGroup) {
Note.NoteTimeGroup.GROUP_TODAY -> binding.root.context.getString(R.string.stats_timeframe_today)
Note.NoteTimeGroup.GROUP_YESTERDAY -> binding.root.context.getString(R.string.stats_timeframe_yesterday)
Note.NoteTimeGroup.GROUP_OLDER_TWO_DAYS,
Note.NoteTimeGroup.GROUP_OLDER_WEEK,
Note.NoteTimeGroup.GROUP_OLDER_MONTH -> timeGroupHeaderDate(noteDate)
}
}

fun bindSubject(note: Note) {
// Subject is stored in db as html to preserve text formatting
var noteSubjectSpanned: Spanned = note.getFormattedSubject(notificationsUtilsWrapper)
Expand Down Expand Up @@ -270,3 +275,21 @@ class NoteViewHolder(
private val Note.timeGroup
get() = Note.getTimeGroupForTimestamp(timestamp)
}

private const val MILLISECOND = 1000

/**
* Get formatted date string for display in notification headers
*/
private fun timeGroupHeaderDate(date: Date): String {
val calendar = Calendar.getInstance()
val currentYear = calendar[Calendar.YEAR]
calendar.time = date
val noteYear = calendar[Calendar.YEAR]

val text = DateFormat.getDateInstance(DateFormat.MEDIUM).format(date)
return when (noteYear) {
currentYear -> text.replace(", $noteYear", "")
else -> text
}
}