revert font packaging changes and document preload guidance

Agent-Logs-Url: https://github.com/MudBlazor/MudBlazor.Icons/sessions/4c3c5150-d93a-4655-9c4c-44609d45003f

Co-authored-by: ScarletKuro <19953225+ScarletKuro@users.noreply.github.com>

Author: Copilot

documentation/material_symbols_usage.md

@@ -15,12 +15,25 @@ To use the icons in your MudBlazor project, you can add the following CSS link t
 <link href="_content/MudBlazor.FontIcons.MaterialSymbols/css/font.min.css" rel="stylesheet" />
 ```
 
-The package is self-hosted and serves its font assets from `_content/MudBlazor.FontIcons.MaterialSymbols/`.
-
-For above-the-fold icons, preloading the style(s) you use can reduce first-paint delay:
+To reduce first-load flicker, preload the Material Symbols font files before loading the stylesheet:
 
 ```html
-<link rel="preload" href="_content/MudBlazor.FontIcons.MaterialSymbols/font/MaterialSymbolsRounded.woff2" as="font" type="font/woff2" crossorigin />
+<link rel="preload"
+      href="_content/MudBlazor.FontIcons.MaterialSymbols/font/MaterialSymbolsRounded.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin>
+<link rel="preload"
+      href="_content/MudBlazor.FontIcons.MaterialSymbols/font/MaterialSymbolsOutlined.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin>
+<link rel="preload"
+      href="_content/MudBlazor.FontIcons.MaterialSymbols/font/MaterialSymbolsSharp.woff2"
+      as="font"
+      type="font/woff2"
+      crossorigin>
+<link href="_content/MudBlazor.FontIcons.MaterialSymbols/css/font.min.css" rel="stylesheet" />
 ```
 
 Alternatively, you can use the following CDN links:
@@ -56,10 +69,3 @@ This allows you to access the icons like this:
 ```
 
 **NB!** Please note that aliases do not work in normal Razor pages (https://github.com/dotnet/razor/issues/7670)!
-
-## Loading tradeoffs
-
-Material Symbols constants in this package are ligature-based strings (for example the ligature name `weight`).
-Ligature rendering can still show readable fallback text briefly on very first load in some environments.
-
-If your UI requires a strict "never show fallback text" behavior, prefer SVG icons.

src/GoogleMaterialDesignIconsGenerator/Service/IconHttpClientService.cs

@@ -1,22 +1,20 @@
 using System.Text.Json;
-using System.Text.RegularExpressions;
 using GoogleMaterialDesignIconsGenerator.Model.Google;
 
 namespace GoogleMaterialDesignIconsGenerator.Service;
 
 public class IconHttpClientService : IDisposable
 {
     public const string GoogleFontUrl = "http://fonts.google.com/";
-    public const string GoogleFontsCssApiUrl = "https://fonts.googleapis.com/css2";
-    private static readonly Regex Woff2UrlRegex = new(@"url\((['""]?)(?<href>https://[^)'""]+?\.woff2)\1\)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+    public const string GoogleMaterialDesignIconsRawUrl = "https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/";
 
     private readonly HttpClient _httpClient;
     private readonly JsonSerializerOptions _jsonSerializerOptions;
-    private static readonly (string FamilyName, string TargetFileName)[] MaterialSymbolsFontFiles =
+    private static readonly (string SourceFileName, string TargetFileName)[] MaterialSymbolsFontFiles =
     [
-        ("Material Symbols Outlined", "MaterialSymbolsOutlined.woff2"),
-        ("Material Symbols Rounded", "MaterialSymbolsRounded.woff2"),
-        ("Material Symbols Sharp", "MaterialSymbolsSharp.woff2")
+        ("MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2", "MaterialSymbolsOutlined.woff2"),
+        ("MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2", "MaterialSymbolsRounded.woff2"),
+        ("MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2", "MaterialSymbolsSharp.woff2")
     ];
 
     public IconHttpClientService()
@@ -25,7 +23,6 @@ public IconHttpClientService()
         {
             BaseAddress = new Uri(GoogleFontUrl)
         };
-        _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (compatible; MudBlazor.FontIcons.MaterialSymbols generator)");
         _jsonSerializerOptions = new JsonSerializerOptions
         {
             TypeInfoResolver = IconMetadataJsonSerializerContext.Default
@@ -63,52 +60,22 @@ public async Task DownloadMaterialSymbolsFontsAsync(string destinationFolderPath
             throw new InvalidOperationException($"Failed to prepare destination folder '{destinationFolderPath}' for Material Symbols fonts.", ex);
         }
 
-        foreach (var (familyName, targetFileName) in MaterialSymbolsFontFiles)
+        foreach (var (sourceFileName, targetFileName) in MaterialSymbolsFontFiles)
         {
+            var fileUrl = new Uri(new Uri(GoogleMaterialDesignIconsRawUrl), Uri.EscapeDataString(sourceFileName));
             try
             {
-                var cssFileUrl = BuildMaterialSymbolsCssUri(familyName);
-                var cssContent = await _httpClient.GetStringAsync(cssFileUrl, cancellationToken).ConfigureAwait(false);
-                var fileUrl = ResolveWoff2Url(cssContent, familyName);
                 var fileContent = await _httpClient.GetByteArrayAsync(fileUrl, cancellationToken).ConfigureAwait(false);
                 var destinationPath = Path.Combine(destinationFolderPath, targetFileName);
                 await File.WriteAllBytesAsync(destinationPath, fileContent, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception ex) when (ex is HttpRequestException or IOException)
             {
-                throw new InvalidOperationException($"Failed to download and save Material Symbols font for '{familyName}'.", ex);
+                throw new InvalidOperationException($"Failed to download and save Material Symbols font '{sourceFileName}' from '{fileUrl}'.", ex);
             }
         }
     }
 
-    private static Uri BuildMaterialSymbolsCssUri(string familyName)
-    {
-        var encodedFamily = Uri.EscapeDataString(familyName);
-        return new Uri($"{GoogleFontsCssApiUrl}?family={encodedFamily}:opsz,wght,FILL,GRAD@24,400,0,0&display=block", UriKind.Absolute);
-    }
-
-    private static Uri ResolveWoff2Url(string cssContent, string familyName)
-    {
-        var match = Woff2UrlRegex.Match(cssContent);
-        if (!match.Success)
-        {
-            throw new InvalidOperationException($"Failed to resolve .woff2 URL from Google Fonts CSS for '{familyName}'.");
-        }
-
-        if (!Uri.TryCreate(match.Groups["href"].Value, UriKind.Absolute, out var uri))
-        {
-            throw new InvalidOperationException($"Resolved an invalid .woff2 URL from Google Fonts CSS for '{familyName}'.");
-        }
-
-        if (!uri.Scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase) ||
-            !uri.Host.Equals("fonts.gstatic.com", StringComparison.OrdinalIgnoreCase))
-        {
-            throw new InvalidOperationException($"Resolved an unexpected .woff2 URL host '{uri.Host}' from Google Fonts CSS for '{familyName}'.");
-        }
-
-        return uri;
-    }
-
     public void Dispose()
     {
         Dispose(true);