anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-3126 Date as an Object | Updated header (#1880)

Browse source
This commit is contained in:
Konstantin Ivanov 2024-12-06 14:59:39 +01:00 • committed by GitHub
parent b9a38a4fb2
commit d455a4828c
Signed by: github
GPG key ID: B5690EEEBB952194
20 changed files with 361 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

37
device/src/main/java/com/anytypeio/anytype/device/providers/DateProviderImpl.kt
View file

@ -1,6 +1,7 @@
package com.anytypeio.anytype.device.providers
import android.text.format.DateUtils
import com.anytypeio.anytype.core_models.DayOfWeekCustom
import com.anytypeio.anytype.core_models.RelativeDate
import com.anytypeio.anytype.core_models.TimeInMillis
import com.anytypeio.anytype.core_models.TimeInSeconds
@ -185,9 +186,9 @@ class DateProviderImpl @Inject constructor(
return truncatedDateTime1 == truncatedDateTime2
}
override fun calculateRelativeDates(dateInSeconds: TimeInSeconds?): RelativeDate? {
override fun calculateRelativeDates(dateInSeconds: TimeInSeconds?): RelativeDate {
if (dateInSeconds == null || dateInSeconds == 0L) return null
if (dateInSeconds == null || dateInSeconds == 0L) return RelativeDate.Empty
val initialTimeInMillis = dateInSeconds * 1000
val zoneId = defaultZoneId
val dateInstant = Instant.ofEpochSecond(dateInSeconds)
@ -196,10 +197,33 @@ class DateProviderImpl @Inject constructor(
val daysDifference = ChronoUnit.DAYS.between(today, givenDate)
// Convert java.time.DayOfWeek to DayOfWeekCustom
val dayOfWeekCustom = when (givenDate.dayOfWeek) {
java.time.DayOfWeek.MONDAY -> DayOfWeekCustom.MONDAY
java.time.DayOfWeek.TUESDAY -> DayOfWeekCustom.TUESDAY
java.time.DayOfWeek.WEDNESDAY -> DayOfWeekCustom.WEDNESDAY
java.time.DayOfWeek.THURSDAY -> DayOfWeekCustom.THURSDAY
java.time.DayOfWeek.FRIDAY -> DayOfWeekCustom.FRIDAY
java.time.DayOfWeek.SATURDAY -> DayOfWeekCustom.SATURDAY
java.time.DayOfWeek.SUNDAY -> DayOfWeekCustom.SUNDAY
}
return when (daysDifference) {
0L -> RelativeDate.Today(initialTimeInMillis = initialTimeInMillis)
1L -> RelativeDate.Tomorrow(initialTimeInMillis = initialTimeInMillis)
-1L -> RelativeDate.Yesterday(initialTimeInMillis = initialTimeInMillis)
0L -> RelativeDate.Today(
initialTimeInMillis = initialTimeInMillis,
dayOfWeek = dayOfWeekCustom
)
1L -> RelativeDate.Tomorrow(
initialTimeInMillis = initialTimeInMillis,
dayOfWeek = dayOfWeekCustom
)
-1L -> RelativeDate.Yesterday(
initialTimeInMillis = initialTimeInMillis,
dayOfWeek = dayOfWeekCustom
)
else -> {
val timestampMillis = TimeUnit.SECONDS.toMillis(dateInSeconds)
@ -207,7 +231,8 @@ class DateProviderImpl @Inject constructor(
RelativeDate.Other(
initialTimeInMillis = initialTimeInMillis,
formattedDate = dateString,
formattedTime = timeString
formattedTime = timeString,
dayOfWeek = dayOfWeekCustom
)
}
}