Browse Source

Merge pull request #11204 from AvaloniaUI/refactor/standardassetloader-public

Make StandardAssetLoader public/unstable.
pull/11274/head
Max Katz 3 years ago
committed by GitHub
parent
commit
65b3994d87
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/Avalonia.Base/Platform/StandardAssetLoader.cs

8
src/Avalonia.Base/Platform/StandardAssetLoader.cs

@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Avalonia.Metadata;
using Avalonia.Platform.Internal; using Avalonia.Platform.Internal;
using Avalonia.Utilities; using Avalonia.Utilities;
@ -12,12 +13,13 @@ namespace Avalonia.Platform;
/// <summary> /// <summary>
/// Loads assets compiled into the application binary. /// Loads assets compiled into the application binary.
/// </summary> /// </summary>
internal class StandardAssetLoader : IAssetLoader [Unstable("StandardAssetLoader is considered unstable. Please use AssetLoader static class instead.")]
public class StandardAssetLoader : IAssetLoader
{ {
private readonly IAssemblyDescriptorResolver _assemblyDescriptorResolver; private readonly IAssemblyDescriptorResolver _assemblyDescriptorResolver;
private AssemblyDescriptor? _defaultResmAssembly; private AssemblyDescriptor? _defaultResmAssembly;
public StandardAssetLoader(IAssemblyDescriptorResolver resolver, Assembly? assembly = null) internal StandardAssetLoader(IAssemblyDescriptorResolver resolver, Assembly? assembly = null)
{ {
if (assembly == null) if (assembly == null)
assembly = Assembly.GetEntryAssembly(); assembly = Assembly.GetEntryAssembly();
@ -153,6 +155,8 @@ internal class StandardAssetLoader : IAssetLoader
return Enumerable.Empty<Uri>(); return Enumerable.Empty<Uri>();
} }
public static void RegisterResUriParsers() => AssetLoader.RegisterResUriParsers();
private bool TryGetAsset(Uri uri, Uri? baseUri, [NotNullWhen(true)] out IAssetDescriptor? assetDescriptor) private bool TryGetAsset(Uri uri, Uri? baseUri, [NotNullWhen(true)] out IAssetDescriptor? assetDescriptor)
{ {
assetDescriptor = null; assetDescriptor = null;

Loading…
Cancel
Save