Merge pull request #19 from PavloLukianets/dev/cleanup_handlers_net8

net8 + handlers + cleanup
AndreiMisiukevich · Dec 5, 2023 · 76d23e1 · 76d23e1
2 parents 0190e5f + 5ef6fb9
commit 76d23e1
Show file tree

Hide file tree

Showing 58 changed files with 292 additions and 394 deletions.
diff --git a/.gitignore b/.gitignore
@@ -348,3 +348,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Rider
+.idea/
diff --git a/PanCardView/Common/AppBuilderExtensions.cs b/PanCardView/Common/AppBuilderExtensions.cs
@@ -1,9 +1,7 @@
-using Microsoft.Maui.Controls.Compatibility.Hosting;
-using PanCardView;
-using PanCardView.Controls;
+using PanCardView.Controls;
+#if ANDROID
 using PanCardView.Utility;
-using CarouselView = PanCardView.CarouselView;
-
+#endif
 
 namespace PanCardView
 {
@@ -24,15 +22,12 @@ public static MauiAppBuilder UseCardsView(this MauiAppBuilder builder)
             TabsControl.Preserve();
 
 #if ANDROID
-            DependencyService.RegisterSingleton<IAnimationsChecker>(new PanCardView.Droid.AnimationsChecker());
-#endif
-
-            return builder.UseMauiCompatibility().ConfigureMauiHandlers((handlers) => {
-#if ANDROID
-                handlers.AddCompatibilityRenderer(typeof(CardsView), typeof(PanCardView.Droid.CardsViewRenderer));
+            DependencyService.RegisterSingleton<IAnimationsChecker>(new Droid.AnimationsChecker());
 #endif
-#if IOS
-                handlers.AddCompatibilityRenderer(typeof(CardsView), typeof(PanCardView.iOS.CardsViewRenderer));
+            return builder.ConfigureMauiHandlers(handlers =>
+            {
+#if ANDROID || IOS         
+                handlers.AddHandler(typeof(CardsView), typeof(CardsViewHandler));
 #endif
             });
         }

diff --git a/PanCardView/Common/Behaviors/ContextAssignedBehavior.cs b/PanCardView/Common/Behaviors/ContextAssignedBehavior.cs
@@ -1,6 +1,4 @@
-using Microsoft.Maui;
-
-namespace PanCardView.Behaviors
+namespace PanCardView.Behaviors
 {
     public sealed class ContextAssignedBehavior : Behavior<View>
     {

diff --git a/PanCardView/Common/Behaviors/ProtectedControlBehavior.cs b/PanCardView/Common/Behaviors/ProtectedControlBehavior.cs
@@ -1,6 +1,4 @@
-using Microsoft.Maui;
-
-namespace PanCardView.Behaviors
+namespace PanCardView.Behaviors
 {
     public sealed class ProtectedControlBehavior : Behavior<View>
     {

diff --git a/PanCardView/Common/CardsView.cs b/PanCardView/Common/CardsView.cs
@@ -3,24 +3,15 @@
 using PanCardView.Extensions;
 using PanCardView.Processors;
 using PanCardView.Utility;
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Input;
-using Microsoft.Maui;
 using static System.Math;
-using System.Threading;
-using System.Runtime.CompilerServices;
 using PanCardView.EventArgs;
 using PanCardView.Delegates;
 using System.ComponentModel;
 using Microsoft.Maui.Layouts;
 
-using AbsoluteLayout = Microsoft.Maui.Controls.Compatibility.AbsoluteLayout;
-
 namespace PanCardView
 {
     public class CardsView : AbsoluteLayout
@@ -1720,7 +1711,7 @@ private void SendChildToBackIfNeeded(View view, View topView)
 
             if (currentIndex < backIndex)
             {
-                ExecutePreventException(() => LowerChild(view));
+                ExecutePreventException(() => view.ZIndex--);
             }
         }
 

diff --git a/PanCardView/Common/CardsViewHandler.cs b/PanCardView/Common/CardsViewHandler.cs
@@ -0,0 +1,18 @@
+using Microsoft.Maui.Handlers;
+
+namespace PanCardView;
+
+public partial class CardsViewHandler : LayoutHandler
+{
+    public static IPropertyMapper<CardsView, LayoutHandler> PropertyMapper = new PropertyMapper<CardsView, LayoutHandler>(Mapper)
+    {
+#if IOS
+        [nameof(CardsView.IsVerticalSwipeEnabled)] = MapIsVerticalSwipeEnabled,
+        [nameof(CardsView.IsUserInteractionEnabled)] = MapIsUserInteractionEnabled
+#endif
+    };
+
+    public CardsViewHandler() : base(PropertyMapper)
+    {
+    }
+}
diff --git a/PanCardView/Common/Controls/ArrowControl.cs b/PanCardView/Common/Controls/ArrowControl.cs
@@ -1,14 +1,9 @@
-using Microsoft.Maui;
-using PanCardView.Behaviors;
-using System.Threading;
+using PanCardView.Behaviors;
 using PanCardView.Extensions;
 using PanCardView.Utility;
-using System.Threading.Tasks;
 using System.ComponentModel;
 using Microsoft.Maui.Layouts;
 
-using AbsoluteLayout = Microsoft.Maui.Controls.Compatibility.AbsoluteLayout;
-
 namespace PanCardView.Controls
 {
     public class ArrowControl : ContentView

diff --git a/PanCardView/Common/Controls/CircleFrame.cs b/PanCardView/Common/Controls/CircleFrame.cs
@@ -1,7 +1,6 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using PanCardView.Extensions;
-using Microsoft.Maui;
-using static System.Math;
+using static System.Math;
 
 namespace PanCardView.Controls
 {
@@ -29,11 +28,11 @@ public double Size
         {
             get => (double)GetValue(SizeProperty);
             set => SetValue(SizeProperty, value);
-        }
-
+        }
+
         protected override void OnSizeAllocated(double width, double height)
         {
-            base.OnSizeAllocated(width, height);
+            base.OnSizeAllocated(width, height);
             if(width > 0 && height > 0)
             {
                 SetCornerRadius(Min(width, height));
@@ -42,11 +41,11 @@ protected override void OnSizeAllocated(double width, double height)
 
         protected void OnSizeUpdated()
         {
-            var size = Size;
+            var size = Size;
             if(size < 0)
             {
                 return;
-            }
+            }
 
             try
             {
@@ -59,9 +58,9 @@ protected void OnSizeUpdated()
             {
                 BatchCommit();
             }
-        }
-
-        private void SetCornerRadius(double size)
+        }
+
+        private void SetCornerRadius(double size)
             => CornerRadius = (float)size / 2;
     }
 }
diff --git a/PanCardView/Common/Controls/IndicatorsControl.cs b/PanCardView/Common/Controls/IndicatorsControl.cs
@@ -1,18 +1,12 @@
 using PanCardView.Behaviors;
 using PanCardView.Extensions;
 using System.Collections;
-using System.Linq;
-using Microsoft.Maui;
 using static PanCardView.Controls.Styles.DefaultIndicatorItemStyles;
-using System.Threading.Tasks;
-using System.Threading;
 using PanCardView.Utility;
 using System.ComponentModel;
 using System.Collections.Specialized;
 using Microsoft.Maui.Layouts;
 
-using AbsoluteLayout = Microsoft.Maui.Controls.Compatibility.AbsoluteLayout;
-
 namespace PanCardView.Controls
 {
     public class IndicatorsControl : StackLayout

diff --git a/PanCardView/Common/Controls/LeftArrowControl.cs b/PanCardView/Common/Controls/LeftArrowControl.cs
@@ -1,24 +1,21 @@
-using System.ComponentModel;
-using Microsoft.Maui;
+using System.ComponentModel;
 using static PanCardView.Resources.ResourcesInfo;
 
-using AbsoluteLayout = Microsoft.Maui.Controls.Compatibility.AbsoluteLayout;
-
 namespace PanCardView.Controls
 {
     public class LeftArrowControl : ArrowControl
     {
         public LeftArrowControl()
-        {
+        {
             IsRight = false;
             AbsoluteLayout.SetLayoutBounds(this, new Rect(0, .5, -1, -1));
         }
 
-        protected override ImageSource DefaultImageSource => WhiteLeftArrowImageSource;
+        protected override ImageSource DefaultImageSource => WhiteLeftArrowImageSource;
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public new static void Preserve()
-        {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
         }
     }
 }
diff --git a/PanCardView/Common/Controls/RightArrowControl.cs b/PanCardView/Common/Controls/RightArrowControl.cs
@@ -1,9 +1,6 @@
-using Microsoft.Maui;
-using System.ComponentModel;
+using System.ComponentModel;
 using static PanCardView.Resources.ResourcesInfo;
 
-using AbsoluteLayout = Microsoft.Maui.Controls.Compatibility.AbsoluteLayout;
-
 namespace PanCardView.Controls
 {
     public class RightArrowControl : ArrowControl

diff --git a/PanCardView/Common/Controls/TabsControl.cs b/PanCardView/Common/Controls/TabsControl.cs
@@ -1,19 +1,13 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
 using PanCardView.Behaviors;
 using PanCardView.Enums;
 using PanCardView.Extensions;
 using PanCardView.Utility;
-using Microsoft.Maui;
 using static System.Math;
 using Microsoft.Maui.Layouts;
 
-using AbsoluteLayout = Microsoft.Maui.Controls.Compatibility.AbsoluteLayout;
-
 namespace PanCardView.Controls
 {
     public class TabsControl : AbsoluteLayout

diff --git a/PanCardView/Common/CoverFlowView.cs b/PanCardView/Common/CoverFlowView.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using PanCardView.Extensions;
+using PanCardView.Extensions;
 using PanCardView.Processors;
-using Microsoft.Maui;
 using static System.Math;
 
 namespace PanCardView
@@ -18,8 +16,8 @@ public class CoverFlowView : CarouselView
         public static readonly BindableProperty PositionShiftValueProperty = BindableProperty.Create(nameof(PositionShiftValue), typeof(double), typeof(CoverFlowView), .0, propertyChanged: (bindable, oldValue, newValue) =>
         {
             bindable.AsCardsView().ForceRedrawViews();
-        });
-
+        });
+
         private bool _shouldForceHardSetCurrentView;
 
         public CoverFlowView() : this(new CoverFlowProcessor())
@@ -30,53 +28,53 @@ public CoverFlowView(IProcessor processor) : base(processor)
         {
         }
 
-        /// <summary>
-        /// Shift to current view percentage (percengate of CoverFlowView Size)
-        /// </summary>
+        /// <summary>
+        /// Shift to current view percentage (percengate of CoverFlowView Size)
+        /// </summary>
         /// <value>The position shift value.</value>
         public double PositionShiftPercentage
         {
             get => (double)GetValue(PositionShiftPercentageProperty);
             set => SetValue(PositionShiftPercentageProperty, value);
         }
-
-        /// <summary>
-        /// Shift to current view in absolute points
-        /// </summary>
+
+        /// <summary>
+        /// Shift to current view in absolute points
+        /// </summary>
         /// <value>The position shift value.</value>
         public double PositionShiftValue
         {
             get => (double)GetValue(PositionShiftValueProperty);
             set => SetValue(PositionShiftValueProperty, value);
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public new static void Preserve()
-        {
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
         }
 
-        protected override int DefaultBackViewsDepth => 2;
-
-        protected override int DefaultMaxChildrenCount => 17;
-
-        protected override int DefaultDesiredMaxChildrenCount => 12;
-
+        protected override int DefaultBackViewsDepth => 2;
+
+        protected override int DefaultMaxChildrenCount => 17;
+
+        protected override int DefaultDesiredMaxChildrenCount => 12;
+
         protected override void OnObservableCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
+        {
             if (sender != null)
-            {
+            {
                 _shouldForceHardSetCurrentView = true;
             }
             base.OnObservableCollectionChanged(sender, e);
-        }
-
+        }
+
         protected override bool CheckIsHardSetCurrentView()
-        {
+        {
             if (_shouldForceHardSetCurrentView)
-            {
+            {
                 _shouldForceHardSetCurrentView = false;
                 return true;
-            }
+            }
 
             var oldIndex = OldIndex;
             var index = SelectedIndex;
@@ -86,10 +84,10 @@ protected override bool CheckIsHardSetCurrentView()
             {
                 oldIndex = oldIndex.ToCyclicalIndex(ItemsCount);
                 index = index.ToCyclicalIndex(ItemsCount);
-            }
+            }
 
-            var hasFirstElement = Min(oldIndex, index) == 0;
-            var hasLastElement = Max(oldIndex, index) == ItemsCount - 1;
+            var hasFirstElement = Min(oldIndex, index) == 0;
+            var hasLastElement = Max(oldIndex, index) == ItemsCount - 1;
 
             return Abs(index - oldIndex) > 1 && (!isCyclical || !hasFirstElement || !hasLastElement);
         }

diff --git a/PanCardView/Common/CubeView.cs b/PanCardView/Common/CubeView.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using PanCardView.Processors;
 
 namespace PanCardView

diff --git a/PanCardView/Common/Enums/InteractionState.cs b/PanCardView/Common/Enums/InteractionState.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace PanCardView.Enums
+namespace PanCardView.Enums
 {
     [Flags]
     public enum InteractionState

diff --git a/PanCardView/Common/Enums/InteractionType.cs b/PanCardView/Common/Enums/InteractionType.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace PanCardView.Enums
+namespace PanCardView.Enums
 {
     [Flags]
     public enum InteractionType