MajorTanya
e7786bd16f
A user in #2777 was using the ComicInfo.xml Year/Month/Day fields to indicate date of publication for some American comics, which often predate the UNIX Epoch of 1970. They were seeing "N/A" displays because this line of code discarded date information for any time before Jan 1st, 1970. The `toRelativeString` extension function used in the other `relativeDateText` function already accounts for very distant dates (anything >7 days away turns into full date, not relative, regardless of setting, though disabling the relative timestamp setting circumvents this with the same result). Removing this line should not cause any issues as it is purely a display difference and the use case of backdating comics to pre-1970 is worth it in my opinion. (cherry picked from commit 7a1c8a1b61e07d2e1a402b5daf0e7c04c232f655) # Conflicts: # CHANGELOG.md
46 lines
1.3 KiB
Kotlin
46 lines
1.3 KiB
Kotlin
package eu.kanade.presentation.components
|
|
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.ui.platform.LocalContext
|
|
import eu.kanade.domain.ui.UiPreferences
|
|
import eu.kanade.tachiyomi.util.lang.toRelativeString
|
|
import tachiyomi.i18n.MR
|
|
import tachiyomi.presentation.core.i18n.stringResource
|
|
import uy.kohesive.injekt.Injekt
|
|
import uy.kohesive.injekt.api.get
|
|
import java.time.Instant
|
|
import java.time.LocalDate
|
|
import java.time.ZoneId
|
|
|
|
@Composable
|
|
fun relativeDateText(
|
|
dateEpochMillis: Long,
|
|
): String {
|
|
return relativeDateText(
|
|
localDate = LocalDate.ofInstant(
|
|
Instant.ofEpochMilli(dateEpochMillis),
|
|
ZoneId.systemDefault(),
|
|
)
|
|
.takeIf { dateEpochMillis != 0L },
|
|
)
|
|
}
|
|
|
|
@Composable
|
|
fun relativeDateText(
|
|
localDate: LocalDate?,
|
|
): String {
|
|
val context = LocalContext.current
|
|
|
|
val preferences = remember { Injekt.get<UiPreferences>() }
|
|
val relativeTime = remember { preferences.relativeTime().get() }
|
|
val dateFormat = remember { UiPreferences.dateFormat(preferences.dateFormat().get()) }
|
|
|
|
return localDate?.toRelativeString(
|
|
context = context,
|
|
relative = relativeTime,
|
|
dateFormat = dateFormat,
|
|
)
|
|
?: stringResource(MR.strings.not_applicable)
|
|
}
|