Rename adapter methods

Less iOS like and more descriptive
Redth · Jul 26, 2023 · 0dc565a · 0dc565a
1 parent 0f36e3e
commit 0dc565a
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 44 deletions.
diff --git a/Sample/VirtualListViewSample/SectionedAdapter.cs b/Sample/VirtualListViewSample/SectionedAdapter.cs
@@ -11,16 +11,16 @@ public SectionedAdapter(IList<Section> items) : base()
 
 	public readonly IList<Section> Items;
 
-	public override Section Section(int sectionIndex)
+	public override Section GetSection(int sectionIndex)
 		=> Items[sectionIndex];
 
-	public override int Sections
+	public override int GetNumberOfSections()
 		=> Items.Count;
 
-	public override int ItemsForSection(int sectionIndex)
+	public override int GetNumberOfItemsInSection(int sectionIndex)
 		=> Items[sectionIndex].Count;
 
-	public override string Item(int sectionIndex, int itemIndex)
+	public override string GetItem(int sectionIndex, int itemIndex)
 		=> Items[sectionIndex][itemIndex];
 
 	public void AddItem(string sectionTitle, string itemName)

diff --git a/VirtualListView/Adapters/IVirtualListViewAdapter.cs b/VirtualListView/Adapters/IVirtualListViewAdapter.cs
@@ -2,13 +2,13 @@
 
 public interface IVirtualListViewAdapter
 {
-	int Sections { get; }
+	int GetNumberOfSections();
 
-	object Section(int sectionIndex);
+	object GetSection(int sectionIndex);
 
-	int ItemsForSection(int sectionIndex);
+	int GetNumberOfItemsInSection(int sectionIndex);
 
-	object Item(int sectionIndex, int itemIndex);
+	object GetItem(int sectionIndex, int itemIndex);
 
 	event EventHandler OnDataInvalidated;
 

diff --git a/VirtualListView/Adapters/ObservableCollectionAdapter.cs b/VirtualListView/Adapters/ObservableCollectionAdapter.cs
@@ -16,12 +16,12 @@ public ObservableCollectionAdapter(ObservableCollection<TItem> items)
 	bool disposedValue;
 
 	void CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-		=> InvalidateData();
+		=> ((IVirtualListViewAdapter)this).InvalidateData();
 
-	public override TItem Item(int sectionIndex, int itemIndex)
+	public override TItem GetItem(int sectionIndex, int itemIndex)
 		=> Items[itemIndex];
 
-	public override int ItemsForSection(int sectionIndex)
+	public override int GetNumberOfItemsInSection(int sectionIndex)
 		=> Items.Count;
 
 	protected virtual void Dispose(bool disposing)

diff --git a/VirtualListView/Adapters/VirtualListViewAdapter.cs b/VirtualListView/Adapters/VirtualListViewAdapter.cs
@@ -10,9 +10,9 @@ public VirtualListViewAdapter(IList<TItem> items)
 
 	readonly IList<TItem> items;
 
-	public override TItem Item(int sectionIndex, int itemIndex)
+	public override TItem GetItem(int sectionIndex, int itemIndex)
 		=> items[itemIndex];
 
-	public override int ItemsForSection(int sectionIndex)
+	public override int GetNumberOfItemsInSection(int sectionIndex)
 		=> items.Count;
 }
diff --git a/VirtualListView/Adapters/VirtualListViewAdapterBase.cs b/VirtualListView/Adapters/VirtualListViewAdapterBase.cs
@@ -2,23 +2,28 @@
 
 public abstract class VirtualListViewAdapterBase<TSection, TItem> : IVirtualListViewAdapter
 {
-	public virtual int Sections { get; } = 1;
+	public virtual int GetNumberOfSections() => 1;
 
 	public event EventHandler OnDataInvalidated;
 
 	public virtual void InvalidateData()
-		=> OnDataInvalidated?.Invoke(this, EventArgs.Empty);
+	{
+		OnDataInvalidated?.Invoke(this, EventArgs.Empty);
+	}
 
-	public abstract TItem Item(int sectionIndex, int itemIndex);
+	public abstract TItem GetItem(int sectionIndex, int itemIndex);
 
-	public abstract int ItemsForSection(int sectionIndex);
+	public abstract int GetNumberOfItemsInSection(int sectionIndex);
 
-	public virtual TSection Section(int sectionIndex)
+	public virtual TSection GetSection(int sectionIndex)
 		=> default;
 
-	object IVirtualListViewAdapter.Item(int sectionIndex, int itemIndex)
-		=> Item(sectionIndex, itemIndex);
+	object IVirtualListViewAdapter.GetItem(int sectionIndex, int itemIndex)
+		=> GetItem(sectionIndex, itemIndex);
 
-	object IVirtualListViewAdapter.Section(int sectionIndex)
-		=> Section(sectionIndex);
+	object IVirtualListViewAdapter.GetSection(int sectionIndex)
+		=> GetSection(sectionIndex);
+
+	void IVirtualListViewAdapter.InvalidateData()
+		=> InvalidateData();
 }
