mirror of
https://github.com/null2264/yokai.git
synced 2025-06-21 10:44:42 +00:00
Migrate to some newer date/time APIs
This commit is contained in:
parent
8779b263ab
commit
ab9a26f6bd
18 changed files with 65 additions and 68 deletions
|
@ -45,8 +45,8 @@ import tachiyomi.presentation.widget.util.appWidgetBackgroundRadius
|
|||
import tachiyomi.presentation.widget.util.calculateRowAndColumnCount
|
||||
import uy.kohesive.injekt.Injekt
|
||||
import uy.kohesive.injekt.api.get
|
||||
import java.util.Calendar
|
||||
import java.util.Date
|
||||
import java.time.Instant
|
||||
import java.time.ZonedDateTime
|
||||
|
||||
abstract class BaseUpdatesGridGlanceWidget(
|
||||
private val context: Context = Injekt.get<Application>(),
|
||||
|
@ -89,7 +89,7 @@ abstract class BaseUpdatesGridGlanceWidget(
|
|||
|
||||
val flow = remember {
|
||||
getUpdates
|
||||
.subscribe(false, DateLimit.timeInMillis)
|
||||
.subscribe(false, DateLimit.toEpochMilli())
|
||||
.map { rawData ->
|
||||
rawData.prepareData(rowCount, columnCount)
|
||||
}
|
||||
|
@ -147,10 +147,7 @@ abstract class BaseUpdatesGridGlanceWidget(
|
|||
}
|
||||
|
||||
companion object {
|
||||
val DateLimit: Calendar
|
||||
get() = Calendar.getInstance().apply {
|
||||
time = Date()
|
||||
add(Calendar.MONTH, -3)
|
||||
}
|
||||
val DateLimit: Instant
|
||||
get() = ZonedDateTime.now().minusMonths(3).toInstant()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ class WidgetManager(
|
|||
|
||||
fun Context.init(scope: LifecycleCoroutineScope) {
|
||||
combine(
|
||||
getUpdates.subscribe(read = false, after = BaseUpdatesGridGlanceWidget.DateLimit.timeInMillis),
|
||||
getUpdates.subscribe(read = false, after = BaseUpdatesGridGlanceWidget.DateLimit.toEpochMilli()),
|
||||
securityPreferences.useAuthenticator().changes(),
|
||||
transform = { a, _ -> a },
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue