Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit 2aad2bf

Browse files
committed
HybridWeb now sends Navigated and Navigating events on Android
1 parent a026554 commit 2aad2bf

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

CustomRenderers/HybridWebView/Droid/HybridWebViewRenderer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using CustomRenderer;
1+
using Android.Content;
2+
using CustomRenderer;
23
using CustomRenderer.Droid;
34
using Xamarin.Forms;
45
using Xamarin.Forms.Platform.Android;
5-
using Android.Content;
66

77
[assembly: ExportRenderer(typeof(HybridWebView), typeof(HybridWebViewRenderer))]
88
namespace CustomRenderer.Droid
@@ -28,7 +28,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<WebView> e)
2828
}
2929
if (e.NewElement != null)
3030
{
31-
Control.SetWebViewClient(new JavascriptWebViewClient($"javascript: {JavascriptFunction}"));
31+
Control.SetWebViewClient(new JavascriptWebViewClient(this, $"javascript: {JavascriptFunction}"));
3232
Control.AddJavascriptInterface(new JSBridge(this), "jsBridge");
3333
Control.LoadUrl($"file:///android_asset/Content/{((HybridWebView)Element).Uri}");
3434
}

CustomRenderers/HybridWebView/Droid/JavascriptWebViewClient.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using Android.Webkit;
2+
using Xamarin.Forms.Platform.Android;
23

34
namespace CustomRenderer.Droid
45
{
5-
public class JavascriptWebViewClient : WebViewClient
6+
public class JavascriptWebViewClient : FormsWebViewClient
67
{
78
string _javascript;
89

9-
public JavascriptWebViewClient(string javascript)
10+
public JavascriptWebViewClient(HybridWebViewRenderer renderer, string javascript) : base(renderer)
1011
{
1112
_javascript = javascript;
1213
}

0 commit comments

Comments
 (0)