Use Voyager on Biometric Times screen

app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt

@@ -1,33 +1,29 @@
 package eu.kanade.presentation.category
 
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import eu.kanade.presentation.category.components.CategoryDeleteDialog
 import eu.kanade.presentation.category.components.CategoryFloatingActionButton
 import eu.kanade.presentation.category.components.biometric.BiometricTimesContent
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.EmptyScreen
-import eu.kanade.presentation.components.LoadingScreen
 import eu.kanade.presentation.components.Scaffold
 import eu.kanade.presentation.util.horizontalPadding
 import eu.kanade.presentation.util.plus
 import eu.kanade.presentation.util.topPaddingValues
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesPresenter
-import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesPresenter.Dialog
-import eu.kanade.tachiyomi.util.system.toast
-import kotlinx.coroutines.flow.collectLatest
-import kotlin.time.Duration
+import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreenState
+import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem
 
 @Composable
 fun BiometricTimesScreen(
-    presenter: BiometricTimesPresenter,
+    state: BiometricTimesScreenState.Success,
+    onClickCreate: () -> Unit,
+    onClickDelete: (TimeRangeItem) -> Unit,
     navigateUp: () -> Unit,
-    openCreateDialog: (Duration?) -> Unit,
 ) {
     val lazyListState = rememberLazyListState()
     Scaffold(
@@ -41,51 +37,23 @@ fun BiometricTimesScreen(
         floatingActionButton = {
             CategoryFloatingActionButton(
                 lazyListState = lazyListState,
-                onCreate = { presenter.dialog = Dialog.Create },
+                onCreate = onClickCreate,
             )
         },
     ) { paddingValues ->
-        val context = LocalContext.current
-        when {
-            presenter.isLoading -> LoadingScreen()
-            presenter.isEmpty -> EmptyScreen(textResource = R.string.biometric_lock_times_empty)
-            else -> {
-                BiometricTimesContent(
-                    state = presenter,
-                    lazyListState = lazyListState,
-                    paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding),
-                )
-            }
+        if (state.isEmpty) {
+            EmptyScreen(
+                textResource = R.string.biometric_lock_times_empty,
+                modifier = Modifier.padding(paddingValues),
+            )
+            return@Scaffold
         }
 
-        val onDismissRequest = { presenter.dialog = null }
-        when (val dialog = presenter.dialog) {
-            Dialog.Create -> {
-                LaunchedEffect(Unit) {
-                    openCreateDialog(null)
-                }
-            }
-            is Dialog.Delete -> {
-                CategoryDeleteDialog(
-                    onDismissRequest = onDismissRequest,
-                    onDelete = { presenter.deleteTimeRanges(dialog.timeRange) },
-                    title = stringResource(R.string.delete_time_range),
-                    text = stringResource(R.string.delete_time_range_confirmation, dialog.timeRange.formattedString),
-                )
-            }
-            else -> {}
-        }
-        LaunchedEffect(Unit) {
-            presenter.events.collectLatest { event ->
-                when (event) {
-                    is BiometricTimesPresenter.Event.TimeConflicts -> {
-                        context.toast(R.string.biometric_lock_time_conflicts)
-                    }
-                    is BiometricTimesPresenter.Event.InternalError -> {
-                        context.toast(R.string.internal_error)
-                    }
-                }
-            }
-        }
+        BiometricTimesContent(
+            timeRanges = state.timeRanges,
+            lazyListState = lazyListState,
+            paddingValues = paddingValues + topPaddingValues + PaddingValues(horizontal = horizontalPadding),
+            onClickDelete = onClickDelete,
+        )
     }
 }

app/src/main/java/eu/kanade/presentation/category/BiometricTimesState.kt

@@ -1,28 +0,0 @@
-package eu.kanade.presentation.category
-
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesPresenter
-import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem
-
-@Stable
-interface BiometricTimesState {
-    val isLoading: Boolean
-    var dialog: BiometricTimesPresenter.Dialog?
-    val timeRanges: List<TimeRangeItem>
-    val isEmpty: Boolean
-}
-
-fun BiometricTimesState(): BiometricTimesState {
-    return BiometricTimesStateImpl()
-}
-
-class BiometricTimesStateImpl : BiometricTimesState {
-    override var isLoading: Boolean by mutableStateOf(true)
-    override var dialog: BiometricTimesPresenter.Dialog? by mutableStateOf(null)
-    override var timeRanges: List<TimeRangeItem> by mutableStateOf(emptyList())
-    override val isEmpty: Boolean by derivedStateOf { timeRanges.isEmpty() }
-}

app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt

@@ -7,27 +7,26 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import eu.kanade.presentation.category.BiometricTimesState
 import eu.kanade.presentation.components.LazyColumn
-import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesPresenter
+import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem
 
 @Composable
 fun BiometricTimesContent(
-    state: BiometricTimesState,
+    timeRanges: List<TimeRangeItem>,
     lazyListState: LazyListState,
     paddingValues: PaddingValues,
+    onClickDelete: (TimeRangeItem) -> Unit,
 ) {
-    val timeRanges = state.timeRanges
     LazyColumn(
         state = lazyListState,
         contentPadding = paddingValues,
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
-        items(timeRanges) { timeRange ->
+        items(timeRanges, key = { it.formattedString }) { timeRange ->
             BiometricTimesListItem(
                 modifier = Modifier.animateItemPlacement(),
                 timeRange = timeRange,
-                onDelete = { state.dialog = BiometricTimesPresenter.Dialog.Delete(timeRange) },
+                onDelete = { onClickDelete(timeRange) },
             )
         }
     }