[Web] Add a method to expose WebViewClient and WebChromeClient

sample/src/main/java/com/google/accompanist/sample/webview/BasicWebViewSample.kt

@@ -17,7 +17,10 @@
 package com.google.accompanist.sample.webview
 
 import android.annotation.SuppressLint
+import android.graphics.Bitmap
 import android.os.Bundle
+import android.util.Log
+import android.webkit.WebView
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.Image
@@ -44,6 +47,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.sample.AccompanistSampleTheme
+import com.google.accompanist.web.AccompanistWebViewClient
 import com.google.accompanist.web.LoadingState
 import com.google.accompanist.web.WebContent
 import com.google.accompanist.web.WebView
@@ -115,13 +119,28 @@ class BasicWebViewSample : ComponentActivity() {
                         )
                     }
 
+                    // A custom WebViewClient and WebChromeClient can be provided via subclassing
+                    val webClient = remember {
+                        object : AccompanistWebViewClient() {
+                            override fun onPageStarted(
+                                view: WebView?,
+                                url: String?,
+                                favicon: Bitmap?
+                            ) {
+                                super.onPageStarted(view, url, favicon)
+                                Log.d("Accompanist WebView", "Page started loading for $url")
+                            }
+                        }
+                    }
+
                     WebView(
                         state = state,
                         modifier = Modifier.weight(1f),
                         navigator = navigator,
                         onCreated = { webView ->
                             webView.settings.javaScriptEnabled = true
-                        }
+                        },
+                        client = webClient
                     )
                 }
             }

web/api/current.api

@@ -1,6 +1,23 @@
 // Signature format: 4.0
 package com.google.accompanist.web {
 
+  public class AccompanistWebChromeClient extends android.webkit.WebChromeClient {
+    ctor public AccompanistWebChromeClient();
+    method public com.google.accompanist.web.WebViewState getState();
+    property public com.google.accompanist.web.WebViewState state;
+    field public com.google.accompanist.web.WebViewState state;
+  }
+
+  public class AccompanistWebViewClient extends android.webkit.WebViewClient {
+    ctor public AccompanistWebViewClient();
+    method public com.google.accompanist.web.WebViewNavigator getNavigator();
+    method public com.google.accompanist.web.WebViewState getState();
+    property public com.google.accompanist.web.WebViewNavigator navigator;
+    property public com.google.accompanist.web.WebViewState state;
+    field public com.google.accompanist.web.WebViewNavigator navigator;
+    field public com.google.accompanist.web.WebViewState state;
+  }
+
   public abstract sealed class LoadingState {
   }
 
@@ -51,7 +68,7 @@ package com.google.accompanist.web {
   }
 
   public final class WebViewKt {
-    method @androidx.compose.runtime.Composable public static void WebView(com.google.accompanist.web.WebViewState state, optional androidx.compose.ui.Modifier modifier, optional boolean captureBackPresses, optional com.google.accompanist.web.WebViewNavigator navigator, optional kotlin.jvm.functions.Function1<? super android.webkit.WebView,kotlin.Unit> onCreated, optional kotlin.jvm.functions.Function2<? super android.webkit.WebResourceRequest,? super android.webkit.WebResourceError,kotlin.Unit> onError);
+    method @androidx.compose.runtime.Composable public static void WebView(com.google.accompanist.web.WebViewState state, optional androidx.compose.ui.Modifier modifier, optional boolean captureBackPresses, optional com.google.accompanist.web.WebViewNavigator navigator, optional kotlin.jvm.functions.Function1<? super android.webkit.WebView,kotlin.Unit> onCreated, optional com.google.accompanist.web.AccompanistWebViewClient client, optional com.google.accompanist.web.AccompanistWebChromeClient chromeClient);
     method @androidx.compose.runtime.Composable public static com.google.accompanist.web.WebViewNavigator rememberWebViewNavigator(optional kotlinx.coroutines.CoroutineScope coroutineScope);
     method @androidx.compose.runtime.Composable public static com.google.accompanist.web.WebViewState rememberWebViewState(String url);
     method @androidx.compose.runtime.Composable public static com.google.accompanist.web.WebViewState rememberWebViewStateWithHTMLData(String data, optional String? baseUrl);

web/src/androidTest/kotlin/com/google/accompanist/web/WebTest.kt

@@ -16,9 +16,12 @@
 
 package com.google.accompanist.web
 
+import android.graphics.Bitmap
+import android.webkit.WebView
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
@@ -175,6 +178,66 @@ class WebTest {
             .check(webMatches(getCurrentUrl(), containsString(LINK_URL)))
     }
 
+    @Test
+    fun testCustomClientIsAssigned() {
+        lateinit var state: WebViewState
+
+        var pageStartCalled = false
+
+        rule.setContent {
+            state = rememberWebViewStateWithHTMLData(data = TEST_DATA)
+            WebTestContent(
+                state,
+                idleResource,
+                client = object : AccompanistWebViewClient() {
+                    override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+                        super.onPageStarted(view, url, favicon)
+                        pageStartCalled = true
+                    }
+                }
+            )
+        }
+
+        // Ensure the data is loaded first
+        onWebView()
+            .check(webMatches(getCurrentUrl(), containsString("about:blank")))
+
+        // Wait for the webview to load and then perform the check
+        rule.waitForIdle()
+
+        assertThat(pageStartCalled).isTrue()
+    }
+
+    @Test
+    fun testChromeClientIsAssigned() {
+        lateinit var state: WebViewState
+
+        var titleReceived: String? = null
+
+        rule.setContent {
+            state = rememberWebViewStateWithHTMLData(data = TEST_TITLE_DATA)
+            WebTestContent(
+                state,
+                idleResource,
+                chromeClient = object : AccompanistWebChromeClient() {
+                    override fun onReceivedTitle(view: WebView?, title: String?) {
+                        super.onReceivedTitle(view, title)
+                        titleReceived = title
+                    }
+                }
+            )
+        }
+
+        // Wait for new title
+        onWebView()
+            .check(webMatches(getTitle(), equalTo(TITLE_TEXT)))
+
+        // Wait for the webview to load and then perform the check
+        rule.waitForIdle()
+
+        assertThat(titleReceived).isEqualTo(TITLE_TEXT)
+    }
+
     // SDKs less than 29 do not call onPageStarted when loading about:blank.
     // This breaks the idling resource counter.
     // This test was testing an edge case that no longer exists and could potentially
@@ -467,6 +530,8 @@ private fun WebTestContent(
     webViewState: WebViewState,
     idlingResource: WebViewIdlingResource,
     navigator: WebViewNavigator = rememberWebViewNavigator(),
+    client: AccompanistWebViewClient = remember { AccompanistWebViewClient() },
+    chromeClient: AccompanistWebChromeClient = remember { AccompanistWebChromeClient() }
 ) {
     idlingResource.webviewLoading = webViewState.loadingState !is LoadingState.Finished
 
@@ -475,7 +540,9 @@ private fun WebTestContent(
             state = webViewState,
             modifier = Modifier.testTag(WebViewTag),
             navigator = navigator,
-            onCreated = { it.settings.javaScriptEnabled = true }
+            onCreated = { it.settings.javaScriptEnabled = true },
+            client = client,
+            chromeClient = chromeClient
         )
     }
 }