Migrate Migrate Manga screen to Compose (#7045)

* Migrate Migrate Manga screen to Compose * Changes from review comments
2025-11-12 12:08:56 +01:00 · 2022-04-30 15:37:10 +02:00
parent 6ef6eab994
commit bf6d59cd21
16 changed files with 258 additions and 177 deletions
--- a/app/src/main/java/eu/kanade/presentation/manga/components/BaseMangaListItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/BaseMangaListItem.kt
@@ -0,0 +1,65 @@
+package eu.kanade.presentation.manga.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import eu.kanade.domain.manga.model.Manga
+import eu.kanade.presentation.components.MangaCover
+import eu.kanade.presentation.util.horizontalPadding
+
+@Composable
+fun BaseMangaListItem(
+    modifier: Modifier = Modifier,
+    manga: Manga,
+    onClickItem: () -> Unit = {},
+    onClickCover: () -> Unit = onClickItem,
+    cover: @Composable RowScope.() -> Unit = { defaultCover(manga, onClickCover) },
+    actions: @Composable RowScope.() -> Unit = {},
+    content: @Composable RowScope.() -> Unit = { defaultContent(manga) },
+) {
+    Row(
+        modifier = modifier
+            .clickable(onClick = onClickItem)
+            .height(56.dp)
+            .padding(horizontal = horizontalPadding),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        cover()
+        content()
+        actions()
+    }
+}
+
+private val defaultCover: @Composable RowScope.(Manga, () -> Unit) -> Unit = { manga, onClick ->
+    MangaCover.Square(
+        modifier = Modifier
+            .padding(vertical = 8.dp)
+            .clickable(onClick = onClick)
+            .fillMaxHeight(),
+        data = manga.thumbnailUrl
+    )
+}
+
+private val defaultContent: @Composable RowScope.(Manga) -> Unit = {
+    Box(modifier = Modifier.weight(1f)) {
+        Text(
+            text = it.title,
+            modifier = Modifier
+                .padding(start = horizontalPadding),
+            overflow = TextOverflow.Ellipsis,
+            maxLines = 1,
+            style = MaterialTheme.typography.bodyMedium
+        )
+    }
+}
--- a/app/src/main/java/eu/kanade/presentation/source/MigrateMangaScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/source/MigrateMangaScreen.kt
@@ -0,0 +1,84 @@
+package eu.kanade.presentation.source
+
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import eu.kanade.domain.manga.model.Manga
+import eu.kanade.presentation.components.EmptyScreen
+import eu.kanade.presentation.components.LoadingScreen
+import eu.kanade.presentation.manga.components.BaseMangaListItem
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrateMangaState
+import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrationMangaPresenter
+
+@Composable
+fun MigrateMangaScreen(
+    nestedScrollInterop: NestedScrollConnection,
+    presenter: MigrationMangaPresenter,
+    onClickItem: (Manga) -> Unit,
+    onClickCover: (Manga) -> Unit
+) {
+    val state by presenter.state.collectAsState()
+
+    when (state) {
+        MigrateMangaState.Loading -> LoadingScreen()
+        is MigrateMangaState.Error -> Text(text = (state as MigrateMangaState.Error).error.message!!)
+        is MigrateMangaState.Success -> {
+            MigrateMangaContent(
+                nestedScrollInterop = nestedScrollInterop,
+                list = (state as MigrateMangaState.Success).list,
+                onClickItem = onClickItem,
+                onClickCover = onClickCover,
+            )
+        }
+    }
+}
+
+@Composable
+fun MigrateMangaContent(
+    nestedScrollInterop: NestedScrollConnection,
+    list: List<Manga>,
+    onClickItem: (Manga) -> Unit,
+    onClickCover: (Manga) -> Unit
+) {
+    if (list.isEmpty()) {
+        EmptyScreen(textResource = R.string.migrate_empty_screen)
+        return
+    }
+    LazyColumn(
+        modifier = Modifier.nestedScroll(nestedScrollInterop),
+        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
+    ) {
+        items(list) { manga ->
+            MigrateMangaItem(
+                manga = manga,
+                onClickItem = onClickItem,
+                onClickCover = onClickCover
+            )
+        }
+    }
+}
+
+@Composable
+fun MigrateMangaItem(
+    modifier: Modifier = Modifier,
+    manga: Manga,
+    onClickItem: (Manga) -> Unit,
+    onClickCover: (Manga) -> Unit
+) {
+    BaseMangaListItem(
+        modifier = modifier,
+        manga = manga,
+        onClickItem = { onClickItem(manga) },
+        onClickCover = { onClickCover(manga) }
+    )
+}