Update Media Element to use Media3

samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementCarouselViewPage.xaml

@@ -39,7 +39,7 @@
                             <toolkit:MediaElement
                                 HeightRequest="200"
                                 x:Name="MediaElement"
-                                ShouldAutoPlay="True"
+                                ShouldAutoPlay="False"
                                 ShouldShowPlaybackControls="True"
                                 Source="{Binding Source, Mode=OneTime}" />
                             <Label TextColor="White"

samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementCollectionViewPage.xaml

@@ -39,7 +39,7 @@
                         <toolkit:MediaElement
                             HeightRequest="200"
                             x:Name="MediaElement"
-                            ShouldAutoPlay="True"
+                            ShouldAutoPlay="False"
                             ShouldShowPlaybackControls="True"
                             Source="{Binding Source, Mode=OneTime}" />
                         <Label TextColor="White"

samples/CommunityToolkit.Maui.Sample/Platforms/Android/AndroidManifest.xml

@@ -4,9 +4,6 @@
                  android:supportsRtl="true">
         <service android:name="communityToolkit.maui.media.services" android:stopWithTask="true" android:exported="false" android:enabled="true"
                  android:foregroundServiceType="mediaPlayback">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON"/>
-            </intent-filter>
             <intent-filter>
                 <action android:name="androidx.media3.session.MediaSessionService"/>
             </intent-filter>

src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj

@@ -51,23 +51,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.1.1" />
-
-    <!-- Xamarin.AndroidX.Camera 1.3.1.1 depends on Xamarin.AndroidX.Lifecycle.LiveData 2.7.0.1:
-    https://www.nuget.org/packages/Xamarin.AndroidX.Camera.Core/#dependencies-body-tab 
-    However, Dotnet MAUI still implicitly references Xamarin.AndroidX.Lifecycle.LiveData 2.6.1.3:
-    https://github.com/dotnet/maui/blob/main/eng/AndroidX.targets
-    This causes build error "Detected package downgrade":
-    https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1605
-    Workaround: add a package reference to the higher version of the package. Possibly can be removed when MAUI bumps the implicit reference version.
-    -->
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.7.0.1" />
-
-    <!--Adding the above package reference requires Workaround for https://github.com/xamarin/AndroidX/issues/800#issuecomment-1774639627 -->
-    <!-- Tracking issue https://github.com/xamarin/AndroidX/issues/764 -->
-    <PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.4.2" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.4.2" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -1,5 +1,4 @@
 using CommunityToolkit.Maui.Core.Handlers;
-using CommunityToolkit.Maui.Core.Views;
 using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui;

src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj

@@ -49,23 +49,38 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true"/>
-    <None Include="ReadMe.txt" pack="true" PackagePath="."/>
+    <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true" />
+    <None Include="ReadMe.txt" pack="true" PackagePath="." />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
-    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer" Version="[2.19.1,)"/>
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Transformer" Version="[2.19.1,)"/>
-    <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="[2.19.1,)"/>
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.Common" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.UI" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Rtsp" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Hls" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Dash" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Media3.Session" Version="1.3.1.1" />
+
+    <!--Adding the above package reference requires Workaround for https://github.com/xamarin/AndroidX/issues/800#issuecomment-1774639627 -->
+    <!-- Tracking issue https://github.com/xamarin/AndroidX/issues/764 -->
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.5.1" />
+
+    <!-- Should match version of the referenced 'Xamarin.AndroidX.Collection' package -->
+    <PackageReference Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.3.1" />
+    <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3.1" />
+
+    <!-- Should match version of the referenced 'Xamarin.AndroidX.Activity' package -->
+    <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.2.1" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)"/>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
   </ItemGroup>
-
+  
 </Project>

src/CommunityToolkit.Maui.MediaElement/Handlers/MediaElementHandler.android.cs

@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Core.Views;
+using CommunityToolkit.Maui.Primitives;
 using CommunityToolkit.Maui.Views;
 using Microsoft.Maui.Handlers;
 

src/CommunityToolkit.Maui.MediaElement/Primitives/MediaFailedEventArgs.cs

@@ -3,19 +3,15 @@
 /// <summary>
 /// Represents event data for when media has failed loading or playing.
 /// </summary>
-public sealed class MediaFailedEventArgs : EventArgs
+/// <remarks>
+/// Initializes a new instance of the <see cref="MediaFailedEventArgs"/> class.
+/// </remarks>
+/// <param name="errorMessage">An error message providing more information for this event.</param>
+public sealed class MediaFailedEventArgs(string errorMessage) : EventArgs
 {
-	/// <summary>
-	/// Initializes a new instance of the <see cref="MediaFailedEventArgs"/> class.
-	/// </summary>
-	/// <param name="errorMessage">An error message providing more information for this event.</param>
-	public MediaFailedEventArgs(string errorMessage)
-	{
-		ErrorMessage = errorMessage;
-	}
 
 	/// <summary>
 	/// Gets a description of why the media failed to load and/or play.
 	/// </summary>
-	public string ErrorMessage { get; }
+	public string ErrorMessage { get; } = errorMessage;
 }

src/CommunityToolkit.Maui.MediaElement/Primitives/MediaPositionChangedEventArgs.cs

@@ -3,19 +3,14 @@
 /// <summary>
 /// Represents event data for when media position has changed.
 /// </summary>
