Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timezone issues #32

Merged
merged 1 commit into from
Oct 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ versions-ben-manes = "0.44.0"
viewModel-ktx = "2.6.1"
viewModel-compose = "2.6.1"
lifecycle-runtime-compose = "2.6.1"
kotlinx-serialization = "1.5.1"
org-robolectric = "4.9"
sql-delight = "2.0.0"
rss-parser = "6.0.2"
kotlinx-date-time = "0.4.0"
accompanist = "0.28.0"
jsoup = "1.15.3"
triplet-play = "3.8.1"
Expand Down Expand Up @@ -77,7 +75,6 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
slf4j-nop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4jNop" }
touchlab-kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
touchlab-kermit-simple = { module = "co.touchlab:kermit-simple", version.ref = "kermit" }
Expand All @@ -91,7 +88,6 @@ sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sq
sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sql-delight" }
sqldelight-primitive-adapter = { module = "app.cash.sqldelight:primitive-adapters", version.ref = "sql-delight" }
com-prof18-rss-parser = { module = "com.prof18.rssparser:rssparser", version.ref = "rss-parser" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-date-time" }
accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
decompose = { module = "com.arkivanov.decompose:decompose", version.ref = "decompose" }
Expand Down
3 changes: 1 addition & 2 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ kotlin {
implementation(libs.kotlinx.coroutines.core)
implementation(libs.com.prof18.rss.parser)
implementation(libs.multiplatform.settings)
implementation(libs.kotlin.test)
implementation(libs.kotlin.test.junit)

api(project(":core"))
api(project(":i18n"))
Expand All @@ -82,6 +80,7 @@ kotlin {
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
implementation(libs.kotlin.test.junit)
implementation(libs.kotlinx.coroutines.test)
implementation(libs.touchlab.kermit.test)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package com.prof18.feedflow.domain

import co.touchlab.kermit.Logger
import java.time.DateTimeException
import java.time.Instant
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.time.format.DateTimeFormatterBuilder
import java.util.Locale

internal class JvmAndroidDateFormatter(
private val logger: Logger,
Expand All @@ -28,12 +31,26 @@ internal class JvmAndroidDateFormatter(
"[dd MMM yyyy HH:mm:ss Z]",
),
)
val dateTimeFormatter = dateTimeFormatterBuilder.toFormatter()

val dateTimeFormatter = dateTimeFormatterBuilder.toFormatter(Locale.ENGLISH)

return try {
LocalDateTime.parse(dateString, dateTimeFormatter)
val temporalAccessor = dateTimeFormatter.parse(dateString)
DateParsingResult.Parsed(
date = LocalDateTime.parse(dateString, dateTimeFormatter),
date = ZonedDateTime.from(temporalAccessor).withZoneSameInstant(ZoneId.systemDefault()),
)
} catch (e: DateTimeException) {
try {
val localDateTime = LocalDateTime.parse(dateString, dateTimeFormatter)
DateParsingResult.Parsed(
date = localDateTime.atZone(ZoneId.systemDefault()),
)
} catch (e: Throwable) {
DateParsingResult.ParsingError(
exception = e,
message = "Error while trying to format the date with dateFormatter. Date: $dateString",
)
}
} catch (e: Throwable) {
DateParsingResult.ParsingError(
exception = e,
Expand All @@ -46,7 +63,7 @@ internal class JvmAndroidDateFormatter(
override fun getDateMillisFromString(dateString: String): Long? {
val parseResult = parseDateString(dateString)
return if (parseResult is DateParsingResult.Parsed) {
parseResult.date.atZone(ZoneId.systemDefault()).toEpochSecond() * 1000
parseResult.date.toEpochSecond() * 1000
} else {
val exception = (parseResult as DateParsingResult.ParsingError).exception
logger.e(exception) {
Expand All @@ -58,25 +75,29 @@ internal class JvmAndroidDateFormatter(

override fun formatDate(millis: Long): String {
val instant = Instant.ofEpochMilli(millis)
val dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault())
val today = LocalDateTime.now(ZoneId.systemDefault())
val isToday = dateTime.toLocalDate() == today.toLocalDate()
val userTimeZone = ZoneId.systemDefault()
val zonedDateTime = instant.atZone(userTimeZone)

val today = ZonedDateTime.now()
val isToday = zonedDateTime.toLocalDate() == today.toLocalDate()
val pattern = if (isToday) {
"HH:mm"
} else {
"dd/MM - HH:mm"
}
val formatter = DateTimeFormatter.ofPattern(pattern)
return formatter.format(dateTime)

val formatter = DateTimeFormatter
.ofPattern(pattern)
.withZone(zonedDateTime.zone)
return formatter.format(zonedDateTime)
}

override fun currentTimeMillis(): Long =
System.currentTimeMillis()

private sealed class DateParsingResult {
data class Parsed(
val date: LocalDateTime,
val date: ZonedDateTime,
) : DateParsingResult()

data class ParsingError(
Expand Down