Sfoglia il codice sorgente

simplified date diff method

sirekanian 3 anni fa
parent
commit
b6c41c0ffb

+ 2 - 1
app/src/main/java/com/sirekanian/spacetime/ui/DateField.kt

@@ -6,6 +6,7 @@ import androidx.compose.ui.text.input.OffsetMapping
 import androidx.compose.ui.text.input.TransformedText
 import com.sirekanian.spacetime.ext.currentDate
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.daysUntil
 
 private val offsetMapping = object : OffsetMapping {
     override fun originalToTransformed(offset: Int): Int =
@@ -34,7 +35,7 @@ class DateField(value: String) {
         getLocalDate() != null
 
     fun getRelativeDays(): Int? =
-        getLocalDate()?.toEpochDays()?.minus(currentDate().toEpochDays())
+        getLocalDate()?.daysUntil(currentDate())
 
     private fun getLocalDate(): LocalDate? {
         if (value.length == 8) {

+ 4 - 4
app/src/main/java/com/sirekanian/spacetime/ui/ImagePageContent.kt

@@ -111,10 +111,10 @@ fun ImagePageContent(
                 Text(
                     text = @OptIn(ExperimentalComposeUiApi::class) when {
                         days == 0 -> stringResource(R.string.duration_today)
-                        days == 1 -> stringResource(R.string.duration_tomorrow)
-                        days == -1 -> stringResource(R.string.duration_yesterday)
-                        days > 0 -> pluralStringResource(R.plurals.duration_in_days, days, days)
-                        else -> pluralStringResource(R.plurals.duration_days, -days, -days)
+                        days == -1 -> stringResource(R.string.duration_tomorrow)
+                        days == 1 -> stringResource(R.string.duration_yesterday)
+                        days < 0 -> pluralStringResource(R.plurals.duration_in_days, -days, -days)
+                        else -> pluralStringResource(R.plurals.duration_days, days, days)
                     },
                     modifier = @OptIn(ExperimentalFoundationApi::class) Modifier
                         .fillMaxWidth()