Max Katz
3 years ago
39 changed files with 390 additions and 510 deletions
@ -0,0 +1,26 @@ |
|||||
|
using System; |
||||
|
using System.Runtime.InteropServices; |
||||
|
|
||||
|
namespace Avalonia.Compatibility |
||||
|
{ |
||||
|
internal sealed class OperatingSystemEx |
||||
|
{ |
||||
|
#if NET6_0_OR_GREATER
|
||||
|
public static bool IsWindows() => OperatingSystem.IsWindows(); |
||||
|
public static bool IsMacOS() => OperatingSystem.IsMacOS(); |
||||
|
public static bool IsLinux() => OperatingSystem.IsLinux(); |
||||
|
public static bool IsAndroid() => OperatingSystem.IsAndroid(); |
||||
|
public static bool IsIOS() => OperatingSystem.IsIOS(); |
||||
|
public static bool IsBrowser() => OperatingSystem.IsBrowser(); |
||||
|
public static bool IsOSPlatform(string platform) => OperatingSystem.IsOSPlatform(platform); |
||||
|
#else
|
||||
|
public static bool IsWindows() => RuntimeInformation.IsOSPlatform(OSPlatform.Windows); |
||||
|
public static bool IsMacOS() => RuntimeInformation.IsOSPlatform(OSPlatform.OSX); |
||||
|
public static bool IsLinux() => RuntimeInformation.IsOSPlatform(OSPlatform.Linux); |
||||
|
public static bool IsAndroid() => IsOSPlatform("ANDROID"); |
||||
|
public static bool IsIOS() => IsOSPlatform("IOS"); |
||||
|
public static bool IsBrowser() => IsOSPlatform("BROWSER"); |
||||
|
public static bool IsOSPlatform(string platform) => RuntimeInformation.IsOSPlatform(OSPlatform.Create(platform)); |
||||
|
#endif
|
||||
|
} |
||||
|
} |
||||
@ -1,244 +0,0 @@ |
|||||
using System; |
|
||||
using System.Diagnostics.CodeAnalysis; |
|
||||
using System.Reflection; |
|
||||
using System.Linq; |
|
||||
using Avalonia.Controls.ApplicationLifetimes; |
|
||||
using Avalonia.Platform; |
|
||||
|
|
||||
namespace Avalonia.Controls |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// Base class for initializing platform-specific services for an <see cref="Application"/>.
|
|
||||
/// </summary>
|
|
||||
/// <typeparam name="TAppBuilder">The type of the AppBuilder class itself.</typeparam>
|
|
||||
public abstract class AppBuilderBase<TAppBuilder> where TAppBuilder : AppBuilderBase<TAppBuilder>, new() |
|
||||
{ |
|
||||
private static bool s_setupWasAlreadyCalled; |
|
||||
private Action? _optionsInitializers; |
|
||||
private Func<Application>? _appFactory; |
|
||||
private IApplicationLifetime? _lifetime; |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets or sets the <see cref="IRuntimePlatform"/> instance.
|
|
||||
/// </summary>
|
|
||||
public IRuntimePlatform RuntimePlatform { get; set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets or sets a method to call the initialize the runtime platform services (e. g. AssetLoader)
|
|
||||
/// </summary>
|
|
||||
public Action RuntimePlatformServicesInitializer { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets the <see cref="Application"/> instance being initialized.
|
|
||||
/// </summary>
|
|
||||
public Application? Instance { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets the type of the Instance (even if it's not created yet)
|
|
||||
/// </summary>
|
|
||||
public Type? ApplicationType { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets or sets a method to call the initialize the windowing subsystem.
|
|
||||
/// </summary>
|
|
||||
public Action? WindowingSubsystemInitializer { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets the name of the currently selected windowing subsystem.
|
|
||||
/// </summary>
|
|
||||
public string? WindowingSubsystemName { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets or sets a method to call the initialize the windowing subsystem.
|
|
||||
/// </summary>
|
|
||||
public Action? RenderingSubsystemInitializer { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets the name of the currently selected rendering subsystem.
|
|
||||
/// </summary>
|
|
||||
public string? RenderingSubsystemName { get; private set; } |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Gets or sets a method to call after the <see cref="Application"/> is setup.
|
|
||||
/// </summary>
|
|
||||
public Action<TAppBuilder> AfterSetupCallback { get; private set; } = builder => { }; |
|
||||
|
|
||||
|
|
||||
public Action<TAppBuilder> AfterPlatformServicesSetupCallback { get; private set; } = builder => { }; |
|
||||
|
|
||||
protected AppBuilderBase(IRuntimePlatform platform, Action<TAppBuilder> platformServices) |
|
||||
{ |
|
||||
RuntimePlatform = platform; |
|
||||
RuntimePlatformServicesInitializer = () => platformServices((TAppBuilder)this); |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Begin configuring an <see cref="Application"/>.
|
|
||||
/// </summary>
|
|
||||
/// <typeparam name="TApp">The subclass of <see cref="Application"/> to configure.</typeparam>
|
|
||||
/// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
|
|
||||
public static TAppBuilder Configure<TApp>() |
|
||||
where TApp : Application, new() |
|
||||
{ |
|
||||
return new TAppBuilder() |
|
||||
{ |
|
||||
ApplicationType = typeof(TApp), |
|
||||
// Needed for CoreRT compatibility
|
|
||||
_appFactory = () => new TApp() |
|
||||
}; |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Begin configuring an <see cref="Application"/>.
|
|
||||
/// </summary>
|
|
||||
/// <param name="appFactory">Factory function for <typeparamref name="TApp"/>.</param>
|
|
||||
/// <typeparam name="TApp">The subclass of <see cref="Application"/> to configure.</typeparam>
|
|
||||
/// <remarks><paramref name="appFactory"/> is useful for passing of dependencies to <typeparamref name="TApp"/>.</remarks>
|
|
||||
/// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
|
|
||||
public static TAppBuilder Configure<TApp>(Func<TApp> appFactory) |
|
||||
where TApp : Application |
|
||||
{ |
|
||||
return new TAppBuilder() |
|
||||
{ |
|
||||
ApplicationType = typeof(TApp), |
|
||||
_appFactory = appFactory |
|
||||
}; |
|
||||
} |
|
||||
|
|
||||
protected TAppBuilder Self => (TAppBuilder)this; |
|
||||
|
|
||||
public TAppBuilder AfterSetup(Action<TAppBuilder> callback) |
|
||||
{ |
|
||||
AfterSetupCallback = (Action<TAppBuilder>)Delegate.Combine(AfterSetupCallback, callback); |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
|
|
||||
public TAppBuilder AfterPlatformServicesSetup(Action<TAppBuilder> callback) |
|
||||
{ |
|
||||
AfterPlatformServicesSetupCallback = (Action<TAppBuilder>)Delegate.Combine(AfterPlatformServicesSetupCallback, callback); |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
public delegate void AppMainDelegate(Application app, string[] args); |
|
||||
|
|
||||
public void Start(AppMainDelegate main, string[] args) |
|
||||
{ |
|
||||
Setup(); |
|
||||
main(Instance!, args); |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Sets up the platform-specific services for the application, but does not run it.
|
|
||||
/// </summary>
|
|
||||
/// <returns></returns>
|
|
||||
public TAppBuilder SetupWithoutStarting() |
|
||||
{ |
|
||||
Setup(); |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Sets up the platform-specific services for the application and initialized it with a particular lifetime, but does not run it.
|
|
||||
/// </summary>
|
|
||||
/// <param name="lifetime"></param>
|
|
||||
/// <returns></returns>
|
|
||||
public TAppBuilder SetupWithLifetime(IApplicationLifetime lifetime) |
|
||||
{ |
|
||||
_lifetime = lifetime; |
|
||||
Setup(); |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Specifies a windowing subsystem to use.
|
|
||||
/// </summary>
|
|
||||
/// <param name="initializer">The method to call to initialize the windowing subsystem.</param>
|
|
||||
/// <param name="name">The name of the windowing subsystem.</param>
|
|
||||
/// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
|
|
||||
public TAppBuilder UseWindowingSubsystem(Action initializer, string name = "") |
|
||||
{ |
|
||||
WindowingSubsystemInitializer = initializer; |
|
||||
WindowingSubsystemName = name; |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Specifies a rendering subsystem to use.
|
|
||||
/// </summary>
|
|
||||
/// <param name="initializer">The method to call to initialize the rendering subsystem.</param>
|
|
||||
/// <param name="name">The name of the rendering subsystem.</param>
|
|
||||
/// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
|
|
||||
public TAppBuilder UseRenderingSubsystem(Action initializer, string name = "") |
|
||||
{ |
|
||||
RenderingSubsystemInitializer = initializer; |
|
||||
RenderingSubsystemName = name; |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
protected virtual bool CheckSetup => true; |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Configures platform-specific options
|
|
||||
/// </summary>
|
|
||||
public TAppBuilder With<T>(T options) |
|
||||
{ |
|
||||
_optionsInitializers += () => { AvaloniaLocator.CurrentMutable.Bind<T>().ToConstant(options); }; |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Configures platform-specific options
|
|
||||
/// </summary>
|
|
||||
public TAppBuilder With<T>(Func<T> options) |
|
||||
{ |
|
||||
_optionsInitializers += () => { AvaloniaLocator.CurrentMutable.Bind<T>().ToFunc(options); }; |
|
||||
return Self; |
|
||||
} |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Sets up the platform-specific services for the <see cref="Application"/>.
|
|
||||
/// </summary>
|
|
||||
private void Setup() |
|
||||
{ |
|
||||
if (RuntimePlatformServicesInitializer == null) |
|
||||
{ |
|
||||
throw new InvalidOperationException("No runtime platform services configured."); |
|
||||
} |
|
||||
|
|
||||
if (WindowingSubsystemInitializer == null) |
|
||||
{ |
|
||||
throw new InvalidOperationException("No windowing system configured."); |
|
||||
} |
|
||||
|
|
||||
if (RenderingSubsystemInitializer == null) |
|
||||
{ |
|
||||
throw new InvalidOperationException("No rendering system configured."); |
|
||||
} |
|
||||
|
|
||||
if (_appFactory == null) |
|
||||
{ |
|
||||
throw new InvalidOperationException("No Application factory configured."); |
|
||||
} |
|
||||
|
|
||||
if (s_setupWasAlreadyCalled && CheckSetup) |
|
||||
{ |
|
||||
throw new InvalidOperationException("Setup was already called on one of AppBuilder instances"); |
|
||||
} |
|
||||
|
|
||||
s_setupWasAlreadyCalled = true; |
|
||||
_optionsInitializers?.Invoke(); |
|
||||
RuntimePlatformServicesInitializer(); |
|
||||
RenderingSubsystemInitializer(); |
|
||||
WindowingSubsystemInitializer(); |
|
||||
AfterPlatformServicesSetupCallback(Self); |
|
||||
Instance = _appFactory(); |
|
||||
Instance.ApplicationLifetime = _lifetime; |
|
||||
AvaloniaLocator.CurrentMutable.BindToSelf(Instance); |
|
||||
Instance.RegisterServices(); |
|
||||
Instance.Initialize(); |
|
||||
AfterSetupCallback(Self); |
|
||||
Instance.OnFrameworkInitializationCompleted(); |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
@ -1,75 +0,0 @@ |
|||||
using Avalonia.Controls; |
|
||||
using Avalonia.Platform; |
|
||||
using Xunit; |
|
||||
|
|
||||
namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions; |
|
||||
|
|
||||
public class OnPlatformExtensionTests : XamlTestBase |
|
||||
{ |
|
||||
[Fact] |
|
||||
public void Should_Resolve_Default_Value() |
|
||||
{ |
|
||||
using (AvaloniaLocator.EnterScope()) |
|
||||
{ |
|
||||
AvaloniaLocator.CurrentMutable.Bind<IRuntimePlatform>() |
|
||||
.ToConstant(new TestRuntimePlatform(OperatingSystemType.Unknown)); |
|
||||
|
|
||||
var xaml = @"
|
|
||||
<UserControl xmlns='https://github.com/avaloniaui'
|
|
||||
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
||||
<TextBlock Text='{OnPlatform Default=""Hello World""}'/> |
|
||||
</UserControl>";
|
|
||||
|
|
||||
var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml); |
|
||||
var textBlock = (TextBlock)userControl.Content!; |
|
||||
|
|
||||
Assert.Equal("Hello World", textBlock.Text); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
[Theory] |
|
||||
[InlineData(OperatingSystemType.WinNT, "Im Windows")] |
|
||||
[InlineData(OperatingSystemType.OSX, "Im macOS")] |
|
||||
[InlineData(OperatingSystemType.Linux, "Im Linux")] |
|
||||
[InlineData(OperatingSystemType.Android, "Im Android")] |
|
||||
[InlineData(OperatingSystemType.iOS, "Im iOS")] |
|
||||
[InlineData(OperatingSystemType.Browser, "Im Browser")] |
|
||||
[InlineData(OperatingSystemType.Unknown, "Default value")] |
|
||||
public void Should_Resolve_Expected_Value_Per_Platform(OperatingSystemType currentPlatform, string expectedResult) |
|
||||
{ |
|
||||
using (AvaloniaLocator.EnterScope()) |
|
||||
{ |
|
||||
AvaloniaLocator.CurrentMutable.Bind<IRuntimePlatform>() |
|
||||
.ToConstant(new TestRuntimePlatform(currentPlatform)); |
|
||||
|
|
||||
var xaml = @"
|
|
||||
<UserControl xmlns='https://github.com/avaloniaui'
|
|
||||
xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
|
|
||||
<TextBlock Text='{OnPlatform ""Default value"", |
|
||||
Windows=""Im Windows"", macOS=""Im macOS"", |
|
||||
Linux=""Im Linux"", Android=""Im Android"", |
|
||||
iOS=""Im iOS"", Browser=""Im Browser""}'/> |
|
||||
</UserControl>";
|
|
||||
|
|
||||
var userControl = (UserControl)AvaloniaRuntimeXamlLoader.Load(xaml); |
|
||||
var textBlock = (TextBlock)userControl.Content!; |
|
||||
|
|
||||
Assert.Equal(expectedResult, textBlock.Text); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
private class TestRuntimePlatform : StandardRuntimePlatform |
|
||||
{ |
|
||||
private readonly OperatingSystemType _operatingSystemType; |
|
||||
|
|
||||
public TestRuntimePlatform(OperatingSystemType operatingSystemType) |
|
||||
{ |
|
||||
_operatingSystemType = operatingSystemType; |
|
||||
} |
|
||||
|
|
||||
public override RuntimePlatformInfo GetRuntimeInfo() |
|
||||
{ |
|
||||
return new RuntimePlatformInfo() { OperatingSystem = _operatingSystemType }; |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
Loading…
Reference in new issue