Dispose settings webview when closing tab

LRReader.Shared/Models/App.cs

@@ -3,16 +3,14 @@
 
 namespace LRReader.Shared.Models
 {
-	public interface ICustomTab
+	public interface ICustomTab : IDisposable
 	{
 		object CustomTabControl { get; set; }
 
 		string CustomTabId { get; set; }
 
 		bool IsClosable { get; set; }
 
-		void Unload();
-
 		bool BackRequested();
 	}
 

LRReader.Shared/Services/Tabs.cs

@@ -68,7 +68,7 @@ public void CloseCurrentTab()
 
 		public void CloseTab(ICustomTab tab)
 		{
-			tab.Unload();
+			tab.Dispose();
 			TabItems.Remove(tab);
 		}
 
@@ -82,7 +82,7 @@ public void CloseTabWithId(string? id)
 		public void CloseAllTabs()
 		{
 			foreach (var t in TabItems)
-				t.Unload();
+				t.Dispose();
 			TabItems.Clear();
 		}
 

LRReader.UWP/Views/Content/WebContent.xaml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using LRReader.Shared.Services;
 using LRReader.UWP.Views.Controls;
 using Windows.UI.Xaml.Controls;
@@ -7,7 +8,7 @@
 namespace LRReader.UWP.Views.Content
 {
 
-	public sealed partial class WebContent : ModernBasePage
+	public sealed partial class WebContent : ModernBasePage, IDisposable
 	{
 		public WebContent()
 		{
@@ -23,13 +24,19 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
 		protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 		{
-			WebView.Close();
+			WebView.Dispose();
 			base.OnNavigatingFrom(e);
 		}
 
 		private void WebView_OnCloseRequested()
 		{
 			Wrapper.ModernPageTab.GoBack((int)((Frame)Parent).Tag);
 		}
+
+		public void Dispose()
+		{
+			WebView.Dispose();
+		}
+
 	}
 }

LRReader.UWP/Views/Controls/ModernPageTab.xaml.cs

@@ -11,7 +11,7 @@
 
 namespace LRReader.UWP.Views.Controls
 {
-	public sealed partial class ModernPageTab : UserControl
+	public sealed partial class ModernPageTab : UserControl, IDisposable
 	{
 
 		private ObservableCollection<ModernPageTabItem> MainBreadcrumbItems = new ObservableCollection<ModernPageTabItem>();
@@ -166,6 +166,12 @@ private void ExtraBreadcrumb_ItemClicked(BreadcrumbBar sender, BreadcrumbBarItem
 			}
 		}
 
+		public void Dispose()
+		{
+			if (ContentMain.Content is IDisposable main) main.Dispose();
+			if (ContentExtra.Content is IDisposable extra) extra.Dispose();
+		}
+
 		public static readonly DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(ModernPageTab), new PropertyMetadata(null));
 		public static readonly DependencyProperty InitialProperty = DependencyProperty.Register("Initial", typeof(Type), typeof(ModernPageTab), new PropertyMetadata(null));
 	}

LRReader.UWP/Views/Controls/ModernTab.cs

@@ -29,7 +29,7 @@ public string CustomTabId
 
 		public event GoBackTabEvent? GoBack;
 
-		public virtual void Unload()
+		public virtual void Dispose()
 		{
 		}
 

LRReader.UWP/Views/Controls/ModernWebView.cs

@@ -1,6 +1,8 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using LRReader.UWP.Extensions;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
 using Windows.UI;
@@ -10,7 +12,7 @@
 
 namespace LRReader.UWP.Views.Controls
 {
-	public class ModernWebView : UserControl
+	public class ModernWebView : UserControl, IDisposable
 	{
 		private static List<string> Allowed = new List<string>() { "/upload", "/batch", "/config", "/config/plugins", "/logs" };
 
@@ -54,10 +56,12 @@ public void Navigate(string url)
 
 		public void Refresh() => WebView.Refresh();
 
-		public void Close() => WebView.Close();
+		public void Dispose() => WebView.Dispose();
 
 		public bool NavigationStarting(IWebView sender, Uri uri)
 		{
+			if (!Page.Host.Equals(uri.Host))
+				return true;
 			var path = uri.AbsolutePath;
 			if (path.Equals("/login") || Allowed.Contains(path))
 			{
@@ -113,12 +117,11 @@ private static bool CanUseWebView2()
 		public static DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(ModernWebView), new PropertyMetadata(""));
 	}
 
-	public interface IWebView
+	public interface IWebView : IDisposable
 	{
 		public string DocumentTitle { get; }
-		public void Navigate(Uri page);
+		public Task Navigate(Uri page);
 		public void Refresh();
-		public void Close();
 
 	}
 
@@ -140,7 +143,7 @@ public EdgeChromeWebView(ModernWebView modern)
 
 		public string DocumentTitle => WebView.CoreWebView2.DocumentTitle;
 
-		public async void Navigate(Uri page)
+		public async Task Navigate(Uri page)
 		{
 			await WebView.EnsureCoreWebView2Async();
 			if (!Initialized)
@@ -151,25 +154,35 @@ public async void Navigate(Uri page)
 				WebView.CoreWebView2.NewWindowRequested += CoreWebView2_NewWindowRequested;
 				WebView.CoreWebView2.DOMContentLoaded += CoreWebView2_DOMContentLoaded;
 			}
-			WebView.Source = page;
+			WebView.CoreWebView2.Navigate(page.ToString());
 		}
 
 		public void Refresh() => WebView.Reload();
 
-		public void Close() => WebView.Close();
+		public void Dispose() => WebView.Close();
 
-		private void NavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args) => args.Cancel = Modern.NavigationStarting(this, new Uri(args.Uri));
+		private void NavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
+		{
+			var res = Modern.NavigationStarting(this, new Uri(args.Uri));
+			//if (!res)
+				//await WebView.FadeOutAsync();
+			args.Cancel = res;
+		}
 
-		private void NavigationCompleted(WebView2 sender, CoreWebView2NavigationCompletedEventArgs args) => Modern.NavigationCompleted(this, args.IsSuccess);
+		private void NavigationCompleted(WebView2 sender, CoreWebView2NavigationCompletedEventArgs args)
+		{
+			Modern.NavigationCompleted(this, args.IsSuccess);
+		}
 
 		private void CoreWebView2_NewWindowRequested(CoreWebView2 sender, CoreWebView2NewWindowRequestedEventArgs args)
 		{
 			args.Handled = true;
 		}
 
-		private async void CoreWebView2_DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args)
+		private void CoreWebView2_DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args)
 		{
-			await sender.ExecuteScriptAsync("var style = document.createElement('style'); style.innerHTML = 'body, html { background: transparent !important; } p.ip { display: none !important; }'; document.head.appendChild(style);");
+			//await sender.ExecuteScriptAsync("var style = document.createElement('style'); style.innerHTML = 'body, html { background: transparent !important; } p.ip { display: none !important; } div.ido, .option-flyout { border: 1px solid #00000019; border-radius: 4px; background-color: #FFFFFF0D !important; background-clip: padding-box !important; }'; document.head.appendChild(style);");
+			//WebView.FadeIn();
 		}
 
 	}
