Load articles immediately on swipe

app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleReader.kt

@@ -11,6 +11,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -21,6 +23,7 @@ import com.capyreader.app.ui.components.WebView
 import com.capyreader.app.ui.components.rememberWebViewState
 import com.jocmp.capy.Article
 import com.jocmp.capy.articles.ArticleRenderer
+import kotlinx.coroutines.launch
 import my.nanihadesuka.compose.ColumnScrollbar
 import my.nanihadesuka.compose.ScrollbarSettings
 import org.koin.compose.koinInject
@@ -29,21 +32,11 @@ import org.koin.compose.koinInject
 fun ArticleReader(
     article: Article,
     scrollState: ScrollState,
-    renderer: ArticleRenderer = koinInject(),
 ) {
+    val scope = rememberCoroutineScope()
     val mediaViewer = LocalMediaViewer.current
-    val colors = articleTemplateColors()
     var lastScrollY by rememberSaveable { mutableIntStateOf(0) }
     val webViewState = rememberWebViewState()
-    val byline = article.byline(context = LocalContext.current)
-
-    fun render(): String {
-        return renderer.render(
-            article,
-            byline = byline,
-            colors = colors
-        )
-    }
 
     Scrollbar(scrollState = scrollState) {
         Column(
@@ -56,6 +49,11 @@ fun ArticleReader(
                 onNavigateToMedia = {
                     mediaViewer.open(it)
                 },
+                onPageStarted = {
+                    scope.launch {
+                        scrollState.scrollTo(0)
+                    }
+                },
                 onDispose = {
                     lastScrollY = scrollState.value
                 },
@@ -64,8 +62,8 @@ fun ArticleReader(
         }
     }
 
-    LaunchedEffect(article.content) {
-        webViewState.loadHtml(render())
+    LaunchedEffect(article.id, article.content) {
+        webViewState.loadHtml(article)
     }
 
     LaunchedEffect(lastScrollY, scrollState.maxValue) {

app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleView.kt

@@ -48,7 +48,7 @@ fun ArticleView(
     onRequestArticle: (id: String) -> Unit
 ) {
     val fullContent = LocalFullContent.current
-    val scrollState = rememberSaveable(article.id, key = article.id, saver = ScrollState.Saver) {
+    val scrollState = rememberSaveable(key = article.id, saver = ScrollState.Saver) {
         ScrollState(initial = 0)
     }
 
@@ -92,12 +92,10 @@ fun ArticleView(
                         onRequestPrevious = onRequestPrevious,
                         articles = articles,
                     ) {
-                        key(article.id) {
-                            ArticleReader(
-                                article = article,
-                                scrollState = scrollState
-                            )
-                        }
+                        ArticleReader(
+                            article = article,
+                            scrollState = scrollState
+                        )
                     }
                 }