Add ApplicationHandler

src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs

@@ -53,7 +53,7 @@ protected override void OnCreate(Bundle bundle)
 			// reflection will stop working
 			ResourceManager.Init(null);
 
-			Microsoft.Maui.Controls.Compatibility.Forms.Init(this, bundle);
+			Forms.Init(new MauiContext(MauiApplication.Current.Services, this), bundle);
 			FormsMaps.Init(this, bundle);
 
 			ViewHandler.ViewMapper
@@ -65,7 +65,7 @@ protected override void OnCreate(Bundle bundle)
 
 			//FormsMaterial.Init(this, bundle);
 			AndroidAppLinks.Init(this);
-			Microsoft.Maui.Controls.Compatibility.Forms.ViewInitialized += (sender, e) =>
+			Forms.ViewInitialized += (sender, e) =>
 			{
 				//				if (!string.IsNullOrWhiteSpace(e.View.StyleId)) {
 				//					e.NativeView.ContentDescription = e.View.StyleId;

src/Compatibility/ControlGallery/src/Android/Issue10182Activity.cs

@@ -29,7 +29,7 @@ protected override void OnCreate(Bundle savedInstanceState)
 
 			base.OnCreate(savedInstanceState);
 
-			Microsoft.Maui.Controls.Compatibility.Forms.Init(this, savedInstanceState);
+			Forms.Init(new MauiContext(MauiApplication.Current.Services, this), savedInstanceState);
 			LoadApplication(new Issue10182Application());
 
 			_activity1 = (Activity1)DependencyService.Resolve<Context>();

src/Compatibility/Core/src/Android/AppCompat/Platform.cs

@@ -7,7 +7,6 @@
 using Android.OS;
 using Android.Views;
 using Android.Views.Animations;
-using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
@@ -329,7 +328,7 @@ public static void ClearRenderer(AView renderedView)
 					var mauiContext = Forms.MauiContext;
 
 					if (fragmentManager != null || layoutInflater != null)
-						mauiContext = new ScopedMauiContext(mauiContext, null, null, layoutInflater, fragmentManager);
+						mauiContext = mauiContext.MakeScoped(layoutInflater, fragmentManager);
 
 					handler = mauiContext.Handlers.GetHandler(element.GetType()) as IViewHandler;
 					handler.SetMauiContext(mauiContext);

src/Compatibility/Core/src/Android/Forms.cs

@@ -186,11 +186,6 @@ public static Color GetColorButtonNormal(Context context)
 		public static void Init(IActivationState activationState, InitializationOptions? options = null) =>
 			Init(activationState.Context, activationState.SavedInstance, options);
 
-		// Provide backwards compat for Forms.Init and AndroidActivity
-		// Why is bundle a param if never used?
-		public static void Init(Context activity, Bundle bundle) =>
-			Init(new MauiContext(activity), bundle);
-
 		public static void Init(IMauiContext context, Bundle bundle, InitializationOptions? options = null)
 		{
 			Assembly resourceAssembly;
@@ -204,27 +199,13 @@ public static void Init(IMauiContext context, Bundle bundle, InitializationOptio
 			Profile.FrameEnd();
 		}
 
-		public static void Init(Context activity, Bundle bundle, Assembly resourceAssembly) =>
-			Init(new MauiContext(activity), bundle, resourceAssembly);
-
 		public static void Init(IMauiContext context, Bundle bundle, Assembly resourceAssembly)
 		{
 			Profile.FrameBegin();
 			SetupInit(context, resourceAssembly, null);
 			Profile.FrameEnd();
 		}
 
-		public static void Init(InitializationOptions options)
-		{
-			Profile.FrameBegin();
-			SetupInit(
-				new MauiContext(options.Activity),
-				options.ResourceAssembly,
-				options
-			);
-			Profile.FrameEnd();
-		}
-
 		public static void SetTitleBarVisibility(Activity activity, AndroidTitleBarVisibility visibility)
 		{
 			if (visibility == AndroidTitleBarVisibility.Never)
@@ -880,11 +861,6 @@ bool TryGetTextAppearance(int appearance, out double val)
 				return false;
 			}
 
-			public void QuitApplication()
-			{
-				Internals.Log.Warning(nameof(AndroidPlatformServices), "Platform doesn't implement QuitApp");
-			}
-
 			public SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint)
 			{
 				return Platform.Android.Platform.GetNativeSize(view, widthConstraint, heightConstraint);

src/Compatibility/Core/src/Windows/Forms.cs

@@ -37,19 +37,9 @@ public static partial class Forms
 
 		public static void Init(IActivationState state, InitializationOptions? options = null)
 		{
-			SetupInit(state.Context, state.Context.Window, maybeOptions: options);
+			SetupInit(state.Context, state.Context.GetOptionalNativeWindow(), maybeOptions: options);
 		}
 
-		public static void Init(
-			UI.Xaml.Window mainWindow,
-			IEnumerable<Assembly> rendererAssemblies = null)
-		{
-			SetupInit(new MauiContext(), mainWindow, rendererAssemblies);
-		}
-
-		public static void Init(InitializationOptions options) =>
-			SetupInit(new MauiContext(), null, null, options);
-
 		static void SetupInit(
 			IMauiContext mauiContext,
 			UI.Xaml.Window mainWindow,

src/Compatibility/Core/src/Windows/WindowsBasePlatformServices.cs

@@ -177,11 +177,6 @@ void renderingFrameEventHandler(object sender, object args)
 			CompositionTarget.Rendering += renderingFrameEventHandler;
 		}
 
-		public void QuitApplication()
-		{
-			Log.Warning(nameof(WindowsBasePlatformServices), "Platform doesn't implement QuitApp");
-		}
-
 		public SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint)
 		{
 			return Platform.GetNativeSize(view, widthConstraint, heightConstraint);

src/Compatibility/Core/src/iOS/Forms.cs

@@ -168,12 +168,6 @@ internal static bool IsMojaveOrNewer
 
 		public static bool IsInitializedRenderers { get; private set; }
 
-		public static void Init() =>
-			SetupInit(new MauiContext());
-
-		public static void Init(InitializationOptions options) =>
-			SetupInit(new MauiContext(), options);
-
 		public static void Init(IActivationState activationState, InitializationOptions? options = null) =>
 			SetupInit(activationState.Context, options);
 
@@ -739,14 +733,12 @@ public Task<Stream> OpenFileAsync(string path, FileMode mode, FileAccess access,
 				}
 			}
 
+#if !__MOBILE__
 			public void QuitApplication()
 			{
-#if __MOBILE__
-				Log.Warning(nameof(IOSPlatformServices), "Platform doesn't implement QuitApp");
-#else
 				NSApplication.SharedApplication.Terminate(new NSObject());
-#endif
 			}
+#endif
 
 			public SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint)
 			{

src/Controls/samples/Controls.Sample/Pages/Core/ApplicationControlPage.xaml

@@ -0,0 +1,17 @@
+<views:BasePage
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Pages.ApplicationControlPage"
+    xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
+    Title="App Control">
+
+    <VerticalStackLayout Padding="12" Spacing="6">
+
+        <Button Text="Terminate Application"
+                Clicked="OnTerminateClicked"
+                HorizontalOptions="Start"
+                Padding="20,10" />
+
+    </VerticalStackLayout>
+
+</views:BasePage>

src/Controls/samples/Controls.Sample/Pages/Core/ApplicationControlPage.xaml.cs

@@ -0,0 +1,18 @@
+using System;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages
+{
+	public partial class ApplicationControlPage
+	{
+		public ApplicationControlPage()
+		{
+			InitializeComponent();
+		}
+
+		void OnTerminateClicked(object sender, EventArgs e)
+		{
+			Application.Current.Quit();
+		}
+	}
+}

src/Controls/samples/Controls.Sample/ViewModels/CoreViewModel.cs

@@ -12,6 +12,9 @@ public class CoreViewModel : BaseGalleryViewModel
 			new SectionModel(typeof(AlertsPage), "Alerts",
 				"Displaying an alert, asking a user to make a choice, or displaying a prompt."),
 
+			new SectionModel(typeof(ApplicationControlPage), "App Control",
+				"Demonstrates the app control features."),
+
 			new SectionModel(typeof(AppThemeBindingPage), "AppThemeBindings",
 				"Devices typically include light and dark themes, which each refer to a broad set of appearance preferences that can be set at the operating system level. Applications should respect these system themes, and respond immediately when the system theme changes."),
 

src/Controls/src/Core/Application.cs

@@ -8,6 +8,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls
 {
@@ -44,7 +45,7 @@ internal void PlatformServicesSet()
 
 		public void Quit()
 		{
-			Device.PlatformServices?.QuitApplication();
+			Handler?.Invoke(ApplicationHandler.TerminateCommandKey);
 		}
 
 		public IAppLinks AppLinks

src/Controls/src/Core/HandlerImpl/VisualElement/VisualElement.Impl.cs

@@ -69,8 +69,6 @@ public Shadow Shadow
 			set { SetValue(ShadowProperty, value); }
 		}
 
-		IView IView.Parent => Parent as IView;
-
 		public Size DesiredSize { get; protected set; }
 
 		public void Arrange(Rectangle bounds)

src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs

@@ -13,6 +13,7 @@ public static partial class AppHostBuilderExtensions
 #if WINDOWS || __ANDROID__
 			{ typeof(Shell), typeof(ShellHandler) },
 #endif
+			{ typeof(Application), typeof(ApplicationHandler) },
 			{ typeof(ActivityIndicator), typeof(ActivityIndicatorHandler) },
 			{ typeof(BoxView), typeof(ShapeViewHandler) },
 			{ typeof(Button), typeof(ButtonHandler) },

src/Controls/src/Core/IPlatformServices.cs

@@ -33,8 +33,6 @@ public interface IPlatformServices
 
 		string RuntimePlatform { get; }
 
-		void QuitApplication();
-
 		SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint);
 	}
 }

