Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch to an unambiguous date format in Absolute Time mode (#2800) 

* Switched to an unambiguous date format

* Updated unit tests to reflect expected change
This commit is contained in:
Ben Dundon 2022-11-16 04:46:05 +10:00 committed by GitHub
parent a3d13b2743
commit 3bc1fc4606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/util/AbsoluteTimeFormatter.kt
View File

@ -23,7 +23,7 @@ import java.util.TimeZone
class AbsoluteTimeFormatter @JvmOverloads constructor(private val tz: TimeZone = TimeZone.getDefault()) { class AbsoluteTimeFormatter @JvmOverloads constructor(private val tz: TimeZone = TimeZone.getDefault()) {
private val sameDaySdf = SimpleDateFormat("HH:mm", Locale.getDefault()).apply { this.timeZone = tz } private val sameDaySdf = SimpleDateFormat("HH:mm", Locale.getDefault()).apply { this.timeZone = tz }
private val sameYearSdf = SimpleDateFormat("MM-dd HH:mm", Locale.getDefault()).apply { this.timeZone = tz } private val sameYearSdf = SimpleDateFormat("dd MMM, HH:mm", Locale.getDefault()).apply { this.timeZone = tz }
private val otherYearSdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).apply { this.timeZone = tz } private val otherYearSdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).apply { this.timeZone = tz }
private val otherYearCompleteSdf = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).apply { this.timeZone = tz } private val otherYearCompleteSdf = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).apply { this.timeZone = tz }

8
app/src/test/java/com/keylesspalace/tusky/util/AbsoluteTimeFormatterTest.kt
View File

@ -27,11 +27,11 @@ class AbsoluteTimeFormatterTest {
@Test @Test
fun `same year formatting`() { fun `same year formatting`() {
val nextDay = Date.from(Instant.parse("2022-04-12T00:10:00.00Z")) val nextDay = Date.from(Instant.parse("2022-04-12T00:10:00.00Z"))
assertEquals("04-12 00:10", formatter.format(nextDay, true, now)) assertEquals("12 Apr, 00:10", formatter.format(nextDay, true, now))
assertEquals("04-12 00:10", formatter.format(nextDay, false, now)) assertEquals("12 Apr, 00:10", formatter.format(nextDay, false, now))
val endOfYear = Date.from(Instant.parse("2022-12-31T23:59:00.00Z")) val endOfYear = Date.from(Instant.parse("2022-12-31T23:59:00.00Z"))
assertEquals("12-31 23:59", formatter.format(endOfYear, true, now)) assertEquals("31 Dec, 23:59", formatter.format(endOfYear, true, now))
assertEquals("12-31 23:59", formatter.format(endOfYear, false, now)) assertEquals("31 Dec, 23:59", formatter.format(endOfYear, false, now))
} }
@Test @Test