Fix webview subtitle not matching the actual page

Author: nonproto

app/src/main/java/org/nekomanga/presentation/screens/WebViewScreen.kt

@@ -1,6 +1,7 @@
 package org.nekomanga.presentation.screens
 
 import android.content.pm.ApplicationInfo
+import android.graphics.Bitmap
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import androidx.compose.foundation.layout.Box
@@ -13,7 +14,10 @@ import androidx.compose.material.icons.automirrored.filled.ArrowForward
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -44,11 +48,14 @@ fun WebViewScreen(
 ) {
     val context = LocalContext.current
     val state = rememberWebViewState(url = url)
+
+    var currentUrl by remember { mutableStateOf(url) }
+
     val navigator = rememberWebViewNavigator()
 
     NekoScaffold(
         title = title,
-        subtitle = url,
+        subtitle = currentUrl,
         type = NekoScaffoldType.TitleAndSubtitle,
         onNavigationIconClicked = onClose,
         navigationIcon = Icons.Filled.Close,
@@ -85,11 +92,11 @@ fun WebViewScreen(
                             ),
                             AppBar.OverflowAction(
                                 title = UiText.StringResource(R.string.share),
-                                onClick = { state.lastLoadedUrl?.let(onShare) },
+                                onClick = { onShare(currentUrl) },
                             ),
                             AppBar.OverflowAction(
                                 title = UiText.StringResource(R.string.open_in_browser),
-                                onClick = { state.lastLoadedUrl?.let(onOpenInBrowser) },
+                                onClick = { onOpenInBrowser(currentUrl) },
                             ),
                         ) +
                         listOf(
@@ -100,7 +107,7 @@ fun WebViewScreen(
                             ) {
                                 AppBar.OverflowAction(
                                     title = UiText.StringResource(R.string.open_in_app),
-                                    onClick = { state.lastLoadedUrl?.let(onOpenInApp) },
+                                    onClick = { onOpenInApp(currentUrl) },
                                 )
                             } else {
                                 AppBar.Empty
@@ -120,6 +127,21 @@ fun WebViewScreen(
 
             val webClient = remember {
                 object : AccompanistWebViewClient() {
+
+                    override fun onPageStarted(view: WebView, url: String?, favicon: Bitmap?) {
+                        super.onPageStarted(view, url, favicon)
+                        url?.let { currentUrl = it }
+                    }
+
+                    override fun doUpdateVisitedHistory(
+                        view: WebView,
+                        url: String?,
+                        isReload: Boolean,
+                    ) {
+                        super.doUpdateVisitedHistory(view, url, isReload)
+                        url?.let { currentUrl = it }
+                    }
+
                     override fun shouldOverrideUrlLoading(
                         view: WebView?,
                         request: WebResourceRequest?,