Fix custom tags navigation

Author: paulcoding810

app/src/main/java/com/paulcoding/hviewer/model/PostModel.kt

@@ -1,7 +1,9 @@
 package com.paulcoding.hviewer.model
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
 
 data class PostData(
     val images: List<String>,
@@ -36,10 +38,11 @@ data class PostItem(
     }
 }
 
+@Parcelize
 data class Tag(
     val name: String = "",
     val url: String = "",
-)
+) : Parcelable
 
 data class Posts(
     val posts: List<PostItem> = listOf(),

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

@@ -61,7 +61,7 @@ fun AppEntry(intent: Intent?, appViewModel: AppViewModel) {
 
     fun navToCustomTag(post: PostItem, tag: Tag) {
         appViewModel.setCurrentPost(post)
-        appViewModel.setCurrentTag(tag)
+        navController.currentBackStackEntry?.savedStateHandle?.set("tag", tag)
         navController.navigate(Route.CUSTOM_TAG)
     }
 
@@ -159,14 +159,17 @@ fun AppEntry(intent: Intent?, appViewModel: AppViewModel) {
                 )
             }
             animatedComposable(Route.CUSTOM_TAG) {
-                CustomTagPage(
-                    appViewModel,
-                    navToCustomTag = { postItem, tag -> navToCustomTag(postItem, tag) },
-                    navToTabs = { navController.navigate(Route.TABS) },
-                    goBack = { navController.popBackStack() }
-                ) {
-                    navToImages(it)
-                }
+                val tag = navController.previousBackStackEntry?.savedStateHandle?.get<Tag>("tag")
+                if (tag != null)
+                    CustomTagPage(
+                        appViewModel,
+                        tag = tag,
+                        navToCustomTag = { postItem, newTag -> navToCustomTag(postItem, newTag) },
+                        navToTabs = { navController.navigate(Route.TABS) },
+                        goBack = { navController.popBackStack() }
+                    ) {
+                        navToImages(it)
+                    }
             }
             animatedComposable(Route.POST) {
                 PostPage(

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

@@ -11,7 +11,6 @@ import com.paulcoding.hviewer.helper.scriptsDir
 import com.paulcoding.hviewer.model.PostItem
 import com.paulcoding.hviewer.model.SiteConfig
 import com.paulcoding.hviewer.model.SiteConfigs
-import com.paulcoding.hviewer.model.Tag
 import com.paulcoding.hviewer.network.Github
 import com.paulcoding.hviewer.network.SiteConfigsState
 import com.paulcoding.hviewer.preference.Preferences
@@ -53,16 +52,9 @@ class AppViewModel : ViewModel() {
         _stateFlow.update { it.copy(post = post) }
     }
 
-    fun setCurrentTag(tag: Tag) {
-        _stateFlow.update { it.copy(tag = tag) }
-    }
-
-    fun getCurrentTag() = _stateFlow.value.tag
-
     data class UiState(
         val post: PostItem = PostItem(),
         val url: String = "",
-        val tag: Tag = Tag(),
         val isDevMode: Boolean = BuildConfig.DEBUG,
         val siteConfigs: SiteConfigs? = appContext.readConfigFile<SiteConfigs>().getOrNull(),
         val error: Throwable? = null,

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

@@ -25,12 +25,12 @@ import com.paulcoding.hviewer.ui.page.AppViewModel
 @Composable
 fun CustomTagPage(
     appViewModel: AppViewModel,
+    tag: Tag,
     goBack: () -> Unit,
     navToCustomTag: (PostItem, Tag) -> Unit,
     navToTabs: () -> Unit,
     navToImages: (PostItem) -> Unit
 ) {
-    val tag = appViewModel.getCurrentTag()
     var pageProgress by remember { mutableStateOf(1 to 1) }
     var tabsIconPosition by remember { mutableStateOf(Offset.Zero) }
     val tabs by appViewModel.tabs.collectAsState(initial = listOf())
@@ -62,7 +62,7 @@ fun CustomTagPage(
                 },
                 navToCustomTag = { post, newTag ->
                     if (newTag.name != tag.name)
-                        navToCustomTag(post, tag)
+                        navToCustomTag(post, newTag)
                 }) { post ->
                 navToImages(post)
             }