diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs index ed1b43cf3e..baa13419f1 100644 --- a/src/Android/Avalonia.Android/AndroidPlatform.cs +++ b/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(this T builder) where T : AppBuilderBase, new() { var options = AvaloniaLocator.Current.GetService() ?? new AndroidPlatformOptions(); diff --git a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs index 55afe72a25..6f1cf8f8f9 100644 --- a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs +++ b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs @@ -6,6 +6,17 @@ namespace Avalonia.iOS public class AvaloniaAppDelegate : 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")] diff --git a/src/iOS/Avalonia.iOS/SingleViewLifetime.cs b/src/iOS/Avalonia.iOS/SingleViewLifetime.cs deleted file mode 100644 index 16cbcaace4..0000000000 --- a/src/iOS/Avalonia.iOS/SingleViewLifetime.cs +++ /dev/null @@ -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; - } - } -}