Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix daylight offsets

Browse Source
This commit is contained in:
Sad Ellie 2023-10-26 17:33:24 +03:00
parent c8670a08c3
commit bd43546141
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/common/src/main/java/com/sadellie/unitto/data/common/TimeZoneUtils.kt
View File

@ -25,19 +25,21 @@ import android.icu.util.ULocale
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import java.time.ZonedDateTime import java.time.ZonedDateTime
import java.util.Date
@RequiresApi(Build.VERSION_CODES.N) @RequiresApi(Build.VERSION_CODES.N)
fun TimeZone.offset(currentTime: ZonedDateTime): ZonedDateTime { fun TimeZone.offset(currentTime: ZonedDateTime): ZonedDateTime {
val offsetSeconds = currentTime.offset.totalSeconds.toLong() val offsetSeconds = currentTime.offset.totalSeconds.toLong()
val currentTimeWithoutOffset = currentTime.minusSeconds(offsetSeconds) val currentTimeWithoutOffset = currentTime.minusSeconds(offsetSeconds)
val dstOffset: Long = if (inDaylightTime(Date.from(currentTime.toInstant()))) (dstSavings / 1000L) else 0L
return currentTimeWithoutOffset.plusSeconds(this.rawOffset / 1000L) return currentTimeWithoutOffset.plusSeconds(this.rawOffset / 1000L).plusSeconds(dstOffset)
} }
@RequiresApi(Build.VERSION_CODES.N) @RequiresApi(Build.VERSION_CODES.N)
fun TimeZone.regionName( fun TimeZone.regionName(
timeZoneNames: TimeZoneNames, timeZoneNames: TimeZoneNames,
localeDisplayNames: LocaleDisplayNames localeDisplayNames: LocaleDisplayNames,
): String { ): String {
val location = timeZoneNames.getExemplarLocationName(this.id) ?: return fallbackRegion val location = timeZoneNames.getExemplarLocationName(this.id) ?: return fallbackRegion
val region = localeDisplayNames.regionDisplayName(TimeZone.getRegion(id)) ?: return fallbackRegion val region = localeDisplayNames.regionDisplayName(TimeZone.getRegion(id)) ?: return fallbackRegion