Better fit to content webview

Guerra24 · Nov 10, 2024 · cf41bc3 · cf41bc3
1 parent 9b7a11f
commit cf41bc3
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 46 deletions.
diff --git a/LRReader.Shared/LRReader.Shared.csproj b/LRReader.Shared/LRReader.Shared.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;uap10.0.17763</TargetFrameworks>
     <Nullable>enable</Nullable>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <ExtrasUwpMetaPackageVersion>6.2.14</ExtrasUwpMetaPackageVersion>
     <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
@@ -27,7 +27,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="RestSharp" Version="112.1.0" />
-    <PackageReference Include="RestSharp.Serializers.NewtonsoftJson" Version="112.1.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
   </ItemGroup>
 

diff --git a/LRReader.Shared/Services/Api.cs b/LRReader.Shared/Services/Api.cs
@@ -3,7 +3,6 @@
 using Microsoft.AppCenter.Crashes;
 #endif
 using RestSharp;
-using RestSharp.Serializers.NewtonsoftJson;
 using System;
 using System.Text;
 using System.Threading.Tasks;
@@ -33,7 +32,7 @@ public bool RefreshSettings(ServerProfile profile)
 				return false;
 			var options = new RestClientOptions(profile.ServerAddress) { UserAgent = "LRReader" };
 			Client?.Dispose();
-			Client = new RestClient(options, configureSerialization: s => s.UseNewtonsoftJson(), useClientFactory: true);
+			Client = new RestClient(options, useClientFactory: true);
 			if (!string.IsNullOrEmpty(profile.ServerApiKey))
 			{
 				var base64Key = Convert.ToBase64String(Encoding.UTF8.GetBytes(profile.ServerApiKey));

diff --git a/LRReader.Shared/Services/Updates.cs b/LRReader.Shared/Services/Updates.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using LRReader.Shared.Models;
 using RestSharp;
-using RestSharp.Serializers.NewtonsoftJson;
 
 namespace LRReader.Shared.Services
 {
@@ -29,7 +28,7 @@ public UpdatesService(PlatformService platform, ISettingsStorageService settings
 			var uri = new Uri("https://api.guerra24.net/");
 #endif
 			var options = new RestClientOptions(uri) { UserAgent = "LRReader" };
-			client = new RestClient(options, configureSerialization: s => s.UseNewtonsoftJson());
+			client = new RestClient(options);
 		}
 
 		public abstract Task<CheckForUpdatesResult> CheckForUpdates();

diff --git a/LRReader.Shared/packages.lock.json b/LRReader.Shared/packages.lock.json
@@ -93,16 +93,6 @@
           "System.Text.Json": "8.0.4"
         }
       },
-      "RestSharp.Serializers.NewtonsoftJson": {
-        "type": "Direct",
-        "requested": "[112.1.0, )",
-        "resolved": "112.1.0",
-        "contentHash": "d/Ro5KeCKw2p0XVQrAKG0CUiG6VO4YeXLxIm5sHj8fwaIk2IlrtMOKoJJprsEUyJfq1Z9Qv8E1yN2rPFPuRVzw==",
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.3",
-          "RestSharp": "112.1.0"
-        }
-      },
       "SixLabors.ImageSharp": {
         "type": "Direct",
         "requested": "[2.1.9, )",
@@ -546,16 +536,6 @@
           "System.Text.Json": "8.0.4"
         }
       },
