prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to Java 8

Browse Source
This commit is contained in:
Isira Seneviratne
2023-12-29 05:06:35 +05:30
committed by Koitharu
parent 004109a6bc
commit 3f2e32dcc2
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -48,11 +48,11 @@ android {
} }
compileOptions { compileOptions {
coreLibraryDesugaringEnabled true coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_17 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions { kotlinOptions {
jvmTarget = JavaVersion.VERSION_17 jvmTarget = JavaVersion.VERSION_1_8.toString()
freeCompilerArgs += [ freeCompilerArgs += [
'-opt-in=kotlin.ExperimentalStdlibApi', '-opt-in=kotlin.ExperimentalStdlibApi',
'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi', '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',

4
app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/DateTimeAgo.kt
View File

@@ -75,7 +75,7 @@ sealed class DateTimeAgo {
data class Absolute(private val date: LocalDate) : DateTimeAgo() { data class Absolute(private val date: LocalDate) : DateTimeAgo() {
override fun format(resources: Resources): String { override fun format(resources: Resources): String {
return if (date == LocalDate.EPOCH) { return if (date == EPOCH_DATE) {
resources.getString(R.string.unknown) resources.getString(R.string.unknown)
} else { } else {
date.format(formatter) date.format(formatter)
@@ -85,6 +85,8 @@ sealed class DateTimeAgo {
override fun toString() = "abs_${date.toEpochDay()}" override fun toString() = "abs_${date.toEpochDay()}"
companion object { companion object {
// TODO: Use Java 9's LocalDate.EPOCH.
private val EPOCH_DATE = LocalDate.of(1970, 1, 1)
private val formatter = DateTimeFormatter.ofPattern("d MMMM") private val formatter = DateTimeFormatter.ofPattern("d MMMM")
} }
} }

4
app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Date.kt
View File

@@ -3,11 +3,13 @@ package org.koitharu.kotatsu.core.util.ext
import org.koitharu.kotatsu.core.ui.model.DateTimeAgo import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
import java.time.Instant import java.time.Instant
import java.time.LocalDate import java.time.LocalDate
import java.time.LocalDateTime
import java.time.ZoneId import java.time.ZoneId
import java.time.temporal.ChronoUnit import java.time.temporal.ChronoUnit
fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo { fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo {
val localDate = LocalDate.ofInstant(instant, ZoneId.systemDefault()) // TODO: Use Java 9's LocalDate.ofInstant().
val localDate = LocalDateTime.ofInstant(instant, ZoneId.systemDefault()).toLocalDate()
val now = LocalDate.now() val now = LocalDate.now()
val diffDays = localDate.until(now, ChronoUnit.DAYS) val diffDays = localDate.until(now, ChronoUnit.DAYS)