src/Controls/src/Core/Platform/AlertManager/AlertManager.Windows.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,21 +15,17 @@ internal partial class AlertManager
 
 		internal void Subscribe(Window window)
 		{
-			IMauiContext mauiContext = window?.MauiContext;
-			UI.Xaml.Window nativeWindow = mauiContext?.Window;
+			var nativeWindow = window.MauiContext.GetNativeWindow();
 
 			if (Subscriptions.Any(s => s.Window == nativeWindow))
-			{
 				return;
-			}
 
-			Subscriptions.Add(new AlertRequestHelper(nativeWindow, mauiContext));
+			Subscriptions.Add(new AlertRequestHelper(nativeWindow, window.MauiContext));
 		}
 
 		internal void Unsubscribe(Window window)
 		{
-			IMauiContext mauiContext = window?.MauiContext;
-			UI.Xaml.Window nativeWindow = mauiContext?.Window;
+			var nativeWindow = window.MauiContext.GetNativeWindow();
 
 			var toRemove = Subscriptions.Where(s => s.Window == nativeWindow).ToList();
 
@@ -42,8 +38,8 @@ internal void Unsubscribe(Window window)
 
 		internal sealed class AlertRequestHelper : IDisposable
 		{
-			static Task<bool> CurrentAlert;
-			static Task<string> CurrentPrompt;
+			static Task<bool>? CurrentAlert;
+			static Task<string?>? CurrentPrompt;
 
 			internal AlertRequestHelper(UI.Xaml.Window window, IMauiContext mauiContext)
 			{
@@ -201,7 +197,7 @@ static async Task<bool> ShowAlert(ContentDialog alert)
 				return result == ContentDialogResult.Primary;
 			}
 
-			static async Task<string> ShowPrompt(PromptDialog prompt)
+			static async Task<string?> ShowPrompt(PromptDialog prompt)
 			{
 				ContentDialogResult result = await prompt.ShowAsync();
 

src/Controls/src/Core/Platform/AlertManager/AlertManager.iOS.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Foundation;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
 using UIKit;
@@ -16,21 +17,17 @@ internal partial class AlertManager
 
 		internal void Subscribe(Window window)
 		{
-			IMauiContext mauiContext = window?.MauiContext;
-			UIWindow nativeWindow = mauiContext?.Window;
+			var nativeWindow = window?.MauiContext.GetNativeWindow();
 
 			if (Subscriptions.Any(s => s.Window == nativeWindow))
-			{
 				return;
-			}
 
 			Subscriptions.Add(new AlertRequestHelper(nativeWindow));
 		}
 
 		internal void Unsubscribe(Window window)
 		{
-			IMauiContext mauiContext = window?.MauiContext;
-			UIWindow nativeWindow = mauiContext?.Window;
+			var nativeWindow = window?.MauiContext.GetNativeWindow();
 
 			var toRemove = Subscriptions.Where(s => s.Window == nativeWindow).ToList();
 

src/Controls/src/Core/ViewExtensions.cs

@@ -169,15 +169,10 @@ public static Task<bool> TranslateTo(this VisualElement view, double x, double y
 			return tcs.Task;
 		}
 
-		internal static IAnimationManager? GetAnimationManager(this IAnimatable animatable)
+		internal static IAnimationManager GetAnimationManager(this IAnimatable animatable)
 		{
 			if (animatable is Element e && e.FindMauiContext() is IMauiContext mauiContext)
-			{
-				if (mauiContext is IScopedMauiContext scoped)
-					return scoped.AnimationManager;
-				else
-					return mauiContext.Services.GetService<IAnimationManager>();
-			}
+				return mauiContext.GetAnimationManager();
 
 			throw new ArgumentException($"Unable to find {nameof(IAnimationManager)} for '{animatable.GetType().FullName}'.", nameof(animatable));
 		}

src/Controls/tests/Core.UnitTests/MockPlatformServices.cs

@@ -169,11 +169,6 @@ public Task<DateTimeOffset> GetLastWriteTimeAsync(string path)
 			}
 		}
 
-		public void QuitApplication()
-		{
-
-		}
-
 		public SizeRequest GetNativeSize(VisualElement view, double widthConstraint, double heightConstraint)
 		{
 			if (getNativeSizeFunc != null)

src/Controls/tests/Core.UnitTests/SwipeViewTests.cs

@@ -160,7 +160,7 @@ public void TestBottomItems()
 		}
 
 		[Test]
-		public void TestProgramaticallyOpen()
+		public void TestProgrammaticallyOpen()
 		{
 			bool isOpen = false;
 
@@ -188,7 +188,7 @@ public void TestProgramaticallyOpen()
 		}
 
 		[Test]
-		public void TestProgramaticallyClose()
+		public void TestProgrammaticallyClose()
 		{
 			bool isOpen = false;