Refactor queue actions and cleanup SongAdapter UI

- Replace queue-specific MaterialButton actions with a persistent ImageView "Insert After" button, styled and tinted by theme.
- Remove insertBeforeBtn and playNextBtn, updating SongViewHolder accordingly.
- Improve insertAfterBtn tooltip and Toast message to include current song title.
- Explicitly set action button text color based on theme.
- Add early return after playlist creation in BaseViewModel to prevent further execution.
- Null-check realm.Dispose() in BaseViewModel.Dispose to avoid exceptions.

Author: YBTopaz8

Dimmer/Dimmer.Droid/ViewsAndPages/NativeViews/SongAdapter.cs

@@ -297,32 +297,41 @@ public override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup parent, int
         expandRow.AddView(infoBtn);
         expandRow.AddView(LyricsBtn);
 
-        // Add queue-specific buttons only in queue mode
-        MaterialButton? insertBeforeBtn = null;
-        MaterialButton? insertAfterBtn = null;
-        if (_mode == "queue")
-        {
-            insertAfterBtn = CreateActionButton(string.Empty, Resource.Drawable.media3_icon_queue_next);
-            insertAfterBtn.TooltipText = "Insert Song After This";
+        //if (_mode == "queue")
+        //{
+            
+        var insertAfterBtn = new ImageView(ctx, null, Resource.Attribute.materialButtonOutlinedStyle);
+        insertAfterBtn.SetImageResource(Resource.Drawable.media3_icon_queue_next);
+insertAfterBtn.ImageTintList = Android.Content.Res.ColorStateList.ValueOf(UiBuilder.IsDark(this.ParentFragement.Resources.Configuration) ? Color.Gray : Color.ParseColor("#294159"));
+
+        insertAfterBtn.SetPadding(30, 0, 30, 0);
+        var insertAfterBtnlp = new LinearLayout.LayoutParams(-2, -2);
+        insertAfterBtnlp.RightMargin = 10;
+        insertAfterBtn.LayoutParameters = insertAfterBtnlp;
+        insertAfterBtn.Clickable = true;
+    
+    
+    insertAfterBtn.TooltipText = $"Insert this song after {MyViewModel.CurrentPlayingSongView.Title}";
             //expandRow.AddView(insertBeforeBtn);
             expandRow.AddView(insertAfterBtn);
-        }
+ 
 
         // Assemble
         mainContainer.AddView(topRow);
         mainContainer.AddView(expandRow);
 
         card.AddView(mainContainer);
 
-        return new SongViewHolder(MyViewModel, ParentFragement, card, imgView, title, artist, moreBtn, durationView,expandRow, (Button)playBtn, (Button)favBtn, (Button)infoBtn,
-            LyricsBtn, insertBeforeBtn, insertAfterBtn);
+        return new SongViewHolder(MyViewModel, ParentFragement, card, imgView, title, artist, moreBtn, durationView,expandRow,  (Button)favBtn, (Button)infoBtn,
+            LyricsBtn, insertAfterBtn);
     }
 
 
     private MaterialButton CreateActionButton(string text, int iconId)
     {
         var btn = new MaterialButton(ctx, null, Resource.Attribute.materialButtonOutlinedStyle);
         btn.Text = text;
+        
         btn.SetTextColor(UiBuilder.IsDark(this.ParentFragement.Resources.Configuration) ? Color.Gray : Color.ParseColor("#294159"));
         btn.SetIconResource(iconId);
 
@@ -351,17 +360,15 @@ class SongViewHolder : AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder
         private readonly MaterialCardView _container;
         public View ContainerView => base.ItemView;
 
-        private readonly Button _playNextBtn;
         private readonly Button _favBtn;
         private readonly Button _infoBtn;
         private readonly Button lyricsBtn;
-        private readonly Button? _insertBeforeBtn;
-        private readonly Button? _insertAfterBtn;
+        private readonly ImageView? _insertAfterBtn;
         private SongModelView? _currentSongContext;
         private Action<int>? _expandAction;
 
         public SongViewHolder(BaseViewModelAnd vm, Fragment parentFrag, MaterialCardView container, ImageView img, TextView title, TextView artist, MaterialButton moreBtn, TextView durationView,
- View expandRow, Button playBtn, Button favBtn, Button infoBtn, Button lyrBtn, Button? insertBeforeBtn = null, Button? insertAfterBtn = null)
+ View expandRow,Button favBtn, Button infoBtn, Button lyrBtn, ImageView? insertAfterBtn = null)
             : base(container)
         {
             _viewModel = vm;
@@ -373,11 +380,9 @@ public SongViewHolder(BaseViewModelAnd vm, Fragment parentFrag, MaterialCardView
             _moreBtn = moreBtn;
             _durationView= durationView;
             _expandRow = expandRow;
-            _playNextBtn = playBtn;
             _favBtn = favBtn;
             _infoBtn = infoBtn;
             lyricsBtn = lyrBtn;
-            _insertBeforeBtn = insertBeforeBtn;
             _insertAfterBtn = insertAfterBtn;
 
             _moreBtn.Click += (s, e) =>
@@ -405,7 +410,7 @@ public SongViewHolder(BaseViewModelAnd vm, Fragment parentFrag, MaterialCardView
 
                             var param = new List<SongModelView>() { _currentSongContext };
                             _viewModel.InsertSongsAfterInQueueCommand.Execute(param);
-                            Toast.MakeText(_parentFrag.Context, $"Inserted {_currentSongContext.Title} after", ToastLength.Short)?.Show();
+                            Toast.MakeText(_parentFrag.Context, $"Inserted {_currentSongContext.Title} after {_viewModel.CurrentPlayingSongView.Title}", ToastLength.Short)?.Show();
 
                     }
                 };
@@ -437,17 +442,7 @@ public SongViewHolder(BaseViewModelAnd vm, Fragment parentFrag, MaterialCardView
             };
 
 
-            // 3. Play Button
-            _playNextBtn.Click += async (s, e) =>
-            {
-                if (_currentSongContext != null)
-                {
-                    _viewModel.SetAsNextToPlayInQueue(_currentSongContext);
-                    
-                }
-                    
-            };
-
+         
             lyrBtn.Click += async (s, e) =>
             {
                 if (_currentSongContext != null)

Dimmer/Dimmer/ViewModel/BaseViewModel.cs

@@ -5070,13 +5070,12 @@ public void AddToPlaylist(string playlistName, IEnumerable<SongModelView> songsT
                     newPlaylistModel.LastPlayedDate = DateTimeOffset.UtcNow;
                     newPlaylistModel.QueryText = PlQuery;
                     newPlaylistModel.SongsIdsInPlaylist.AddRange(songsToAdd.Select(s => s.Id).Distinct());
-
+                    
                     //newPlaylistModel.SongsInPlaylist.AddRange(songsToAdd.Select(s => s.ToModel()).Distinct());
 
                     realm.Add(newPlaylistModel, true);
                 });
-
-            //targetPlaylist = _playlistRepo.Create(newPlaylistModel);
+            return;
         }
 
 
@@ -5126,7 +5125,7 @@ protected virtual void Dispose(bool disposing)
         {
             _realmSubscription?.Dispose();
             _playEventSource.Dispose();
-            realm.Dispose();
+            realm?.Dispose();
             _subsManager.Dispose();
             CompositeDisposables.Dispose();