Show favorite and info in post page

* use isFavorite as flow

Author: paulcoding810

app/src/main/java/com/paulcoding/hviewer/database/PostItemDao.kt

@@ -43,7 +43,7 @@ interface PostItemDao {
     )
 
     @Query("SELECT favorite FROM post_items WHERE url = :url")
-    suspend fun isFavorite(url: String): Boolean
+    fun isFavorite(url: String): Flow<Boolean>
 
     @Query("UPDATE post_items SET viewed = 0, viewedAt = 0 WHERE viewed = 1")
     suspend fun clearHistory()

app/src/main/java/com/paulcoding/hviewer/ui/page/AppEntry.kt

@@ -178,6 +178,7 @@ fun AppEntry(intent: Intent?, appViewModel: AppViewModel) {
                         appViewModel.setWebViewUrl(it)
                         navController.navigate(Route.WEBVIEW)
                     },
+                    navToCustomTag = { postItem, tag -> navToCustomTag(postItem, tag) },
                     goBack = {
                         navController.popBackStack()
                     })

app/src/main/java/com/paulcoding/hviewer/ui/page/AppViewModel.kt

@@ -52,6 +52,9 @@ class AppViewModel : ViewModel() {
         .stateIn(viewModelScope, SharingStarted.Eagerly, emptySet())
     val historyPosts = DatabaseProvider.getInstance().postItemDao().getViewedPosts()
 
+    val postFavorite =
+        { url: String -> DatabaseProvider.getInstance().postItemDao().isFavorite(url) }
+
     fun setCurrentPost(post: PostItem) {
         _stateFlow.update { it.copy(post = post) }
     }

app/src/main/java/com/paulcoding/hviewer/ui/page/post/PostPage.kt

@@ -1,25 +1,76 @@
 package com.paulcoding.hviewer.ui.page.post
 
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.paulcoding.hviewer.model.PostItem
+import com.paulcoding.hviewer.model.Tag
 import com.paulcoding.hviewer.ui.LocalHostsMap
+import com.paulcoding.hviewer.ui.component.HFavoriteIcon
+import com.paulcoding.hviewer.ui.component.HIcon
 import com.paulcoding.hviewer.ui.page.AppViewModel
+import com.paulcoding.hviewer.ui.page.posts.InfoBottomSheet
+import kotlinx.coroutines.launch
 
 @Composable
 fun PostPage(
     appViewModel: AppViewModel,
     navToWebView: (String) -> Unit,
+    navToCustomTag: (PostItem, Tag) -> Unit,
     goBack: () -> Unit
 ) {
     val appState by appViewModel.stateFlow.collectAsState()
-    val post = appState.post
+    val post = remember { appState.post }
+    val siteConfig = appViewModel.getCurrentSiteConfig()
+    val favorite by appViewModel.postFavorite(post.url).collectAsState(false)
     val hostsMap = LocalHostsMap.current
+    var infoSheetVisible by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
 
-    post.getSiteConfig(hostsMap)?.let {
-        ImageList(
-            post = post, siteConfig = it,
-            goBack = goBack
-        )
-    }
+    ImageList(
+        post = post,
+        siteConfig = siteConfig,
+        goBack = goBack,
+        bottomRowActions = {
+            HIcon(
+                Icons.Outlined.Info,
+                size = 32,
+                rounded = true
+            ) {
+                infoSheetVisible = true
+            }
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            HFavoriteIcon(isFavorite = favorite, rounded = true) {
+                scope.launch {
+                    if (!favorite)
+                        appViewModel.addFavorite(postItem = post)
+                    else
+                        appViewModel.deleteFavorite(post)
+                }
+            }
+        })
+
+    InfoBottomSheet(
+        visible = infoSheetVisible,
+        postItem = post,
+        onDismissRequest = {
+            infoSheetVisible = false
+        },
+        onTagClick = { tag ->
+            infoSheetVisible = false
+            navToCustomTag(post, tag)
+        },
+    )
 }

app/src/main/java/com/paulcoding/hviewer/ui/page/tabs/TabsPage.kt

@@ -15,7 +15,6 @@ import androidx.compose.material.icons.outlined.ChevronRight
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -26,7 +25,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.paulcoding.hviewer.database.DatabaseProvider
 import com.paulcoding.hviewer.model.PostItem
 import com.paulcoding.hviewer.model.Tag
 import com.paulcoding.hviewer.ui.LocalHostsMap
@@ -126,13 +124,7 @@ internal fun BottomRowActions(
     pagerState: PagerState,
     toggleBottomSheet: () -> Unit,
 ) {
-    var favorite by remember { mutableStateOf(false) }
-
-    LaunchedEffect(Unit) {
-        scope.launch {
-            favorite = DatabaseProvider.getInstance().postItemDao().isFavorite(postItem.url)
-        }
-    }
+    val favorite by appViewModel.postFavorite(postItem.url).collectAsState(false)
 
     HIcon(
         Icons.Outlined.ChevronLeft,
@@ -178,7 +170,6 @@ internal fun BottomRowActions(
                 appViewModel.addFavorite(postItem = postItem)
             else
                 appViewModel.deleteFavorite(postItem)
-            favorite = !favorite
         }
     }
 }