From 6d46283aee2ee1b58b2e57e582e750a1f3d7fe7b Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 22 Oct 2022 19:57:55 -0400 Subject: [PATCH] Use kotlin.time extensions in some more places (cherry picked from commit 5c868d784679b55e413366c5d4bdea75253bf8f4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt --- .../presentation/category/components/CategoryDialogs.kt | 5 +++-- .../presentation/components/MangaBottomActionMenu.kt | 5 +++-- .../presentation/library/components/LibraryContent.kt | 3 ++- .../kanade/presentation/more/settings/PreferenceScreen.kt | 3 ++- .../more/settings/widget/BasePreferenceWidget.kt | 3 ++- .../java/eu/kanade/presentation/updates/UpdatesScreen.kt | 3 ++- .../eu/kanade/tachiyomi/data/download/DownloadCache.kt | 7 ++++--- .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 3 ++- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt index 994fbbbf9..9bdc7ea70 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.res.stringResource import eu.kanade.tachiyomi.R import kotlinx.coroutines.delay +import kotlin.time.Duration.Companion.seconds @Composable fun CategoryCreateDialog( @@ -71,7 +72,7 @@ fun CategoryCreateDialog( LaunchedEffect(focusRequester) { // TODO: https://issuetracker.google.com/issues/204502668 - delay(100) + delay(0.1.seconds) focusRequester.requestFocus() } } @@ -118,7 +119,7 @@ fun CategoryRenameDialog( LaunchedEffect(focusRequester) { // TODO: https://issuetracker.google.com/issues/204502668 - delay(100) + delay(0.1.seconds) focusRequester.requestFocus() } } diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt index 9dbbcd6fd..36dc5eed8 100644 --- a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt @@ -60,6 +60,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch +import kotlin.time.Duration.Companion.seconds @Composable fun MangaBottomActionMenu( @@ -92,7 +93,7 @@ fun MangaBottomActionMenu( (0 until 7).forEach { i -> confirm[i] = i == toConfirmIndex } resetJob?.cancel() resetJob = scope.launch { - delay(1000) + delay(1.seconds) if (isActive) confirm[toConfirmIndex] = false } } @@ -244,7 +245,7 @@ fun LibraryBottomActionMenu( (0 until 5).forEach { i -> confirm[i] = i == toConfirmIndex } resetJob?.cancel() resetJob = scope.launch { - delay(1000) + delay(1.seconds) if (isActive) confirm[toConfirmIndex] = false } } diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt index 57162c955..002787719 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt @@ -27,6 +27,7 @@ import eu.kanade.presentation.library.LibraryState import eu.kanade.tachiyomi.ui.library.LibraryItem import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import kotlin.time.Duration.Companion.seconds @Composable fun LibraryContent( @@ -112,7 +113,7 @@ fun LibraryContent( scope.launch { // Fake refresh status but hide it after a second as it's a long running task isRefreshing = true - delay(1000) + delay(1.seconds) isRefreshing = false } }, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt index 0cce2ed91..46466f6b8 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt @@ -15,6 +15,7 @@ import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.settings.screen.SearchableSettings import eu.kanade.presentation.more.settings.widget.PreferenceGroupHeader import kotlinx.coroutines.delay +import kotlin.time.Duration.Companion.seconds /** * Preference Screen composable which contains a list of [Preference] items @@ -33,7 +34,7 @@ fun PreferenceScreen( LaunchedEffect(Unit) { val i = items.findHighlightedIndex(highlightKey) if (i >= 0) { - delay(500) + delay(0.5.seconds) state.animateScrollToItem(i) } SearchableSettings.highlightKey = null diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt index 37b6d8d9c..b7ffe63c3 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import eu.kanade.presentation.more.settings.LocalPreferenceHighlighted import kotlinx.coroutines.delay +import kotlin.time.Duration.Companion.seconds @Composable internal fun BasePreferenceWidget( @@ -89,7 +90,7 @@ internal fun Modifier.highlightBackground(highlighted: Boolean): Modifier = comp LaunchedEffect(Unit) { if (highlighted) { highlightFlag = true - delay(3000) + delay(3.seconds) highlightFlag = false } } diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt index 3d3413783..2a9435693 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt @@ -48,6 +48,7 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import java.util.Date +import kotlin.time.Duration.Companion.seconds @Composable fun UpdateScreen( @@ -135,7 +136,7 @@ private fun UpdateScreenContent( scope.launch { // Fake refresh status but hide it after a second as it's a long running task isRefreshing = true - delay(1000) + delay(1.seconds) isRefreshing = false } }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt index 6c3cf9ac3..2b886ebdc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt @@ -25,6 +25,7 @@ import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit +import kotlin.time.Duration.Companion.seconds /** * Cache where we dump the downloads directory from the filesystem. This class is needed because @@ -258,13 +259,13 @@ class DownloadCache( var sources = getSources() // Try to wait until extensions and sources have loaded - withTimeout(30000L) { + withTimeout(30.seconds) { while (!extensionManager.isInitialized) { - delay(2000L) + delay(2.seconds) } while (sources.isEmpty()) { - delay(2000L) + delay(2.seconds) sources = getSources() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index b4fd30260..d341e9a06 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -87,6 +87,7 @@ import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy import java.util.LinkedList +import kotlin.time.Duration.Companion.seconds class MainActivity : BaseActivity() { @@ -609,7 +610,7 @@ class MainActivity : BaseActivity() { private suspend fun resetExitConfirmation() { isConfirmingExit = true val toast = toast(R.string.confirm_exit, Toast.LENGTH_LONG) - delay(2000) + delay(2.seconds) toast.cancel() isConfirmingExit = false }