Browse Source

make singleview lifetimes private classes.

pull/7756/head
Dan Walmsley 4 years ago
parent
commit
61744546a8
  1. 21
      src/Android/Avalonia.Android/AndroidPlatform.cs
  2. 11
      src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
  3. 16
      src/iOS/Avalonia.iOS/SingleViewLifetime.cs

21
src/Android/Avalonia.Android/AndroidPlatform.cs

@ -1,5 +1,6 @@
using System;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Android;
using Avalonia.Android.Platform;
using Avalonia.Android.Platform.Input;
@ -15,19 +16,19 @@ using Avalonia.Skia;
namespace Avalonia
{
public class SingleViewLifetime : ISingleViewApplicationLifetime
public static class AndroidApplicationExtensions
{
public AvaloniaView View;
public Control MainView
class SingleViewLifetime : ISingleViewApplicationLifetime
{
get => (Control)View.Content;
set => View.Content = value;
public AvaloniaView View;
public Control MainView
{
get => (Control)View.Content;
set => View.Content = value;
}
}
}
public static class AndroidApplicationExtensions
{
public static T UseAndroid<T>(this T builder) where T : AppBuilderBase<T>, new()
{
var options = AvaloniaLocator.Current.GetService<AndroidPlatformOptions>() ?? new AndroidPlatformOptions();

11
src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs

@ -6,6 +6,17 @@ namespace Avalonia.iOS
public class AvaloniaAppDelegate<TApp> : UIResponder, IUIApplicationDelegate
where TApp : Application, new()
{
class SingleViewLifetime : ISingleViewApplicationLifetime
{
public AvaloniaView View;
public Control MainView
{
get => View.Content;
set => View.Content = value;
}
}
protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder.UseiOS();
[Export("window")]

16
src/iOS/Avalonia.iOS/SingleViewLifetime.cs

@ -1,16 +0,0 @@
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
namespace Avalonia.iOS
{
public class SingleViewLifetime : ISingleViewApplicationLifetime
{
public AvaloniaView View;
public Control MainView
{
get => View.Content;
set => View.Content = value;
}
}
}
Loading…
Cancel
Save