Refactor media session commands and UI scheduling

- Standardize UI update calls to use RxSchedulers.UI.ScheduleTo
- Add static FavoriteSessionCommand with custom code (88)
- Simplify media session layout to only include "Favorite" button
- Prepend 🎙️ emoji to artist name if song has synced lyrics
- Update session connection logic to expose Favorite command
- Disable UpdateMediaSessionLayout with early return
- Add debug code for player command inspection
- Clean up and comment out unused shuffle/repeat button logic

Author: YBTopaz8

Dimmer/Dimmer.Droid/DimmerAudio/AudioService.cs

@@ -33,7 +33,7 @@ public double Volume
         {
             if (Player != null)
             {
-                RxSchedulers.UI.ScheduleToUI(() =>
+                RxSchedulers.UI.ScheduleTo(() =>
                 {
 
                     Player.Volume = (float)Math.Clamp(value, 0.0, 1.0);
@@ -98,8 +98,9 @@ public Task InitializeAsync(SongModelView songModel, double pos)
     {
         _currentSongModel = songModel;
         // Tell the native service to prepare the track.
+        var finalArtName = songModel.HasSyncedLyrics ? "🎙️ " + songModel.OtherArtistsName : songModel.OtherArtistsName;
         long positionMs = (long)(pos * 1000.0);
-        Service?.Prepare(songModel.FilePath, songModel.Title, songModel.ArtistName, songModel.AlbumName, songModel,startPositionMs: positionMs);
+        Service?.Prepare(songModel.FilePath, songModel.Title, finalArtName, songModel.AlbumName, songModel,startPositionMs: positionMs);
 
         return Task.CompletedTask;
     }

Dimmer/Dimmer.Droid/DimmerAudio/ExoPlayerService.cs

@@ -50,7 +50,7 @@ public class ExoPlayerService : MediaSessionService
     private MediaSession? mediaSession;
     private IExoPlayer? player;
     private MediaPlaybackSessionCallback? sessionCallback; // Use concrete type
-
+    public static SessionCommand FavoriteSessionCommand = new SessionCommand(ActionFavorite, Bundle.Empty);
     // --- Constants ---
     public const string ActionLyrics = "ACTION_LYRICS";
     public const string CommandPreparePlay = "com.yvanbrunel.dimmer.action.PREPARE_PLAY";
@@ -321,33 +321,28 @@ public async override void OnCreate()
                 flags |= PendingIntentFlags.Immutable;
             }
             PendingIntent? pendingIntent = PendingIntent.GetActivity(Platform.AppContext, 0, nIntent, flags);
+            FavoriteSessionCommand.CommandCode = 88;
 
             var heartButton = new CommandButton.Builder(CommandButton.IconUndefined)
-    .SetDisplayName("Favorite")
-    .SetSessionCommand(new SessionCommand(ActionFavorite, Bundle.Empty))
-    .SetCustomIconResId(Resource.Drawable.heart) // Standard resource ID
-    .Build();
-
-            var shuffleButton = new CommandButton.Builder(CommandButton.IconUndefined)
-                .SetDisplayName("Shuffle")
-                .SetSessionCommand(new SessionCommand(ActionShuffle, Bundle.Empty))
-                .SetCustomIconResId(Resource.Drawable.media3_icon_shuffle_off)
-                .Build();
+                .SetDisplayName("Favorite")
+                .SetSessionCommand(FavoriteSessionCommand)
+                //.SetPlayerCommand(88)
+                //.SetSlots()
+                
+                .SetCustomIconResId(Resource.Drawable.heart)
+                .SetEnabled(true)
 
-            var repeatButton = new CommandButton.Builder(CommandButton.IconUndefined)
-                .SetDisplayName("Repeat")
-                .SetSessionCommand(new SessionCommand(ActionRepeat, Bundle.Empty))
-                .SetCustomIconResId(Resource.Drawable.media3_icon_repeat_off)
                 .Build();
 
             mediaSession = new MediaSession.Builder(this, player)!
                 .SetSessionActivity(pendingIntent)!
                 .SetCallback(sessionCallback)!
                 .SetId("Dimmer_MediaSession_Main")!
-
-    .SetCustomLayout(customLayout: new List<CommandButton> { heartButton, shuffleButton, repeatButton })
+                .SetCommandButtonsForMediaItems(commandButtons: new List<CommandButton> { heartButton })
+                .SetMediaButtonPreferences(mediaButtonPreferences:new List<CommandButton> { heartButton })
+    .SetCustomLayout(customLayout: new List<CommandButton> { heartButton})
                 .Build();
-
+            
             _binder = new ExoPlayerServiceBinder(this);
 
             // 2) NotificationManager
@@ -462,7 +457,7 @@ private void HandleFavoriteAction()
                             await viewModel.AddFavoriteRatingToSong(CurrentSongContext);
                         }
 
-                        RxSchedulers.UI.ScheduleToUI(() => RefreshNotification());
+                        RxSchedulers.UI.ScheduleTo(() => RefreshNotification());
                     }
                     catch (Exception ex)
                     {
@@ -478,7 +473,7 @@ private void HandleShuffleAction()
         var viewModel = MainApplication.ServiceProvider.GetService<BaseViewModel>();
         if (viewModel != null)
         {
-            RxSchedulers.UI.ScheduleToUI(() =>
+            RxSchedulers.UI.ScheduleTo(() =>
             {
                 try
                 {
@@ -499,7 +494,7 @@ private void HandleRepeatAction()
         var viewModel = MainApplication.ServiceProvider.GetService<BaseViewModel>();
         if (viewModel != null)
         {
-            RxSchedulers.UI.ScheduleToUI(() =>
+            RxSchedulers.UI.ScheduleTo(() =>
             {
                 try
                 {
@@ -710,6 +705,7 @@ internal static void UpdateFavoriteState(SongModelView song)
 
     public void UpdateMediaSessionLayout()
     {
+        return;
         bool isFav = CurrentSongContext?.IsFavorite ?? false;
 
         var heartBtn = new CommandButton.Builder(CommandButton.IconUndefined)
@@ -978,27 +974,46 @@ public MediaSession.ConnectionResult OnConnect(
         {
 
 
-            var sessionCommands = new SessionCommands.Builder()
-                   .Add(SessionCommand.CommandCodeSessionSetRating)!
-                   .Add(new SessionCommand(ExoPlayerService.ActionFavorite, Bundle.Empty))
-                   .Add(new SessionCommand(ExoPlayerService.ActionShuffle, Bundle.Empty))!
-                   .Add(new SessionCommand(ExoPlayerService.ActionRepeat, Bundle.Empty))!
-                  .Build();
+            //var sessionCommands = new SessionCommands.Builder()
+            //       .Add(SessionCommand.CommandCodeSessionSetRating)!
+            //       .Add(new SessionCommand(ExoPlayerService.ActionFavorite, Bundle.Empty))
+            //       .Add(new SessionCommand(ExoPlayerService.ActionShuffle, Bundle.Empty))!
+            //       .Add(new SessionCommand(ExoPlayerService.ActionRepeat, Bundle.Empty))!
+            //      .Build();
 
-            
-            var playerCommands = new PlayerCommands.Builder()
-                .Add(SessionCommand.CommandCodeSessionSetRating)
-                   
-              .AddAllCommands()!
-              .Build();
 
-            return MediaSession.ConnectionResult.Accept(sessionCommands, playerCommands)!;
+            //var playerCommands = new PlayerCommands.Builder()
+            //    .Add(SessionCommand.CommandCodeSessionSetRating)
+
+            //  .AddAllCommands()!
+            //  .Build();
+            var accepted = new MediaSession.ConnectionResult.AcceptedResultBuilder(session!)
+                .SetAvailableSessionCommands(
+MediaSession.ConnectionResult.DefaultSessionCommands.BuildUpon()!
+
+.Add(ExoPlayerService.FavoriteSessionCommand)!
+                .Build())!;
+            var comms = session.Player.AvailableCommands;
+            if (comms != null) 
+            {
+                var isAv = session.Player.IsCommandAvailable(88);
+                var isAvs = session.Player.AvailableCommands.Size();
+                //foreach (var comm in )
+                //{
+
+                //}
+            }
+            return accepted.
+                Build()!;
         }
         public void OnPostConnect(MediaSession? session, MediaSession.ControllerInfo? controller)
         {
 
 
-
+            var commandsInSesssion = session.ConnectedControllers?.ToArray();
+            var commandsInSesssions = session.CustomLayout;
+            var commandsInSesssionsw = session.ControllerForCurrentRequest;
+            var commandsInSesssione = session.MediaButtonPreferences;
         }
 
         public void OnDisconnected(MediaSession? session, MediaSession.ControllerInfo? controller)
@@ -1078,10 +1093,16 @@ public SessionResult OnCustomCommand(MediaSession? session, MediaSession.Control
         {
             if (command == null)
             {
-                return (SessionResult)SessionResult.ResultErrorUnknown;
+                return (SessionResult)SessionResult.ResultErrorBadValue;
+            }
+            if (command.CustomAction is not null && command.CustomAction.Equals(ExoPlayerService.FavoriteSessionCommand.CustomAction))
+            {
+
+                return (SessionResult)SessionResult.ResultSuccess;
             }
             switch (command.CustomAction)
             {
+                
                 case ExoPlayerService.ActionFavorite:
                     // Toggle favorite state
                     var currentSong = ExoPlayerService.CurrentSongContext;
@@ -1103,7 +1124,7 @@ public SessionResult OnCustomCommand(MediaSession? session, MediaSession.Control
                                         await viewModel.AddFavoriteRatingToSong(currentSong);
                                     }
 
-                                    RxSchedulers.UI.ScheduleToUI(() => service.UpdateMediaSessionLayout());
+                                    RxSchedulers.UI.ScheduleTo(() => service.UpdateMediaSessionLayout());
                                 }
                                 catch (Exception ex)
                                 {
@@ -1119,7 +1140,7 @@ public SessionResult OnCustomCommand(MediaSession? session, MediaSession.Control
                     var vm = MainApplication.ServiceProvider.GetService<BaseViewModel>();
                     if (vm != null)
                     {
-                        RxSchedulers.UI.ScheduleToUI(() =>
+                        RxSchedulers.UI.ScheduleTo(() =>
                         {
                             try
                             {
@@ -1140,7 +1161,7 @@ public SessionResult OnCustomCommand(MediaSession? session, MediaSession.Control
                     var vmRepeat = MainApplication.ServiceProvider.GetService<BaseViewModel>();
                     if (vmRepeat != null)
                     {
-                        RxSchedulers.UI.ScheduleToUI(() =>
+                        RxSchedulers.UI.ScheduleTo(() =>
                         {
                             try
                             {