- fix ios/android

dotnet · Jul 21, 2021 · 1535bfc · 1535bfc
1 parent be2bca3
commit 1535bfc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.Android.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.Android.cs
@@ -1,12 +1,6 @@
-#nullable enable
-using Microsoft.Maui.Controls.Compatibility.Platform.Android;
-using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
-using Microsoft.Maui.Graphics.Native;
-using FrameRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers.FrameRenderer;
-using LabelRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers.LabelRenderer;
-using ImageRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers.ImageRenderer;
-using ButtonRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers.ButtonRenderer;
-using DefaultRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Android.Platform.DefaultRenderer;
+using Microsoft.Maui.LifecycleEvents;
+using Microsoft.Maui.Hosting;
+using Microsoft.Maui.Controls.Compatibility;
 
 namespace Microsoft.Maui.Controls.Hosting
 {
@@ -15,7 +9,7 @@ public static partial class AppHostBuilderExtensions
 		internal static IAppHostBuilder ConfigureCompatibilityLifecycleEvents(this IAppHostBuilder builder) =>
 			   builder.ConfigureLifecycleEvents(events => events.AddAndroid(OnConfigureLifeCycle));
 
-		static void OnConfigureLifeCycle(IAndroidLifecycleBuilder windows)
+		static void OnConfigureLifeCycle(IAndroidLifecycleBuilder android)
 		{
 			android
 				.OnApplicationCreating((app) =>
@@ -36,7 +30,7 @@ static void OnConfigureLifeCycle(IAndroidLifecycleBuilder windows)
 
 					var state = new ActivationState(mauiContext);
 					Forms.Init(state);
-				}));
+				});
 		}
 	}
 }
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.iOS.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.iOS.cs
@@ -1,12 +1,6 @@
-#nullable enable
-using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
-using Microsoft.Maui.Graphics.Native;
-using WebViewRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.WkWebViewRenderer;
-using NavigationPageRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.NavigationRenderer;
-using TabbedPageRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.TabbedRenderer;
-using FlyoutPageRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.PhoneFlyoutPageRenderer;
-using RadioButtonRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.Platform.DefaultRenderer;
-using DefaultRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.Platform.DefaultRenderer;
+using Microsoft.Maui.Hosting;
+using Microsoft.Maui.LifecycleEvents;
+using Microsoft.Maui.Controls.Compatibility;
 
 namespace Microsoft.Maui.Controls.Hosting
 {

diff --git a/src/Controls/src/Core/HandlerImpl/Window.Impl.cs b/src/Controls/src/Core/HandlerImpl/Window.Impl.cs
@@ -53,6 +53,7 @@ public Page? Page
 		public event EventHandler<ModalPushedEventArgs>? ModalPushed;
 		public event EventHandler<ModalPushingEventArgs>? ModalPushing;
 		public event EventHandler? PopCanceled;
+
 		public event EventHandler? Created;
 		public event EventHandler? Activated;
 		public event EventHandler? Deactivated;