Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 17:11:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak relative date function (#6249)

Browse Source 
* Tweak relative date function

* Cleanup
This commit is contained in:
Andreas 2021-11-19 16:05:39 +01:00 committed by GitHub
parent 845e061382
commit f229a5e2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
View File

@ -6,7 +6,6 @@ import java.text.DateFormat
import java.util.Calendar import java.util.Calendar
import java.util.Date import java.util.Date
import java.util.TimeZone import java.util.TimeZone
import kotlin.math.floor
fun Date.toDateTimestampString(dateFormatter: DateFormat): String { fun Date.toDateTimestampString(dateFormatter: DateFormat): String {
val date = dateFormatter.format(this) val date = dateFormatter.format(this)
@ -98,7 +97,7 @@ fun Long.toLocalCalendar(): Calendar? {
} }
} }
private const val MILLISECONDS_IN_DAY = 86_400_000.0 private const val MILLISECONDS_IN_DAY = 86_400_000L
fun Date.toRelativeString( fun Date.toRelativeString(
context: Context, context: Context,
@ -109,8 +108,8 @@ fun Date.toRelativeString(
return dateFormat.format(this) return dateFormat.format(this)
} }
val now = Date() val now = Date()
val difference = now.time - this.time val difference = now.timeWithOffset.floorNearest(MILLISECONDS_IN_DAY) - this.timeWithOffset.floorNearest(MILLISECONDS_IN_DAY)
val days = floor(difference / MILLISECONDS_IN_DAY).toInt() val days = difference.floorDiv(MILLISECONDS_IN_DAY).toInt()
return when { return when {
difference < 0 -> context.getString(R.string.recently) difference < 0 -> context.getString(R.string.recently)
difference < MILLISECONDS_IN_DAY -> context.getString(R.string.relative_time_today) difference < MILLISECONDS_IN_DAY -> context.getString(R.string.relative_time_today)
@ -122,3 +121,15 @@ fun Date.toRelativeString(
else -> dateFormat.format(this) else -> dateFormat.format(this)
} }
} }
private val Date.timeWithOffset: Long
get() {
return Calendar.getInstance().run {
time = this@timeWithOffset
this@timeWithOffset.time + timeZone.rawOffset
}
}
fun Long.floorNearest(to: Long): Long {
return this.floorDiv(to) * to
}