Move more components

2023-02-18 17:04:32 -05:00
parent 58a0add4f6
commit dd71c76a8f
20 changed files with 34 additions and 35 deletions
--- a/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt
@@ -0,0 +1,88 @@
+package eu.kanade.presentation.library
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import eu.kanade.core.prefs.CheckboxState
+import eu.kanade.tachiyomi.R
+
+@Composable
+fun DeleteLibraryMangaDialog(
+    containsLocalManga: Boolean,
+    onDismissRequest: () -> Unit,
+    onConfirm: (Boolean, Boolean) -> Unit,
+) {
+    var list by remember {
+        mutableStateOf(
+            buildList<CheckboxState.State<Int>> {
+                add(CheckboxState.State.None(R.string.manga_from_library))
+                if (!containsLocalManga) {
+                    add(CheckboxState.State.None(R.string.downloaded_chapters))
+                }
+            },
+        )
+    }
+    AlertDialog(
+        onDismissRequest = onDismissRequest,
+        dismissButton = {
+            TextButton(onClick = onDismissRequest) {
+                Text(text = stringResource(R.string.action_cancel))
+            }
+        },
+        confirmButton = {
+            TextButton(
+                enabled = list.any { it.isChecked },
+                onClick = {
+                    onDismissRequest()
+                    onConfirm(
+                        list[0].isChecked,
+                        list.getOrElse(1) { CheckboxState.State.None(0) }.isChecked,
+                    )
+                },
+            ) {
+                Text(text = stringResource(android.R.string.ok))
+            }
+        },
+        title = {
+            Text(text = stringResource(R.string.action_remove))
+        },
+        text = {
+            Column {
+                list.forEach { state ->
+                    val onCheck = {
+                        val index = list.indexOf(state)
+                        val mutableList = list.toMutableList()
+                        mutableList[index] = state.next() as CheckboxState.State<Int>
+                        list = mutableList.toList()
+                    }
+
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable { onCheck() },
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Checkbox(
+                            checked = state.isChecked,
+                            onCheckedChange = { onCheck() },
+                        )
+                        Text(text = stringResource(state.value))
+                    }
+                }
+            }
+        },
+    )
+}
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
@@ -15,7 +15,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
 import eu.kanade.core.prefs.PreferenceMutableState
-import eu.kanade.presentation.components.rememberPagerState
 import eu.kanade.tachiyomi.ui.library.LibraryItem
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -23,6 +22,7 @@ import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.library.model.LibraryManga
 import tachiyomi.presentation.core.components.material.PullRefresh
+import tachiyomi.presentation.core.components.rememberPagerState
 import kotlin.time.Duration.Companion.seconds

@Composable
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt
@@ -18,12 +18,12 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.unit.dp
 import eu.kanade.core.prefs.PreferenceMutableState
 import eu.kanade.presentation.components.EmptyScreen
-import eu.kanade.presentation.components.HorizontalPager
-import eu.kanade.presentation.components.PagerState
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.library.LibraryItem
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.library.model.LibraryManga
+import tachiyomi.presentation.core.components.HorizontalPager
+import tachiyomi.presentation.core.components.PagerState
 import tachiyomi.presentation.core.util.plus

@Composable
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
@@ -23,9 +23,9 @@ import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.OverflowMenu
 import eu.kanade.presentation.components.SearchToolbar
-import eu.kanade.presentation.theme.active
 import eu.kanade.tachiyomi.R
 import tachiyomi.presentation.core.components.Pill
+import tachiyomi.presentation.core.theme.active

@Composable
 fun LibraryToolbar(