[Refactor] Parameterize article state

app/src/main/java/com/capyreader/app/ui/articles/ArticleHandler.kt

@@ -5,23 +5,20 @@ import androidx.compose.runtime.LaunchedEffect
 import com.capyreader.app.preferences.AppPreferences
 import com.jocmp.capy.Article
 import org.koin.compose.koinInject
+import com.jocmp.capy.logging.CapyLog
 
 @Composable
 fun ArticleHandler(
     article: Article?,
     appPreferences: AppPreferences = koinInject(),
     onRequestArticle: (articleID: String) -> Unit,
 ) {
-    LaunchedEffect(article?.id) {
-        if (article != null) {
-            return@LaunchedEffect
-        }
-
-        val articleID = appPreferences.articleID.get()
-
-        if (articleID.isNotBlank()) {
-            appPreferences.articleID.delete()
-            onRequestArticle(articleID)
+    LaunchedEffect(article?.id, state) {
+        if (article != null && state?.pane != ThreePaneScaffoldRole.Primary) {
+            CapyLog.info("launch", mapOf("id" to article.id))
+            onNavigateToArticle(article)
+        } else {
+            CapyLog.info("skip", mapOf("id" to article?.id, "state" to state?.pane))
         }
     }
 }

app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt

@@ -145,6 +145,12 @@ fun ArticleScreen(
 
     val article = viewModel.article
 
+    val onInitialized = { completion: () -> Unit ->
+        viewModel.initialize(onComplete = completion)
+    }
+
+    val article = viewModel.article.collectAsState(null).value
+
     val search = ArticleSearch(
         query = searchQuery,
         start = { viewModel.startSearch() },
@@ -565,13 +571,14 @@ fun ArticleScreen(
                         onBackPressed = {
                             clearArticle()
                         },
-                        onToggleRead = viewModel::toggleArticleRead,
-                        onToggleStar = viewModel::toggleArticleStar,
                         enableBackHandler = media == null,
                         onSelectMedia = { media = it },
                         onSelectArticle = { articleID ->
                             setArticle(articleID)
                         },
+                        articleFinder = {
+                            viewModel.findArticle(it)
+                        },
                         onScrollToArticle = { index ->
                             scrollToArticle(index)
                         }

app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt

@@ -8,6 +8,9 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
+import androidx.navigation.toRoute
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
 import com.capyreader.app.R
 import com.capyreader.app.common.toast
 import com.capyreader.app.notifications.NotificationHelper
@@ -39,6 +42,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.lastOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import java.time.OffsetDateTime
@@ -63,7 +67,9 @@ class ArticleScreenViewModel(
 
     private val _searchState = MutableStateFlow(SearchState.INACTIVE)
 
-    private var _article by mutableStateOf<Article?>(null)
+    private var _articleID = MutableStateFlow("")
+
+    val article: Flow<Article?> = _articleID.flatMapLatest { account.findArticleAsync(it) }
 
     var refreshingAll by mutableStateOf(false)
         private set
@@ -159,9 +165,6 @@ class ArticleScreenViewModel(
     val showUnauthorizedMessage: Boolean
         get() = _showUnauthorizedMessage == UnauthorizedMessageState.SHOW
 
-    val article: Article?
-        get() = _article
-
     val searchQuery: Flow<String>
         get() = _searchQuery
 
@@ -335,13 +338,10 @@ class ArticleScreenViewModel(
     }
 
     fun selectArticle(articleID: String, onComplete: (article: Article) -> Unit = {}) {
-        if (_article?.id == articleID) {
-            return
-        }
-
         viewModelScope.launchIO {
             val article = buildArticle(articleID) ?: return@launchIO
-            _article = article
+
+            _articleID.value = articleID
 
             appPreferences.articleID.set(articleID)
 
@@ -361,34 +361,6 @@ class ArticleScreenViewModel(
         }
     }
 
-    fun toggleArticleRead() {
-        _article?.let { article ->
-            viewModelScope.launch {
-                if (article.read) {
-                    markUnread(article.id)
-                } else {
-                    markRead(article.id)
-                }
-            }
-
-            _article = article.copy(read = !article.read)
-        }
-    }
-
-    fun toggleArticleStar() {
-        _article?.let { article ->
-            viewModelScope.launch {
-                if (article.starred) {
-                    removeStar(article.id)
-                } else {
-                    addStar(article.id)
-                }
-
-                _article = article.copy(starred = !article.starred)
-            }
-        }
-    }
-
     fun dismissUnauthorizedMessage() {
         _showUnauthorizedMessage = UnauthorizedMessageState.LATER
     }
@@ -416,22 +388,18 @@ class ArticleScreenViewModel(
     }
 
     fun addStarAsync(articleID: String) {
-        toggleCurrentStarred(articleID)
         addStar(articleID)
     }
 
     fun removeStarAsync(articleID: String) = viewModelScope.launchIO {
-        toggleCurrentStarred(articleID)
         removeStar(articleID)
     }
 
     fun markReadAsync(articleID: String) = viewModelScope.launchIO {
-        toggleCurrentRead(articleID)
         markRead(articleID)
     }
 
     fun markUnreadAsync(articleID: String) = viewModelScope.launchIO {
-        toggleCurrentRead(articleID)
         markUnread(articleID)
     }
 
@@ -487,22 +455,6 @@ class ArticleScreenViewModel(
         updateFilter(ArticleFilter.default().copy(latestFilter.status))
     }
 
-    private fun toggleCurrentStarred(articleID: String) {
-        _article?.let { article ->
-            if (articleID == article.id) {
-                _article = article.copy(starred = !article.starred)
-            }
-        }
-    }
-
-    private fun toggleCurrentRead(articleID: String) {
-        _article?.let { article ->
-            if (articleID == article.id) {
-                _article = article.copy(read = !article.read)
-            }
-        }
-    }
-
     private fun updateFilter(filter: ArticleFilter) {
         appPreferences.filter.set(filter)
 
@@ -554,52 +506,55 @@ class ArticleScreenViewModel(
         )
     }
 
-    fun fetchFullContentAsync(article: Article? = _article) {
-        article ?: return
-
+    fun fetchFullContentAsync() {
         viewModelScope.launchIO {
+            val article = article.lastOrNull() ?: return@launchIO
+
             if (enableStickyFullContent && !account.isFullContentEnabled(feedID = article.feedID)) {
                 account.enableStickyContent(article.feedID)
             }
 
-            _article = article.copy(fullContent = Article.FullContentState.LOADING)
+            TODO()
+//            _article = article.copy(fullContent = Article.FullContentState.LOADING)
 
-            _article?.let { fetchFullContent(it) }
+//            _article?.let { fetchFullContent(it) }
         }
     }
 
     fun resetFullContent() {
-        val article = _article ?: return
-
-        _article = article.copy(
-            content = article.defaultContent,
-            fullContent = Article.FullContentState.NONE
-        )
+        TODO()
+//        val article = _article ?: return
 
-        if (enableStickyFullContent) {
-            account.disableStickyContent(article.feedID)
-        }
+//        _article = article.copy(
+//            content = article.defaultContent,
+//            fullContent = Article.FullContentState.NONE
+//        )
+//
+//        if (enableStickyFullContent) {
+//            account.disableStickyContent(article.feedID)
+//        }
     }
 
     private suspend fun fetchFullContent(article: Article) {
+        TODO()
         account.fetchFullContent(article)
             .fold(
                 onSuccess = { value ->
-                    if (_article?.id == article.id) {
-                        _article = article.copy(
-                            content = value,
-                            fullContent = Article.FullContentState.LOADED
-                        )
-                    }
+//                    if (_article?.id == article.id) {
+//                        _article = article.copy(
+//                            content = value,
+//                            fullContent = Article.FullContentState.LOADED
+//                        )
+//                    }
                 },
                 onFailure = {
-                    if (_article?.id != article.id) {
-                        return
-                    }
-                    _article = article.copy(
-                        content = article.defaultContent,
-                        fullContent = Article.FullContentState.ERROR
-                    )
+//                    if (_article?.id != article.id) {
+//                        return
+//                    }
+//                    _article = article.copy(
+//                        content = article.defaultContent,
+//                        fullContent = Article.FullContentState.ERROR
+//                    )
 
                     CapyLog.warn(
                         "full_content",

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

@@ -52,29 +52,47 @@ import com.capyreader.app.preferences.ArticleVerticalSwipe.NEXT_ARTICLE
 import com.capyreader.app.preferences.ArticleVerticalSwipe.OPEN_ARTICLE_IN_BROWSER
 import com.capyreader.app.preferences.ArticleVerticalSwipe.PREVIOUS_ARTICLE
 import com.capyreader.app.ui.LocalLinkOpener
+import com.capyreader.app.ui.articles.LocalArticleActions
 import com.capyreader.app.ui.articles.LocalFullContent
 import com.capyreader.app.ui.collectChangesWithDefault
 import com.capyreader.app.ui.components.pullrefresh.SwipeRefresh
 import com.jocmp.capy.Article
+import kotlinx.coroutines.flow.Flow
 import org.koin.compose.koinInject
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ArticleView(
     article: Article,
     articles: LazyPagingItems<Article>,
+    articleFinder: (id: String) -> Flow<Article?>,
     onBackPressed: () -> Unit,
-    onToggleRead: () -> Unit,
-    onToggleStar: () -> Unit,
     enableBackHandler: Boolean = false,
     onScrollToArticle: (index: Int) -> Unit,
     onSelectArticle: (id: String) -> Unit,
     onSelectMedia: (media: Media) -> Unit,
-    appPreferences: AppPreferences = koinInject()
+    appPreferences: AppPreferences = koinInject(),
 ) {
     val enableHorizontalPager by appPreferences.readerOptions.enableHorizontaPagination.collectChangesWithDefault()
     val fullContent = LocalFullContent.current
     val openLink = articleOpenLink(article)
+    val actions = LocalArticleActions.current
+
+    val onToggleRead = {
+       if (article.read) {
+          actions.markUnread(article.id)
+       } else {
+           actions.markRead(article.id)
+       }
+    }
+
+    val onToggleStar = {
+        if (article.starred) {
+            actions.unstar(article.id)
+        } else {
+            actions.star(article.id)
+        }
+    }
 
     val onToggleFullContent = {
         if (article.fullContent == Article.FullContentState.LOADED) {

capy/src/main/java/com/jocmp/capy/Account.kt

@@ -32,6 +32,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import okhttp3.OkHttpClient
 import java.io.InputStream
@@ -216,6 +217,19 @@ data class Account(
         return articleRecords.find(articleID = articleID)?.copy(enclosures = enclosures)
     }
 
+    fun findArticleAsync(articleID: String): Flow<Article?> {
+        if (articleID.isBlank()) {
+            return flow { null }
+        }
+
+        return articleRecords.findAsync(articleID)
+            .map {
+                val enclosures = enclosureRecords.byArticle(articleID)
+
+                it?.copy(enclosures = enclosures)
+            }
+    }
+
     suspend fun addStar(articleID: String): Result<Unit> {
         articleRecords.addStar(articleID = articleID)
 

capy/src/main/java/com/jocmp/capy/logging/CapyLog.kt

@@ -7,6 +7,10 @@ object CapyLog : Logging {
         Log.d(TAG, serializeData(event, data))
     }
 
+    override fun info(tag: String, data: Map<String, Any?>) {
+        Log.i(appTag(tag), serializeData(data))
+    }
+
     override fun info(event: String, data: Map<String, Any?>) {
         Log.i(TAG, serializeData(event, data))
     }

capy/src/main/java/com/jocmp/capy/logging/Logging.kt

@@ -3,6 +3,8 @@ package com.jocmp.capy.logging
 interface Logging {
     fun debug(event: String, data: Map<String, Any?> = emptyMap())
 
+    fun info(tag: String, data: Map<String, Any?> = emptyMap())
+
     fun info(event: String, data: Map<String, Any?> = emptyMap())
 
     fun warn(event: String, data: Map<String, String?> = emptyMap())