hook up basic tap to play/addqueue in all tableviews

Disable multiselect for now
Difegue · Sep 14, 2023 · 92bdecc · 92bdecc
1 parent 54fa67f
commit 92bdecc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/Sources/Stylophone.iOS/Helpers/TrackTableViewDataSource.cs b/Sources/Stylophone.iOS/Helpers/TrackTableViewDataSource.cs
@@ -21,6 +21,7 @@ public class TrackTableViewDataSource : UITableViewDelegate, IUITableViewDataSou
         private Func<NSIndexPath, UIMenu> _menuFactory;
         private Func<NSIndexPath, bool, UISwipeActionsConfiguration> _swipeFactory;
         private Action<UIScrollView> _scrollHandler;
+        private Action<NSIndexPath> _tapHandler;
         private ObservableCollection<TrackViewModel> _sourceCollection;
 
         public TrackTableViewDataSource(IntPtr handle) : base(handle)
@@ -38,13 +39,14 @@ public TrackTableViewDataSource(IntPtr handle) : base(handle)
         /// <param name="scrollHandler">Optional scrollHandler</param>
         public TrackTableViewDataSource(UITableView tableView, ObservableCollection<TrackViewModel> source,
             Func<NSIndexPath, UIMenu> contextMenuFactory, Func<NSIndexPath,bool, UISwipeActionsConfiguration> swipeActionFactory,
-            bool canSelectRows = false, Action<UIScrollView> scrollHandler = null)
+            bool canSelectRows = false, Action<UIScrollView> scrollHandler = null, Action<NSIndexPath> tapHandler = null)
         {
             _tableView = tableView;
             _sourceCollection = source;
             _menuFactory = contextMenuFactory;
             _swipeFactory = swipeActionFactory;
             _scrollHandler = scrollHandler;
+            _tapHandler = tapHandler;
 
             _sourceCollection.CollectionChanged += (s,e) => UIApplication.SharedApplication.InvokeOnMainThread(
                 () => UpdateUITableView(s,e));
@@ -128,6 +130,8 @@ public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
         {
             if (tableView.AllowsMultipleSelection)
                 tableView.CellAt(indexPath).Accessory = UITableViewCellAccessory.Checkmark;
+            else
+                _tapHandler?.Invoke(indexPath);
         }
 
         public override void RowDeselected(UITableView tableView, NSIndexPath indexPath)

diff --git a/Sources/Stylophone.iOS/ViewControllers/AlbumDetailViewController.cs b/Sources/Stylophone.iOS/ViewControllers/AlbumDetailViewController.cs
@@ -34,7 +34,8 @@ public override void AwakeFromNib()
 			TraitCollectionDidChange(null);
 			NavigationItem.LargeTitleDisplayMode = UINavigationItemLargeTitleDisplayMode.Never;
 
-			var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source, GetRowContextMenu, GetRowSwipeActions, true, OnScroll);
+			var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source,
+				GetRowContextMenu, GetRowSwipeActions, false, OnScroll, OnTap);
 			TableView.DataSource = trackDataSource;
 			TableView.Delegate = trackDataSource;
             TableView.SelfSizingInvalidation = UITableViewSelfSizingInvalidation.EnabledIncludingConstraints;
@@ -44,7 +45,10 @@ public override void AwakeFromNib()
 			Binder.Bind<string>(AlbumTrackInfo, "text", nameof(ViewModel.PlaylistInfo));
 		}
 
-		private void OnScroll(UIScrollView scrollView)
+        private void OnTap(NSIndexPath indexPath) =>
+			ViewModel.AddToQueueCommand.Execute(new List<object> { ViewModel?.Source[indexPath.Row] });
+
+        private void OnScroll(UIScrollView scrollView)
         {
             if (scrollView.ContentOffset.Y > 192)
             {

diff --git a/Sources/Stylophone.iOS/ViewControllers/PlaylistViewController.cs b/Sources/Stylophone.iOS/ViewControllers/PlaylistViewController.cs
@@ -59,7 +59,8 @@ public override void AwakeFromNib()
 
             _settingsBtn = CreateSettingsButton();
 
-            var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source, GetRowContextMenu, GetRowSwipeActions, true, OnScroll);
+            var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source,
+                GetRowContextMenu, GetRowSwipeActions, false, OnScroll, OnTap);
             TableView.DataSource = trackDataSource;
             TableView.Delegate = trackDataSource;
 
@@ -103,6 +104,9 @@ public override void ViewWillDisappear(bool animated)
             ViewModel.Dispose();
         }
 
+        private void OnTap(NSIndexPath indexPath) =>
+            ViewModel.AddToQueueCommand.Execute(new List<object> { ViewModel?.Source[indexPath.Row] });
+
         private void OnScroll(UIScrollView scrollView)
         {
             if (scrollView.ContentOffset.Y > 192)

diff --git a/Sources/Stylophone.iOS/ViewControllers/QueueViewController.cs b/Sources/Stylophone.iOS/ViewControllers/QueueViewController.cs
@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Threading.Tasks;
+using System.Collections;
 
 namespace Stylophone.iOS.ViewControllers
 {
@@ -39,7 +40,7 @@ public override void AwakeFromNib()
         private void OnLeavingBackground(object sender, EventArgs e)
         {
             if (_mpdService.IsConnected)
-                Task.Run(async () => await ViewModel.LoadInitialDataAsync());
+                Task.Run(ViewModel.LoadInitialDataAsync);
         }
 
         public override void ViewDidLoad()
@@ -54,14 +55,18 @@ public override void ViewDidLoad()
 
             NavigationItem.RightBarButtonItem = CreateSettingsButton();
 
-            var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source, GetRowContextMenu, GetRowSwipeActions);
+            var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source,
+                GetRowContextMenu, GetRowSwipeActions, tapHandler:OnTap);
             TableView.DataSource = trackDataSource;
             TableView.Delegate = trackDataSource;
             TableView.SelfSizingInvalidation = UITableViewSelfSizingInvalidation.EnabledIncludingConstraints;
 
             _mpdService.SongChanged += ScrollToPlayingSong;
         }
 
+        private void OnTap(NSIndexPath indexPath) =>
+            ViewModel.PlayTrackCommand.Execute(new List<object> { ViewModel?.Source[indexPath.Row] });
+
         private void UpdateListOnPlaylistVersionChange(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(ViewModel.PlaylistVersion))

diff --git a/Sources/Stylophone.iOS/ViewControllers/SearchResultsViewController.cs b/Sources/Stylophone.iOS/ViewControllers/SearchResultsViewController.cs
@@ -46,7 +46,8 @@ public override void ViewDidLoad()
                 valueTransformer: negateBoolTransformer);
 
 
-            var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source, GetRowContextMenu, GetRowSwipeActions);
+            var trackDataSource = new TrackTableViewDataSource(TableView, ViewModel.Source,
+                GetRowContextMenu, GetRowSwipeActions, tapHandler:OnTap);
             TableView.DataSource = trackDataSource;
             TableView.Delegate = trackDataSource;
 
@@ -58,6 +59,9 @@ public override void ViewDidLoad()
             SearchSegmentedControl.PrimaryActionTriggered += SearchSegmentedControl_PrimaryActionTriggered;
         }
 
+        private void OnTap(NSIndexPath indexPath) =>
+            ViewModel.AddToQueueCommand.Execute(new List<object> { ViewModel?.Source[indexPath.Row] });
+
         private void SearchSegmentedControl_PrimaryActionTriggered(object sender, EventArgs e)
         {
             switch (SearchSegmentedControl.SelectedSegment)