Move to official duration extensions

This commit is contained in:
Jobobby04
2021-12-25 12:05:06 -05:00
parent 8b8df62ff3
commit 999e944c34
11 changed files with 19 additions and 50 deletions
+1 -1
View File
@@ -57,7 +57,6 @@ import exh.log.XLogLogcatLogger
import exh.log.xLogD
import exh.log.xLogE
import exh.syDebugVersion
import exh.util.days
import io.realm.Realm
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
@@ -71,6 +70,7 @@ import java.io.File
import java.security.Security
import java.text.SimpleDateFormat
import java.util.Locale
import kotlin.time.Duration.Companion.days
open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
@@ -22,9 +22,9 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.shrinkOnScroll
import exh.util.hours
import exh.util.minutes
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
import kotlin.time.ExperimentalTime
/**
@@ -2,11 +2,11 @@ package eu.kanade.tachiyomi.ui.category.biometric
import android.content.Context
import android.text.format.DateFormat
import exh.util.hours
import exh.util.minutes
import java.util.Date
import java.util.SimpleTimeZone
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
data class TimeRange(private val startTime: Duration, private val endTime: Duration) {
override fun toString(): String {
@@ -52,8 +52,6 @@ import exh.source.isEhBasedManga
import exh.source.mangaDexSourceIds
import exh.source.nHentaiSourceIds
import exh.ui.LoaderManager
import exh.util.milliseconds
import exh.util.seconds
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.drop
@@ -69,6 +67,8 @@ import rx.android.schedulers.AndroidSchedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.concurrent.TimeUnit
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds
class LibraryController(
bundle: Bundle? = null,
@@ -120,6 +120,7 @@ import uy.kohesive.injekt.injectLazy
import java.io.File
import kotlin.math.abs
import kotlin.math.max
import kotlin.time.Duration.Companion.seconds
/**
* Activity containing the reader of Tachiyomi. This activity is mostly a container of the
@@ -7,14 +7,14 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.ui.category.biometric.TimeRange
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
import eu.kanade.tachiyomi.util.view.setSecureScreen
import exh.util.hours
import exh.util.minutes
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import uy.kohesive.injekt.injectLazy
import java.util.Calendar
import java.util.Date
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
class SecureActivityDelegate(private val activity: FragmentActivity) {
@@ -48,13 +48,8 @@ import exh.metadata.metadata.base.getFlatMetadataForManga
import exh.source.isEhBasedManga
import exh.uconfig.WarnConfigureDialogController
import exh.ui.login.EhLoginActivity
import exh.util.days
import exh.util.executeOnIO
import exh.util.hours
import exh.util.milliseconds
import exh.util.minutes
import exh.util.nullIfBlank
import exh.util.seconds
import exh.util.trans
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.launchIn
@@ -66,6 +61,11 @@ import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import uy.kohesive.injekt.injectLazy
import kotlin.time.Duration
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds
/**
* EH Settings fragment
@@ -584,7 +584,7 @@ class SettingsEhController : SettingsController() {
period.inWholeMilliseconds.let {
relativeTime.milliseconds = it
}
period = 0.milliseconds
period = Duration.ZERO
}
}
}