-public sealed class MediaPositionChangedEventArgs : EventArgs
+/// <remarks>
+/// Initializes a new instance of the <see cref="MediaPositionChangedEventArgs"/> class.
+/// </remarks>
+/// <param name="position">The position associated to this event.</param>
+public sealed class MediaPositionChangedEventArgs(TimeSpan position) : EventArgs
 {
-	/// <summary>
-	/// Initializes a new instance of the <see cref="MediaPositionChangedEventArgs"/> class.
-	/// </summary>
-	/// <param name="position">The position associated to this event.</param>
-	public MediaPositionChangedEventArgs(TimeSpan position)
-	{
-		Position = position;
-	}
-
 	/// <summary>
 	/// Gets the position the media has progressed to.
 	/// </summary>
-	public TimeSpan Position { get; }
+	public TimeSpan Position { get; } = position;
 }

src/CommunityToolkit.Maui.MediaElement/Primitives/MediaStateChangedEventArgs.cs

@@ -3,26 +3,20 @@
 /// <summary>
 /// Represents event data for when media state has changed.
 /// </summary>
-public sealed class MediaStateChangedEventArgs : EventArgs
+/// <remarks>
+/// Initializes a new instance of the <see cref="MediaStateChangedEventArgs"/> class.
+/// </remarks>
+/// <param name="previousState">The previous state.</param>
+/// <param name="newState">The new state.</param>
+public sealed class MediaStateChangedEventArgs(MediaElementState previousState, MediaElementState newState) : EventArgs
 {
-	/// <summary>
-	/// Initializes a new instance of the <see cref="MediaStateChangedEventArgs"/> class.
-	/// </summary>
-	/// <param name="previousState">The previous state.</param>
-	/// <param name="newState">The new state.</param>
-	public MediaStateChangedEventArgs(MediaElementState previousState, MediaElementState newState)
-	{
-		PreviousState = previousState;
-		NewState = newState;
-	}
-
 	/// <summary>
 	/// Gets the previous state that the <see cref="Core.IMediaElement"/> instance is transitioning from.
 	/// </summary>
-	public MediaElementState PreviousState { get; }
+	public MediaElementState PreviousState { get; } = previousState;
 
 	/// <summary>
 	/// Gets the new state that the <see cref="Core.IMediaElement"/> instance is transitioning to.
 	/// </summary>
-	public MediaElementState NewState { get; }
+	public MediaElementState NewState { get; } = newState;
 }

src/CommunityToolkit.Maui.MediaElement/Primitives/PlayerViewChangedEventArgs.android.cs

@@ -0,0 +1,8 @@
+using AndroidX.Media3.UI;
+
+namespace CommunityToolkit.Maui.Primitives;
+
+public sealed class PlayerViewChangedEventArgs(PlayerView playerView) : EventArgs
+{
+	public PlayerView UpdatedPlayerView { get; } = playerView;
+}

src/CommunityToolkit.Maui.MediaElement/Primitives/SeekRequestedEventArgs.cs

@@ -3,19 +3,14 @@
 /// <summary>
 /// Represents event data for when a seek operation is requested on media.
 /// </summary>
-sealed class MediaSeekRequestedEventArgs : EventArgs
+/// <remarks>
+/// Initializes a new instance of the <see cref="MediaSeekRequestedEventArgs"/> class.
+/// </remarks>
+/// <param name="requestedPosition">The requested position to seek to.</param>
+sealed class MediaSeekRequestedEventArgs(TimeSpan requestedPosition) : EventArgs
 {
-	/// <summary>
-	/// Initializes a new instance of the <see cref="MediaSeekRequestedEventArgs"/> class.
-	/// </summary>
-	/// <param name="requestedPosition">The requested position to seek to.</param>
-	public MediaSeekRequestedEventArgs(TimeSpan requestedPosition)
-	{
-		RequestedPosition = requestedPosition;
-	}
-
 	/// <summary>
 	/// Gets the requested position to seek to.
 	/// </summary>
-	public TimeSpan RequestedPosition { get; }
+	public TimeSpan RequestedPosition { get; } = requestedPosition;
 }

src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceBinder.android.cs

@@ -0,0 +1,9 @@
+using Android.OS;
+using CommunityToolkit.Maui.Media.Services;
+
+namespace CommunityToolkit.Maui.Services;
+
+class BoundServiceBinder(MediaControlsService mediaControlsService) : Binder
+{
+	public MediaControlsService? Service { get; private set; } = mediaControlsService;
+}

src/CommunityToolkit.Maui.MediaElement/Services/BoundServiceConnection.android.cs

@@ -0,0 +1,26 @@
+using Android.Content;
+using Android.OS;
+using CommunityToolkit.Maui.Core.Views;
+
+namespace CommunityToolkit.Maui.Services;
+class BoundServiceConnection(MediaManager mediaManager) : Java.Lang.Object, IServiceConnection
+{
+    public MediaManager? Activity { get; private set; } = mediaManager;
+
+	public bool IsConnected { get; private set; } = false;
+
+	public BoundServiceBinder? Binder { get; private set; } = null;
+
+	void IServiceConnection.OnServiceConnected(ComponentName? name, IBinder? service)
+    {
+        Binder = service as BoundServiceBinder;
+        IsConnected = Binder is not null;
+		Activity?.UpdatePlayer();
+	}
+
+    void IServiceConnection.OnServiceDisconnected(ComponentName? name)
+    {
+        IsConnected = false;
+        Binder = null;
+    }
+}