@@ -191,20 +204,30 @@ public EdgeHTMLWebView(ModernWebView modern)
 
 		public string DocumentTitle => WebView.DocumentTitle;
 
-		public void Navigate(Uri page) => WebView.Navigate(page);
+		public Task Navigate(Uri page)
+		{
+			WebView.Navigate(page);
+			return Task.CompletedTask;
+		}
 
 		public void Refresh() => WebView.Refresh();
 
-		public void Close() { }
+		public void Dispose() { }
 
-		private void NavigationStarting(WebView sender, WebViewNavigationStartingEventArgs args) => args.Cancel = Modern.NavigationStarting(this, args.Uri);
+		private void NavigationStarting(WebView sender, WebViewNavigationStartingEventArgs args)
+		{
+			args.Cancel = Modern.NavigationStarting(this, args.Uri);
+		}
 
-		private void NavigationCompleted(WebView sender, WebViewNavigationCompletedEventArgs args) => Modern.NavigationCompleted(this, args.IsSuccess);
+		private void NavigationCompleted(WebView sender, WebViewNavigationCompletedEventArgs args)
+		{
+			Modern.NavigationCompleted(this, args.IsSuccess);
+		}
 
-		private async void DOMContentLoaded(WebView sender, WebViewDOMContentLoadedEventArgs args)
+		private void DOMContentLoaded(WebView sender, WebViewDOMContentLoadedEventArgs args)
 		{
-			var func = "var style = document.createElement('style'); style.innerHTML = 'body, html { background: transparent !important; } p.ip { display: none !important; }'; document.head.appendChild(style);";
-			await sender.InvokeScriptAsync("eval", new string[] { func });
+			//var func = "var style = document.createElement('style'); style.innerHTML = 'body, html { background: transparent !important; } p.ip { display: none !important; } div.ido, .option-flyout { border: 1px solid #00000019; border-radius: 4px; background-color: #FFFFFF0D !important; background-clip: padding-box !important; }'; document.head.appendChild(style);";
+			//await sender.InvokeScriptAsync("eval", new string[] { func });
 		}
 	}
 }

LRReader.UWP/Views/Tabs/ArchiveTab.xaml.cs

@@ -14,9 +14,9 @@ public ArchiveTab(Archive archive, IList<Archive> next)
 			TabContent.LoadArchive(archive, next);
 		}
 
-		public override void Unload()
+		public override void Dispose()
 		{
-			base.Unload();
+			base.Dispose();
 			TabContent.RemoveEvent();
 		}
 	}

LRReader.UWP/Views/Tabs/SettingsTab.xaml.cs

@@ -25,9 +25,10 @@ public SettingsTab()
 			DispatcherTimer.Start();
 		}
 
-		public override void Unload()
+		public override void Dispose()
 		{
-			base.Unload();
+			base.Dispose();
+			ContentPage.Dispose();
 			DispatcherTimer.Stop();
 		}
 

LRReader.UWP/Views/Tabs/WebTab.xaml.cs

@@ -26,10 +26,10 @@ private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
 			TabContent.Navigate(page);
 		}
 
-		public override void Unload()
+		public override void Dispose()
 		{
-			base.Unload();
-			TabContent.Close();
+			base.Dispose();
+			TabContent.Dispose();
 		}
 
 		private void TabContent_OnCloseRequested()