Update hostsMap calculation

Author: paulcoding810

app/src/main/java/com/paulcoding/hviewer/ui/CompositionLocals.kt

@@ -1,6 +1,22 @@
 package com.paulcoding.hviewer.ui
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
+import com.paulcoding.hviewer.model.PostItem
 import com.paulcoding.hviewer.model.SiteConfig
 
 val LocalHostsMap = staticCompositionLocalOf<Map<String, SiteConfig>> { mapOf() }
+
+@Composable
+fun rememberSiteConfig(postItem: PostItem): SiteConfig {
+    val hostsMap = LocalHostsMap.current
+    return remember { hostsMap[postItem.getHost()] ?: SiteConfig() }
+}
+
+@Composable
+fun rememberSiteConfig(url: String): SiteConfig {
+    val hostsMap = LocalHostsMap.current
+    val host = url.split("/").getOrNull(2)
+    return remember { hostsMap[host] ?: SiteConfig() }
+}

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

@@ -11,9 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NamedNavArgument
@@ -51,7 +49,8 @@ import com.paulcoding.hviewer.ui.page.web.WebPage
 fun AppEntry(intent: Intent?, appViewModel: AppViewModel) {
     val navController = rememberNavController()
     val appState by appViewModel.stateFlow.collectAsState()
-    val hostsMap by remember { derivedStateOf { appState.siteConfigs?.toHostsMap() ?: mapOf() } }
+    val hostsMap by appViewModel.hostsMap.collectAsState()
+
     val context = LocalContext.current
 
     fun navToImages(post: PostItem) {

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

@@ -35,6 +35,9 @@ class AppViewModel : ViewModel() {
     private var _stateFlow = MutableStateFlow(UiState())
     val stateFlow = _stateFlow.asStateFlow()
 
+    val hostsMap = _stateFlow.map { it.siteConfigs?.toHostsMap() ?: mapOf() }
+        .stateIn(viewModelScope, SharingStarted.Eagerly, mapOf())
+
     private var _tabs = MutableStateFlow(listOf<PostItem>())
     val tabs = _tabs.asStateFlow()
 
@@ -140,9 +143,7 @@ class AppViewModel : ViewModel() {
     }
 
     fun getCurrentSiteConfig(): SiteConfig {
-        val hostMap = _stateFlow.value.siteConfigs?.toHostsMap()
-            ?: throw Exception("Host map is null: ${_stateFlow.value.siteConfigs}")
-        return hostMap[_stateFlow.value.post.getHost()]
+        return hostsMap.value[_stateFlow.value.post.getHost()]
             ?: throw (Exception("No site config found for ${stateFlow.value.post.url}"))
     }