Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-05 21:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label scheduled-message times beyond tomorrow with their weekday.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-06-29 12:42:42 +00:00
committed by Alex Hart
parent 97a0f7b659
commit 364f2baf4b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
+8 -1
View File
@@ -27,6 +27,7 @@ import org.thoughtcrime.securesms.util.DateUtils.getBriefRelativeTimeSpanString
import java.text.DateFormatSymbols
import java.text.ParseException
import java.text.SimpleDateFormat
import java.time.format.TextStyle
import java.util.Calendar
import java.util.Date
import java.util.Locale
@@ -292,8 +293,10 @@ object DateUtils : android.text.format.DateUtils() {
} else {
context.getString(R.string.DateUtils_today)
}
} else {
} else if (isTomorrow(timestamp)) {
context.getString(R.string.DateUtils_tomorrow)
} else {
localDateTime.dayOfWeek.getDisplayName(TextStyle.FULL, Locale.getDefault())
}
val time = localDateTime.toLocalTime().formatHours(context)
return context.getString(R.string.DateUtils_schedule_at, dayModifier, time)
@@ -383,6 +386,10 @@ object DateUtils : android.text.format.DateUtils() {
return isToday(time + TimeUnit.DAYS.toMillis(1))
}
private fun isTomorrow(time: Long): Boolean {
return isToday(time - TimeUnit.DAYS.toMillis(1))
}
private fun getHour(context: Context, timestamp: Long): Int {
val cal = Calendar.getInstance(Locale.getDefault())
cal.timeInMillis = timestamp