null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Don't show date twice

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-12 11:14:13 +07:00
parent 9857ff943e
commit 3b42210f10
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/debug/WorkerInfoPresenter.kt
View file

@ -6,7 +6,7 @@ import androidx.work.WorkInfo
import androidx.work.WorkManager import androidx.work.WorkManager
import androidx.work.WorkQuery import androidx.work.WorkQuery
import eu.kanade.tachiyomi.ui.base.presenter.BaseCoroutinePresenter import eu.kanade.tachiyomi.ui.base.presenter.BaseCoroutinePresenter
import eu.kanade.tachiyomi.util.lang.toDateTimeTimestampString import eu.kanade.tachiyomi.util.lang.toDateTimestampString
import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
@ -68,8 +68,8 @@ class WorkerInfoPresenter : BaseCoroutinePresenter<WorkerInfoController>() {
Instant.ofEpochMilli(workInfo.nextScheduleTimeMillis), Instant.ofEpochMilli(workInfo.nextScheduleTimeMillis),
ZoneId.systemDefault(), ZoneId.systemDefault(),
) )
.toDateTimeTimestampString(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)) .toDateTimestampString(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
appendLine("Next scheduled run: $timestamp",) appendLine("Next scheduled run: $timestamp")
appendLine("Attempt #${workInfo.runAttemptCount + 1}") appendLine("Attempt #${workInfo.runAttemptCount + 1}")
} }
appendLine() appendLine()

4
app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
View file

@ -6,9 +6,9 @@ import java.time.format.DateTimeFormatter
import java.time.format.FormatStyle import java.time.format.FormatStyle
import java.util.* import java.util.*
fun LocalDateTime.toDateTimeTimestampString(dateTimeFormatter: DateTimeFormatter): String { fun LocalDateTime.toDateTimestampString(dateTimeFormatter: DateTimeFormatter): String {
val date = dateTimeFormatter.format(this) val date = dateTimeFormatter.format(this)
val time = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(this) val time = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(this)
return "$date $time" return "$date $time"
} }