diff --git a/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs b/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs
@@ -134,7 +134,6 @@ public static void MapDeselectItems(VirtualListViewHandler handler, IVirtualList
 
 	static void UpdateSelected(VirtualListViewHandler handler, ItemPosition[] itemPositions, bool selected)
 	{
-
 		foreach (var itemPosition in itemPositions)
 		{
 			var realIndex = handler.PositionalViewSelector.GetIndexPath(itemPosition.SectionIndex, itemPosition.ItemIndex);
@@ -215,9 +214,6 @@ void UpdateEmptyView()
 	public void InvalidateData()
 	{
 		this.PlatformView.InvokeOnMainThread(() => {
-			dataSource?.Reset(collectionView);
-			PositionalViewSelector?.Reset();
-
 			layout?.InvalidateLayout();
 
 			UpdateEmptyViewVisibility();

diff --git a/VirtualListView/LRUCache.cs b/VirtualListView/LRUCache.cs
@@ -9,7 +9,17 @@ internal class LRUCache<TKey, TValue>
 {
 	OrderedDictionary items = new OrderedDictionary();
 
-	public int Capacity { get; set; } = 1000;
+	public int Capacity { get; set; }
+
+	public LRUCache()
+	{
+		Capacity = 1000;
+	}
+
+	public LRUCache(int capacity)
+	{
+		Capacity = capacity;
+	}
 
 	public void AddReplace(TKey key, TValue value)
 	{

diff --git a/VirtualListView/Platforms/Android/RvAdapter.cs b/VirtualListView/Platforms/Android/RvAdapter.cs
@@ -63,11 +63,11 @@ public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int positi
 		{
 			var data = info.Kind switch {
 				PositionKind.Item =>
-					positionalViewSelector?.Adapter?.Item(info.SectionIndex, info.ItemIndex),
+					positionalViewSelector?.Adapter?.GetItem(info.SectionIndex, info.ItemIndex),
 				PositionKind.SectionHeader =>
-					positionalViewSelector?.Adapter?.Section(info.SectionIndex),
+					positionalViewSelector?.Adapter?.GetSection(info.SectionIndex),
 				PositionKind.SectionFooter =>
-					positionalViewSelector?.Adapter?.Section(info.SectionIndex),
+					positionalViewSelector?.Adapter?.GetSection(info.SectionIndex),
 				_ => null
 			};
 
@@ -89,11 +89,11 @@ public override int GetItemViewType(int position)
 
 		var data = info.Kind switch {
 			PositionKind.Item =>
-				positionalViewSelector?.Adapter?.Item(info.SectionIndex, info.ItemIndex),
+				positionalViewSelector?.Adapter?.GetItem(info.SectionIndex, info.ItemIndex),
 			PositionKind.SectionHeader =>
-				positionalViewSelector?.Adapter?.Section(info.SectionIndex),
+				positionalViewSelector?.Adapter?.GetSection(info.SectionIndex),
 			PositionKind.SectionFooter =>
-				positionalViewSelector?.Adapter?.Section(info.SectionIndex),
+				positionalViewSelector?.Adapter?.GetSection(info.SectionIndex),
 			_ => null
 		};
 
@@ -149,7 +149,6 @@ public void Reset()
 		lock (lockObj)
 		{
 			cachedReuseIds.Clear();
-			positionalViewSelector.Reset();
 		}
 	}
 }
diff --git a/VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs b/VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs
@@ -74,7 +74,6 @@ protected override void DisconnectHandler(FrameLayout nativeView)
 
 	public void InvalidateData()
 	{
-		PositionalViewSelector.Reset();
 		UpdateEmptyViewVisibility();
 		adapter?.Reset();
 		adapter?.NotifyDataSetChanged();

diff --git a/VirtualListView/VirtualListViewExtensions.cs b/VirtualListView/VirtualListViewExtensions.cs
@@ -7,9 +7,9 @@ internal static class VirtualListViewExtensions
 	public static object DataFor(this IVirtualListViewAdapter vlva, PositionKind kind, int sectionIndex, int itemIndex)
 		=> kind switch
 		{
-			PositionKind.Item => vlva.Item(sectionIndex, itemIndex),
-			PositionKind.SectionHeader => vlva.Section(sectionIndex),
-			PositionKind.SectionFooter => vlva.Section(sectionIndex),
+			PositionKind.Item => vlva.GetItem(sectionIndex, itemIndex),
+			PositionKind.SectionHeader => vlva.GetSection(sectionIndex),
+			PositionKind.SectionFooter => vlva.GetSection(sectionIndex),
 			_ => default
 		};
 }
diff --git a/VirtualListView/VirtualListViewHandler.cs b/VirtualListView/VirtualListViewHandler.cs
@@ -35,8 +35,8 @@ public VirtualListViewHandler(PropertyMapper mapper = null, CommandMapper comman
 
 	internal PositionalViewSelector PositionalViewSelector { get; private set; }
 
-	bool ShouldShowEmptyView => (PositionalViewSelector?.Adapter?.Sections ?? 0) <= 1
-					&& (PositionalViewSelector?.Adapter?.ItemsForSection(0) ?? 0) <= 0;
+	bool ShouldShowEmptyView => (PositionalViewSelector?.Adapter?.GetNumberOfSections() ?? 0) <= 1
+					&& (PositionalViewSelector?.Adapter?.GetNumberOfItemsInSection(0) ?? 0) <= 0;
 
 
 	public static void MapAdapter(VirtualListViewHandler handler, IVirtualListView virtualListView)

diff --git a/VirtualListView/VirtualListViewSectionedAdapter.cs b/VirtualListView/VirtualListViewSectionedAdapter.cs
@@ -13,15 +13,15 @@ public VirtualListViewSectionedAdapter(IList<TSection> sections)
 
 	readonly IList<TSection> sections;
 
-	public override int Sections
+	public override int GetNumberOfSections()
 		=> sections.Count;
 
-	public override TSection Section(int sectionIndex)
+	public override TSection GetSection(int sectionIndex)
 		=> sections[sectionIndex];
 
-	public override TItem Item(int sectionIndex, int itemIndex)
+	public override TItem GetItem(int sectionIndex, int itemIndex)
 		=> sections[sectionIndex][itemIndex];
 
-	public override int ItemsForSection(int sectionIndex)
+	public override int GetNumberOfItemsInSection(int sectionIndex)
 		=> sections[sectionIndex].Count;
 }