Switch to using using OptIn and move from options to builder to set service on/off

Author: ne0rrmatrix

samples/CommunityToolkit.Maui.Sample/MauiProgram.cs

@@ -68,11 +68,12 @@ public static MauiApp CreateMauiApp()
 #endif
 								.UseMauiCommunityToolkitMarkup()
 								.UseMauiCommunityToolkitCamera()
-								.UseMauiCommunityToolkitMediaElement(static options =>
-								{
-									options.SetDefaultAndroidForegroundServiceEnabled(false);
-									options.SetDefaultAndroidViewType(AndroidViewType.TextureView);
-								})
+								.UseMauiCommunityToolkitMediaElement(
+									static options =>
+									{
+										options.SetDefaultAndroidViewType(AndroidViewType.TextureView);
+									},
+									enableForegroundService: true)
 								.ConfigureMauiHandlers(static handlers =>
 								{
 #if IOS || MACCATALYST

src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs

@@ -21,11 +21,16 @@ public static class AppBuilderExtensions
 	/// </summary>
 	/// <param name="builder"><see cref="MauiAppBuilder"/> generated by <see cref="MauiApp"/>.</param>
 	/// <param name="options"><see cref="MediaElementOptions"/>.</param>
+	/// <param name="enableForegroundService">Enable Android Foreground Service for MediaElement.</param>
 	/// <returns><see cref="MauiAppBuilder"/> initialized for <see cref="MediaElement"/>.</returns>
-	public static MauiAppBuilder UseMauiCommunityToolkitMediaElement(this MauiAppBuilder builder, Action<MediaElementOptions>? options = null)
+	public static MauiAppBuilder UseMauiCommunityToolkitMediaElement(this MauiAppBuilder builder, Action<MediaElementOptions>? options = null, bool enableForegroundService = false)
 	{
+		// Create MediaElementOptions and set the foreground service setting
+		var mediaElementOptions = new MediaElementOptions(builder);
+		mediaElementOptions.EnableAndroidForegroundService(enableForegroundService);
+		
 		// Update the default MediaElementOptions for MediaElement if Action is not null
-		options?.Invoke(new MediaElementOptions(builder));
+		options?.Invoke(mediaElementOptions);
 
 		// Perform Handler configuration
 		builder.ConfigureMauiHandlers(h =>

src/CommunityToolkit.Maui.MediaElement/MediaElementOptions.shared.cs

@@ -21,24 +21,24 @@ internal MediaElementOptions(in MauiAppBuilder builder) : this()
 		this.builder = builder;
 	}
 
-	/// <summary>
-	/// Set Android Foreground Service for MediaElement on construction
-	/// </summary>
-	internal static bool IsAndroidForegroundServiceEnabled { get; private set; } = true;
-
 	/// <summary>
 	/// Set Android View type for MediaElement as SurfaceView or TextureView on construction
 	/// </summary>
 	internal static AndroidViewType DefaultAndroidViewType { get; private set; } = AndroidViewType.SurfaceView;
 
 	/// <summary>
-	/// Set Android Foreground Service for MediaElement on construction
+	/// Set whether Android Foreground Service is enabled for MediaElement
 	/// </summary>
-	/// <param name="isEnabled"></param>
-	public void SetDefaultAndroidForegroundServiceEnabled(bool isEnabled) => IsAndroidForegroundServiceEnabled = isEnabled;
+	internal static bool IsAndroidForegroundServiceEnabled { get; private set; }
 
 	/// <summary>
 	/// Set Android View type for MediaElement as SurfaceView or TextureView on construction
 	/// </summary>
 	public void SetDefaultAndroidViewType(AndroidViewType androidViewType) => DefaultAndroidViewType = androidViewType;
+
+	/// <summary>
+	/// Enable Android Foreground Service for MediaElement
+	/// </summary>
+	/// <param name="enabled">True to enable foreground service, false to disable</param>
+	internal void EnableAndroidForegroundService(bool enabled) => IsAndroidForegroundServiceEnabled = enabled;
 }

src/CommunityToolkit.Maui.UnitTests/BaseTest.cs

@@ -90,7 +90,7 @@ protected virtual void Dispose(bool isDisposing)
 		// Restore default MediaElementOptions
 		var mediaElementOptions = new MediaElementOptions();
 		mediaElementOptions.SetDefaultAndroidViewType(AndroidViewType.SurfaceView);
-		mediaElementOptions.SetDefaultAndroidForegroundServiceEnabled(true);
+		mediaElementOptions.EnableAndroidForegroundService(true);
 		isDisposed = true;
 	}
 

src/CommunityToolkit.Maui.UnitTests/Extensions/AppBuilderExtensionsTests.cs

@@ -172,7 +172,7 @@ public void UseMauiCommunityToolkitMediaElement_ShouldSetAndroidServiceByDefault
 	{
 		var builder = MauiApp.CreateBuilder();
 		builder.UseMauiCommunityToolkitMediaElement();
-		MediaElementOptions.IsAndroidForegroundServiceEnabled.Should().Be(true);
+		MediaElementOptions.IsAndroidForegroundServiceEnabled.Should().Be(false);
 	}
 
 	[Fact]
@@ -181,7 +181,7 @@ public void UseMauiCommunityToolkitMediaElement_ServiceCanBeDisabled()
 		var builder = MauiApp.CreateBuilder();
 		builder.UseMauiCommunityToolkitMediaElement(static options =>
 		{
-			options.SetDefaultAndroidForegroundServiceEnabled(false);
+			options.EnableAndroidForegroundService(false);
 		});
 		MediaElementOptions.IsAndroidForegroundServiceEnabled.Should().Be(false);
 	}

src/CommunityToolkit.Maui.UnitTests/Views/MediaElement/MediaElementOptionsTests.cs

@@ -23,16 +23,16 @@ public void SetDefaultAndroidForegroundServiceEnabled_Updates_StaticDefault()
 
 		try
 		{
-			optionsInstance.SetDefaultAndroidForegroundServiceEnabled(false);
+			optionsInstance.EnableAndroidForegroundService(false);
 			MediaElementOptions.IsAndroidForegroundServiceEnabled.Should().BeFalse();
 
-			optionsInstance.SetDefaultAndroidForegroundServiceEnabled(true);
+			optionsInstance.EnableAndroidForegroundService(true);
 			MediaElementOptions.IsAndroidForegroundServiceEnabled.Should().BeTrue();
 		}
 		finally
 		{
 			// restore original state to avoid test pollution
-			optionsInstance.SetDefaultAndroidForegroundServiceEnabled(original);
+			optionsInstance.EnableAndroidForegroundService(original);
 		}
 	}
 
@@ -68,7 +68,7 @@ public void MediaElement_Initializes_From_MediaElementOptions_Defaults()
 		{
 			// change defaults then create a new MediaElement and verify it picked them up
 			optionsInstance.SetDefaultAndroidViewType(AndroidViewType.TextureView);
-			optionsInstance.SetDefaultAndroidForegroundServiceEnabled(false);
+			optionsInstance.EnableAndroidForegroundService(false);
 
 			var mediaElement = new MediaElement();
 
@@ -79,7 +79,7 @@ public void MediaElement_Initializes_From_MediaElementOptions_Defaults()
 		{
 			// restore original state
 			optionsInstance.SetDefaultAndroidViewType(originalViewType);
-			optionsInstance.SetDefaultAndroidForegroundServiceEnabled(originalForegroundEnabled);
+			optionsInstance.EnableAndroidForegroundService(originalForegroundEnabled);
 		}
 	}
 }