change navigation handling from reader screen

Author: Shaur

app/build.gradle

@@ -95,6 +95,8 @@ dependencies {
     //Image loader
     implementation "io.coil-kt:coil-compose:2.7.0"
 
+    implementation "com.google.accompanist:accompanist-drawablepainter:0.32.0"
+
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 
     //For REST api

app/src/main/java/com/home/reader/ui/catalogue/screen/CatalogueScreen.kt

@@ -18,7 +18,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.LaunchedEffect
-import com.home.reader.api.dto.SeriesDto
+import androidx.compose.runtime.saveable.rememberSaveable
 import com.home.reader.ui.AppViewModelProvider
 import com.home.reader.ui.catalogue.component.CatalogueIssueItem
 import com.home.reader.ui.catalogue.component.CatalogueSeriesItem
@@ -35,33 +35,36 @@ fun CatalogueScreen(
 
     val seriesState = viewModel.seriesState.collectAsLazyPagingItems()
     val issuesState by remember { viewModel.issuesState }
-    var selectedSeries by remember { mutableStateOf<SeriesDto?>(null) }
+    var selectedSeriesId by rememberSaveable { mutableStateOf<Long?>(null) }
+    var selectedSeriesName by rememberSaveable { mutableStateOf<String?>(null) }
     val downloadProgressState by remember { viewModel.downloadProgress }
     val cached by remember { viewModel.cached }
 
-    LaunchedEffect(selectedSeries) {
-        val seriesId = selectedSeries?.id
-        if (seriesId != null) {
-            viewModel.refreshIssuesState(seriesId)
-        }
+    LaunchedEffect(selectedSeriesId) {
+        selectedSeriesId?.let { viewModel.refreshIssuesState(it) }
+        if (selectedSeriesId == null) seriesState.refresh()
     }
 
     Column {
-        BackHandler(enabled = (selectedSeries != null)) {
-            selectedSeries = null
+        BackHandler(enabled = (selectedSeriesId != null)) {
+            selectedSeriesId = null
         }
+
         LazyVerticalGrid(
-            columns = GridCells.Adaptive(COVER_WIDTH + if (selectedSeries == null) 0.dp else 30.dp)
+            columns = GridCells.Adaptive(COVER_WIDTH + if (selectedSeriesId == null) 0.dp else 30.dp)
         ) {
 
-            if (selectedSeries == null) {
+            if (selectedSeriesId == null) {
                 items(seriesState.itemCount) { index ->
                     val item = seriesState[index]
                     if (item != null) {
                         CatalogueSeriesItem(
                             item = item,
                             coverUrl = viewModel.coverRequest(item.cover, "SMALL"),
-                            onClick = { selectedSeries = item }
+                            onClick = {
+                                selectedSeriesId = item.id
+                                selectedSeriesName = item.title
+                            }
                         )
                     }
                 }
@@ -82,18 +85,18 @@ fun CatalogueScreen(
                 }
             }
 
-            if (selectedSeries != null) {
+            if (selectedSeriesId != null) {
                 items(issuesState) {
                     CatalogueIssueItem(
                         item = it,
-                        seriesName = selectedSeries?.title ?: "",
+                        seriesName = selectedSeriesName ?: "",
                         coverUrl = viewModel.coverRequest("/pages/${it.id}/0", "SMALL"),
                         onClick = onNavigateToReaderScreen,
                         downloadProgress = downloadProgressState[it.id],
                         cached = (cached[it.id] == true),
                         onDownloadClick = {
                             val issueId = it.id
-                            val seriesId = selectedSeries?.id ?: 0L
+                            val seriesId = selectedSeriesId ?: 0L
                             viewModel.download(seriesId, issueId)
                         }
                     )

app/src/main/java/com/home/reader/ui/reader/screen/ReaderScreen.kt

@@ -80,32 +80,34 @@ fun ReaderScreen(
                 snapPositionalThreshold = 0.15f
             )
         ) { page ->
-            key(state.filler) {
-                Image(
-                    painter = rememberAsyncImagePainter(
-                        viewModel.requestPage(page),
-                        filterQuality = FilterQuality.High
-                    ),
-                    contentDescription = "Page $page",
-                    contentScale = state.filler.scale,
-                    modifier = Modifier
-                        .filler(rememberScrollState(), rememberScrollState())
-                        .pointerInput(Unit) {
-                            detectTapGestures(
-                                onDoubleTap = { viewModel.resolverFiller() },
-                                onLongPress = { showProgress = !showProgress },
-                                onTap = { offset ->
-                                    viewModel.resolveClick(screenWidthInPx, offset.x) {
-                                        coroutineScope.launch {
-                                            withContext(this.coroutineContext) {
-                                                pagerState.animateScrollToPage(it)
+            Box {
+                key(state.filler) {
+                    Image(
+                        painter = rememberAsyncImagePainter(
+                            viewModel.requestPage(page),
+                            filterQuality = FilterQuality.High
+                        ),
+                        contentDescription = "Page $page",
+                        contentScale = state.filler.scale,
+                        modifier = Modifier
+                            .filler(rememberScrollState(), rememberScrollState())
+                            .pointerInput(Unit) {
+                                detectTapGestures(
+                                    onDoubleTap = { viewModel.resolverFiller() },
+                                    onLongPress = { showProgress = !showProgress },
+                                    onTap = { offset ->
+                                        viewModel.resolveClick(screenWidthInPx, offset.x) {
+                                            coroutineScope.launch {
+                                                withContext(this.coroutineContext) {
+                                                    pagerState.animateScrollToPage(it)
+                                                }
                                             }
                                         }
                                     }
-                                }
-                            )
-                        }
-                )
+                                )
+                            }
+                    )
+                }
             }
         }