Merge pull request #19 from TheEightBot/develop

Updated activatable list view

Author: michaelstonis

Stellar.Maui/ActivatableListView.cs Stellar.Maui/Views/ActivatableListView.csStellar.Maui/ActivatableListView.cs renamed to Stellar.Maui/Views/ActivatableListView.cs

@@ -1,13 +1,23 @@
 using System.Collections.Concurrent;
 
-namespace Stellar.Maui;
+namespace Stellar.Maui.Views;
 
 public class ActivatableListView : ListView
 {
     private readonly ConcurrentDictionary<Cell, IDisposable> _cellActivators = new();
 
     private Action<CompositeDisposable, Cell, int> _cellActivatedAction;
 
+    public ActivatableListView()
+        : this(ListViewCachingStrategy.RecycleElement)
+    {
+    }
+
+    public ActivatableListView(ListViewCachingStrategy cachingStrategy = ListViewCachingStrategy.RecycleElement)
+        : base(cachingStrategy)
+    {
+    }
+
     public IDisposable SetCellActivationAction(Action<CompositeDisposable, Cell, int> cellActivatedAction)
     {
         _cellActivatedAction = cellActivatedAction;

Stellar.Maui/Views/ContentViewBase.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Stellar.Maui.Pages;
+namespace Stellar.Maui.Views;
 
 public abstract class ContentViewBase<TViewModel> : ReactiveContentView<TViewModel>, IStellarView<TViewModel>
     where TViewModel : class

Stellar.Maui/Views/GridBase.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using ReactiveUI.Maui.Views;
 
 namespace Stellar.Maui.Views;
 

Stellar.Maui/Views/ReactiveGrid.cs

@@ -1,4 +1,4 @@
-namespace ReactiveUI.Maui;
+namespace ReactiveUI.Maui.Views;
 
 /// <summary>
 /// This is an <see cref="Grid"/> that is also an <see cref="IViewFor{T}"/>.

Stellar.Maui/Views/ReactiveListView.cs

@@ -1,15 +1,9 @@
 using System.Collections.Concurrent;
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Controls;
 
 namespace Stellar.Maui.Views;
 
-public class ReactiveListView : ListView
+public class ReactiveListView : ActivatableListView
 {
-    private readonly ConcurrentDictionary<Cell, IDisposable> _cellActivators = new ConcurrentDictionary<Cell, IDisposable>();
-
-    private Action<CompositeDisposable, Cell, int>? _cellActivatedAction;
-
     public ReactiveListView(Type cellType, ListViewCachingStrategy cachingStrategy = ListViewCachingStrategy.RecycleElement)
         : this(cachingStrategy)
     {
@@ -26,68 +20,4 @@ public ReactiveListView(ListViewCachingStrategy cachingStrategy = ListViewCachin
         : base(cachingStrategy)
     {
     }
-
-    public IDisposable SetCellActivationAction(Action<CompositeDisposable, Cell, int> cellActivatedAction)
-    {
-        _cellActivatedAction = cellActivatedAction;
-
-        return Disposable.Create(
-            () =>
-            {
-                _cellActivatedAction = null;
-
-                foreach (var cellItem in _cellActivators)
-                {
-                    cellItem.Value?.Dispose();
-                }
-
-                _cellActivators.Clear();
-            });
-    }
-
-    protected override void SetupContent(Cell content, int index)
-    {
-        base.SetupContent(content, index);
-
-        if (_cellActivatedAction is not null && !_cellActivators.ContainsKey(content))
-        {
-            var disposable = new CompositeDisposable();
-            _cellActivatedAction(disposable, content, index);
-            _cellActivators.AddOrUpdate(content, disposable, (_, _) => disposable);
-        }
-    }
-
-    protected override void UnhookContent(Cell content)
-    {
-        if (_cellActivators.ContainsKey(content) && _cellActivators.TryRemove(content, out var disposable))
-        {
-            disposable?.Dispose();
-        }
-
-        base.UnhookContent(content);
-    }
-
-    protected override void OnHandlerChanging(HandlerChangingEventArgs args)
-    {
-        if (args.NewHandler is null || _cellActivators.IsEmpty)
-        {
-            return;
-        }
-
-        foreach (var key in _cellActivators.Keys.ToArray())
-        {
-            if (_cellActivators.TryRemove(key, out var disposable))
-            {
-                disposable?.Dispose();
-            }
-        }
-    }
-}
-
-public static class ReactiveListViewExtensions
-{
-    public static IDisposable WhenCellActivated(this ReactiveListView reactiveList, Action<CompositeDisposable, Cell, int> whenCellActivated)
-    {
-        return reactiveList.SetCellActivationAction(whenCellActivated);
-    }
 }

Stellar.Maui/Views/StackLayoutBase.cs

@@ -59,7 +59,7 @@ protected override void OnPropertyChanged(string? propertyName = null)
     }
 }
 
-public abstract class StackLayoutBase<TViewModel, TDataModel> : ReactiveGrid<TViewModel>, IStellarView<TViewModel>
+public abstract class StackLayoutBase<TViewModel, TDataModel> : ReactiveStackLayout<TViewModel>, IStellarView<TViewModel>
     where TViewModel : class
 {
     [EditorBrowsable(EditorBrowsableState.Never)]