diff --git a/.gitignore b/.gitignore
index f32c758..4e896f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,7 @@
/WebViewPlugin/WebView.Plugin.WinPhone/obj
/UpgradeLog.htm
+/WebViewPlugin/WebView.Plugin.WindowsPhone/bin/Release
+/WebViewPlugin/WebView.Plugin.WindowsPhone/obj
+/WebViewPlugin/WebView.Plugin.WindowsStore/bin
+/WebViewPlugin/WebView.Plugin.WindowsStore/obj
diff --git a/SampleApp/SampleApp.Windows/Package.appxmanifest b/SampleApp/SampleApp.Windows/Package.appxmanifest
index c5c9203..e86b407 100644
--- a/SampleApp/SampleApp.Windows/Package.appxmanifest
+++ b/SampleApp/SampleApp.Windows/Package.appxmanifest
@@ -21,6 +21,7 @@
+
diff --git a/SampleApp/SampleApp.iOS/SampleApp.iOS.csproj.user b/SampleApp/SampleApp.iOS/SampleApp.iOS.csproj.user
index d1a65d6..ae5c170 100644
--- a/SampleApp/SampleApp.iOS/SampleApp.iOS.csproj.user
+++ b/SampleApp/SampleApp.iOS/SampleApp.iOS.csproj.user
@@ -1,7 +1,7 @@
- iPad Air 2 iOS 10.3
+ Simulator
iPad Air 2 iOS 10.3
\ No newline at end of file
diff --git a/SampleApp/SampleApp/App.cs b/SampleApp/SampleApp/App.cs
index 3b37446..206bdfc 100644
--- a/SampleApp/SampleApp/App.cs
+++ b/SampleApp/SampleApp/App.cs
@@ -8,7 +8,7 @@ public class App : Application
public App()
{
- MainPage = new HeadersSample();
+ MainPage = new MainPage();
}
protected override void OnStart()
diff --git a/WebViewPlugin/WebView.Plugin.iOS/FormsWebViewRenderer.cs b/WebViewPlugin/WebView.Plugin.iOS/FormsWebViewRenderer.cs
index 7747587..63ffeae 100644
--- a/WebViewPlugin/WebView.Plugin.iOS/FormsWebViewRenderer.cs
+++ b/WebViewPlugin/WebView.Plugin.iOS/FormsWebViewRenderer.cs
@@ -135,20 +135,19 @@ internal void InjectJS(string js)
void OnUserNavigationRequested(FormsWebView sender, string uri, Abstractions.Enumerations.WebViewContentType contentType)
{
- if (Element == sender)
+ if (Element != sender) return;
+
+ switch (contentType)
{
- switch (contentType)
- {
- case Abstractions.Enumerations.WebViewContentType.Internet:
- CommitNsUrlRequest(new NSUrl(uri));
- break;
- case Abstractions.Enumerations.WebViewContentType.LocalFile:
- LoadLocalContent(uri);
- break;
- case Abstractions.Enumerations.WebViewContentType.StringData:
- Control.LoadHtmlString(uri, new NSUrl(string.Concat("file://", GetCorrectBaseUrl(), "/")));
- break;
- }
+ case Abstractions.Enumerations.WebViewContentType.Internet:
+ CommitNsUrlRequest(new NSUrl(uri));
+ break;
+ case Abstractions.Enumerations.WebViewContentType.LocalFile:
+ LoadLocalContent(uri);
+ break;
+ case Abstractions.Enumerations.WebViewContentType.StringData:
+ Control.LoadHtmlString(uri, new NSUrl(string.Concat("file://", GetCorrectBaseUrl(), "/")));
+ break;
}
}
diff --git a/package.nuspec b/package.nuspec
index 995af25..147429d 100644
--- a/package.nuspec
+++ b/package.nuspec
@@ -2,13 +2,13 @@
Xam.Plugin.WebView
- 1.6.1
+ 1.7.0-rc1
WebView Plugin for Xamarin Forms
Ryan Dixon
Ryan Dixon
false
A simple lightweight HybridWebView designed to work with Xamarin Forms
- Match Android WebView to parent height/width. Extra NRE checking on UWP.
+ Support for iOS 11 and Request Headers.
https://s18.postimg.org/wjfexgtnt/FWV.png
Plugins, Xamarin, WebView, Web, HTML, Forms, Android, iOS, UWP, WinRT