-      "RestSharp.Serializers.NewtonsoftJson": {
-        "type": "Direct",
-        "requested": "[112.1.0, )",
-        "resolved": "112.1.0",
-        "contentHash": "d/Ro5KeCKw2p0XVQrAKG0CUiG6VO4YeXLxIm5sHj8fwaIk2IlrtMOKoJJprsEUyJfq1Z9Qv8E1yN2rPFPuRVzw==",
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.3",
-          "RestSharp": "112.1.0"
-        }
-      },
       "SixLabors.ImageSharp": {
         "type": "Direct",
         "requested": "[2.1.9, )",

diff --git a/LRReader.UWP/Extensions/Extensions.cs b/LRReader.UWP/Extensions/Extensions.cs
@@ -117,15 +117,14 @@ public static class WebViewExt
 
 		private static readonly MarkdownPipeline pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
 
-		public static void SetMarkdown(WebView webView, string markdown)
+		public static void SetMarkdown(this WebView webView, string markdown)
 		{
 			webView.SetValue(MarkdownProperty, markdown);
 			if (!(bool)webView.GetValue(MarkdownReadyProperty))
 			{
-				webView.NavigationCompleted += async (sender, args) =>
+				webView.ScriptNotify += (sender, args) =>
 				{
-					var heightString = await webView.InvokeScriptAsync("eval", new[] { "document.body.scrollHeight.toString()" });
-					if (int.TryParse(heightString, out var height))
+					if (double.TryParse(args.Value, out var height))
 						webView.Height = height;
 				};
 				webView.SetValue(MarkdownReadyProperty, true);
@@ -139,7 +138,51 @@ public static void SetMarkdownBase(this WebView webView, string markdown)
 			var color = (Color)Application.Current.Resources["TextFillColorPrimary"];
 			var selectedColor = (Color)Application.Current.Resources["TextOnAccentFillColorSelectedText"];
 			var selectedBg = (Color)Application.Current.Resources["SystemAccentColor"];
-			webView.NavigateToString($"<!DOCTYPE html><html><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><title>md</title><style>body{{font-family: \"Segoe UI\"; font-size: 14px; color: #{color.R:X2}{color.G:X2}{color.B:X2}; margin: 0;}} ::selection{{color: #{selectedColor.R:X2}{selectedColor.G:X2}{selectedColor.B:X2}; background-color: #{selectedBg.R:X2}{selectedBg.G:X2}{selectedBg.B:X2};}} img {{max-width: 80%;}}</style></head><body>{Markdown.ToHtml(markdown, pipeline)}</body></html>");
+			webView.NavigateToString($$"""
+				<!DOCTYPE html>
+				<html>
+				<head>
+					<meta charset="UTF-8">
+					<meta name="viewport" content="width=device-width, initial-scale=1.0">
+					<title>md</title>
+					<style>
+						body {
+							font-family: "Segoe UI";
+							font-size: 14px;
+							color: #{{color.R:X2}}{{color.G:X2}}{{color.B:X2}};
+							margin: 0;
+						}
+						::selection {
+							color: #{{selectedColor.R:X2}}{{selectedColor.G:X2}}{{selectedColor.B:X2}};
+							background-color: #{{selectedBg.R:X2}}{{selectedBg.G:X2}}{{selectedBg.B:X2}};
+						}
+						img {
+							max-width: 80%;
+						}
+						* {
+							box-sizing: border-box;
+						}
+					</style>
+					<script>
+						window.addEventListener("resize", () => {
+							const rect = document.querySelector('html').getBoundingClientRect();
+							window.external.notify(rect.height.toString());
+						});
+						document.addEventListener("DOMContentLoaded", (event) => {
+							const rect = document.querySelector('html').getBoundingClientRect();
+							window.external.notify(rect.height.toString());
+							requestAnimationFrame(() => {
+								const rect = document.querySelector('html').getBoundingClientRect();
+								window.external.notify(rect.height.toString());
+							});
+						});
+					</script>
+				</head>
+				<body>
+					{{Markdown.ToHtml(markdown, pipeline)}}
+				</body>
+				</html>
+				""");
 			webView.NavigationStarting += (sender, args) =>
 			{
 				args.Cancel = true;

diff --git a/LRReader.UWP/LRReader.UWP.csproj b/LRReader.UWP/LRReader.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>LRReader.UWP</AssemblyName>
     <DefaultLanguage>en</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.26100.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -30,7 +30,7 @@
     <AppxPackageSigningTimestampServerUrl>http://timestamp.digicert.com</AppxPackageSigningTimestampServerUrl>
     <Win32Resource>Resources\MiddleClickScrolling-CursorType.res</Win32Resource>
     <Nullable>enable</Nullable>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

diff --git a/LRReader.UWP/Views/Dialogs/MarkdownDialog.xaml b/LRReader.UWP/Views/Dialogs/MarkdownDialog.xaml
@@ -23,7 +23,7 @@
 									MinHeight="{ThemeResource ContentDialogMinHeight}"
 									MaxWidth="670"
 									MaxHeight="{ThemeResource ContentDialogMaxHeight}"
-									HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+									HorizontalAlignment="Stretch" VerticalAlignment="Center"
 									Background="{TemplateBinding Background}"
 									BackgroundSizing="InnerBorderEdge"
 									BorderBrush="{TemplateBinding BorderBrush}"
@@ -267,5 +267,5 @@
 		</Style>
 	</ContentDialog.Resources>
 
-	<WebView x:Name="WebView" DefaultBackgroundColor="Transparent" />
+	<WebView x:Name="WebView" MaxHeight="612" DefaultBackgroundColor="Transparent" />
 </ContentDialog>
diff --git a/LRReader.UWP/Views/Dialogs/MarkdownDialog.xaml.cs b/LRReader.UWP/Views/Dialogs/MarkdownDialog.xaml.cs
@@ -10,7 +10,7 @@ public MarkdownDialog(string title, string text)
 		{
 			this.InitializeComponent();
 			this.Title = title;
-			WebView.SetMarkdownBase(text);
+			WebView.SetMarkdown(text);
 		}
 	}
 }
diff --git a/LRReader.UWP/packages.lock.json b/LRReader.UWP/packages.lock.json
@@ -400,15 +400,6 @@
           "System.Text.Json": "8.0.4"
         }
       },
-      "RestSharp.Serializers.NewtonsoftJson": {
-        "type": "Transitive",
-        "resolved": "112.1.0",
-        "contentHash": "d/Ro5KeCKw2p0XVQrAKG0CUiG6VO4YeXLxIm5sHj8fwaIk2IlrtMOKoJJprsEUyJfq1Z9Qv8E1yN2rPFPuRVzw==",
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.3",
-          "RestSharp": "112.1.0"
-        }
-      },
       "runtime.win10-arm.Microsoft.Net.Native.Compiler": {
         "type": "Transitive",
         "resolved": "2.2.12-rel-31116-00",
@@ -628,7 +619,6 @@
           "NReco.Logging.File": "[1.2.1, )",
           "Newtonsoft.Json": "[13.0.3, )",
           "RestSharp": "[112.1.0, )",
-          "RestSharp.Serializers.NewtonsoftJson": "[112.1.0, )",
           "SixLabors.ImageSharp": "[2.1.9, )"
         }
       }