reworked crud operations

MPowerKit · Jul 23, 2024 · 68613e3 · 68613e3
1 parent 71e235a
commit 68613e3
Show file tree

Hide file tree

Showing 12 changed files with 221 additions and 418 deletions.
diff --git a/MPowerKit.VirtualizeListView/Android/VirtualizeListViewHandler.cs b/MPowerKit.VirtualizeListView/Android/VirtualizeListViewHandler.cs
@@ -4,11 +4,12 @@
 
 using AndroidX.Core.Widget;
 
+using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
 
 namespace MPowerKit.VirtualizeListView;
 
-public partial class VirtualizeListViewHandler
+public partial class VirtualizeListViewHandler : ScrollViewHandler
 {
     protected override MauiScrollView CreatePlatformView()
     {

diff --git a/MPowerKit.VirtualizeListView/BuilderExtensions.cs b/MPowerKit.VirtualizeListView/BuilderExtensions.cs
@@ -6,8 +6,11 @@ public static MauiAppBuilder UseMPowerKitListView(this MauiAppBuilder builder)
     {
         builder.ConfigureMauiHandlers(handlers =>
         {
-#if !WINDOWS
+#if ANDROID
             handlers.AddHandler<VirtualizeListView, VirtualizeListViewHandler>();
+#endif
+
+#if !WINDOWS
             handlers.AddHandler<FixedRefreshView, FixedRefreshViewRenderer>();
 #endif
         });

diff --git a/MPowerKit.VirtualizeListView/ItemsLayoutManager.cs b/MPowerKit.VirtualizeListView/ItemsLayoutManager.cs
@@ -15,9 +15,6 @@ public ItemsLayoutManager(VirtualizeItemsLayoutManger virtualizeItemsLayout) : b
 
     public override Size Measure(double widthConstraint, double heightConstraint)
     {
-        var measuredHeight = 0d;
-        var measuredWidth = 0d;
-
         Size newSize = new();
         if (Layout.ReadOnlyLaidOutItems.Count > 0)
         {
@@ -34,24 +31,12 @@ public override Size Measure(double widthConstraint, double heightConstraint)
             var child = items[n];
             var view = child as CellHolder;
 
-            if (/*view.Item!.IsCached ||*/ view.IsCached || !view.Item.IsAttached) continue;
-
-            //var bounds = view.Item.CellBounds;
+            if (view.IsCached || !view.Item.IsAttached) continue;
 
+            // this triggers item size change when needed
             var measure = child.Measure(double.PositiveInfinity, double.PositiveInfinity);
-
-            //measuredWidth = Math.Max(measuredWidth, bounds.Left + view.Item.Margin.Right + measure.Width);
-            //measuredHeight = Math.Max(measuredHeight, bounds.Top + view.Item.Margin.Bottom + measure.Height);
         }
 
-        //var finalWidth = GetFinalLength(Layout.Width, widthConstraint, measuredWidth);
-        //var finalHeight = GetFinalLength(Layout.Height, heightConstraint, measuredHeight);
-
-        //var finalWidth = GetFinalLength(newSize.Width, widthConstraint, measuredWidth);
-        //var finalHeight = GetFinalLength(newSize.Height, heightConstraint, measuredHeight);
-
-        //return new(finalWidth, finalHeight);
-
         return newSize;
     }
 
@@ -69,10 +54,9 @@ public override Size ArrangeChildren(Rect bounds)
         {
             var child = items[n];
             var view = child as CellHolder;
-#if WINDOWS
-            if (/*view.Item.IsCached ||*/ view.IsCached || !view.Item.IsAttached) continue;
-#elif ANDROID
-            if (/*!view.Item.IsCached &&*/ view.IsCached || !view.Item.IsAttached) continue;
+
+#if !MACIOS
+            if (view.IsCached || !view.Item.IsAttached) continue;
 #endif
 
             var (x, y) =
@@ -84,7 +68,7 @@ public override Size ArrangeChildren(Rect bounds)
 
             var newBounds = new Rect(x, y, view.DesiredSize.Width, view.DesiredSize.Height);
 
-#if !WINDOWS
+#if MACIOS
             if (view.Bounds == newBounds) continue;
 #endif
 
@@ -93,11 +77,4 @@ public override Size ArrangeChildren(Rect bounds)
 
         return new(availableWidth, availableHeight);
     }
-
-    private double GetFinalLength(double explicitLength, double externalConstraint, double measuredLength)
-    {
-        var length = Math.Min(double.IsNaN(explicitLength) ? measuredLength : explicitLength, externalConstraint);
-
-        return Math.Max(length, 0);
-    }
 }
diff --git a/MPowerKit.VirtualizeListView/LinearItemsLayoutManager.cs b/MPowerKit.VirtualizeListView/LinearItemsLayoutManager.cs
@@ -180,15 +180,15 @@ protected override void ShiftItemsConsecutively(IReadOnlyList<VirtualizeListView
         }
     }
 
-    protected override bool AdjustScrollIfNeeded(IReadOnlyList<VirtualizeListViewItem> items, VirtualizeListViewItem prevFirstVisiblItem, Rect prevCellBounds)
+    protected override bool AdjustScrollIfNeeded(IReadOnlyList<VirtualizeListViewItem> items, VirtualizeListViewItem prevItem, Rect prevCellBounds)
     {
-        if (IsOrientation(ScrollOrientation.Both) || prevFirstVisiblItem.Position == -1) return false;
+        if (IsOrientation(ScrollOrientation.Both) || prevItem.Position == -1) return false;
 
         bool needs;
 
         if (IsOrientation(ScrollOrientation.Vertical))
         {
-            var dy = prevFirstVisiblItem.CellBounds.Bottom - prevCellBounds.Bottom;
+            var dy = prevItem.CellBounds.Bottom - prevCellBounds.Bottom;
 
             needs = dy != 0d;
             if (!needs) return needs;
@@ -197,7 +197,7 @@ protected override bool AdjustScrollIfNeeded(IReadOnlyList<VirtualizeListViewIte
         }
         else
         {
-            var dx = prevFirstVisiblItem.CellBounds.Right - prevCellBounds.Right;
+            var dx = prevItem.CellBounds.Right - prevCellBounds.Right;
 
             needs = dx != 0d;
             if (!needs) return needs;

diff --git a/MPowerKit.VirtualizeListView/MPowerKit.VirtualizeListView.csproj b/MPowerKit.VirtualizeListView/MPowerKit.VirtualizeListView.csproj
@@ -13,10 +13,14 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+
+		<DefineConstants Condition="$(TargetFramework.Contains('ios')) OR $(TargetFramework.Contains('maccatalyst'))">$(DefineConstants);MACIOS</DefineConstants>
+
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MPowerKit.VirtualizeListView</Title>
-		<Version>1.1.7</Version>
+		<Version>1.2.0</Version>
 		<Authors>MPowerKit,Alex Dobrynin</Authors>
 		<Description>MAUI Virtualize ListView with smooth scrolling and without platform-specific code</Description>
 		<Copyright>MPowerKit</Copyright>

diff --git a/MPowerKit.VirtualizeListView/MaciOS/VirtualizeListViewHandler.cs b/MPowerKit.VirtualizeListView/MaciOS/VirtualizeListViewHandler.cs