https://github.com/AndreiMisiukevich/CardView/issues/175

AndreiMisiukevich · Mar 24, 2019 · f909a62 · f909a62
1 parent c068993
commit f909a62
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 24 deletions.
diff --git a/PanCardView.Droid/CardsViewRenderer.cs b/PanCardView.Droid/CardsViewRenderer.cs
@@ -35,7 +35,7 @@ public CardsViewRenderer(Context context) : base(context)
         }
 
         public static void Preserve()
-        => CardsView.Preserve();
+        => Preserver.Preserve();
 
         public override bool OnInterceptTouchEvent(MotionEvent ev)
         {

diff --git a/PanCardView.iOS/CardsViewRenderer.cs b/PanCardView.iOS/CardsViewRenderer.cs
@@ -18,7 +18,7 @@ public class CardsViewRenderer : VisualElementRenderer<CardsView>
         private readonly UISwipeGestureRecognizer _downSwipeGesture;
 
         public static void Preserve()
-        => CardsView.Preserve();
+        => Preserver.Preserve();
 
         public CardsViewRenderer()
         {

diff --git a/PanCardView/CardsView.cs b/PanCardView/CardsView.cs
@@ -17,6 +17,7 @@
 using System.Runtime.CompilerServices;
 using PanCardView.EventArgs;
 using PanCardView.Delegates;
+using System.ComponentModel;
 
 namespace PanCardView
 {
@@ -432,24 +433,9 @@ public ICommand ItemSwipedCommand
 
         public object this[int index] => ItemsSource?.FindValue(index);
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void Preserve()
         {
-            ArrowControl.Preserve();
-            CircleFrame.Preserve();
-            IndicatorsControl.Preserve();
-            ParentScrollView.Preserve();
-            new List<Type>
-            {
-                typeof(CarouselView),
-                typeof(CoverFlowView),
-                typeof(ArrowControl),
-                typeof(LeftArrowControl),
-                typeof(RightArrowControl),
-                typeof(CircleFrame),
-                typeof(IndicatorItemView),
-                typeof(IndicatorsControl),
-                typeof(ParentScrollView)
-            }.Clear();
         }
 
         public void OnPanUpdated(object sender, PanUpdatedEventArgs e)

diff --git a/PanCardView/CarouselView.cs b/PanCardView/CarouselView.cs
@@ -1,4 +1,5 @@
 using PanCardView.Processors;
+using System.ComponentModel;
 
 namespace PanCardView
 {
@@ -16,5 +17,10 @@ public CarouselView(ICardProcessor frontViewProcessor, ICardBackViewProcessor ba
         protected override double DefaultMoveWidthPercentage => .3;
 
         protected override bool DefaultIsCyclical => true;
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
+        }
     }
 }
diff --git a/PanCardView/Controls/ArrowControl.cs b/PanCardView/Controls/ArrowControl.cs
@@ -4,6 +4,7 @@
 using PanCardView.Extensions;
 using PanCardView.Utility;
 using System.Threading.Tasks;
+using System.ComponentModel;
 
 namespace PanCardView.Controls
 {
@@ -124,7 +125,8 @@ public ArrowControl()
             });
         }
 
-        public static void Preserve()
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
         {
         }
 

diff --git a/PanCardView/Controls/CircleFrame.cs b/PanCardView/Controls/CircleFrame.cs
@@ -1,4 +1,5 @@
-using PanCardView.Extensions;
+using System.ComponentModel;
+using PanCardView.Extensions;
 using Xamarin.Forms;
 
 namespace PanCardView.Controls
@@ -19,6 +20,7 @@ public CircleFrame()
             Padding = 0;
         }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void Preserve()
         {
         }

diff --git a/PanCardView/Controls/IndicatorItemView.cs b/PanCardView/Controls/IndicatorItemView.cs
@@ -1,4 +1,4 @@
-using Xamarin.Forms;
+using System.ComponentModel;
 
 namespace PanCardView.Controls
 {
@@ -8,5 +8,10 @@ public IndicatorItemView()
         {
             Size = 10;
         }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
+        }
     }
 }
diff --git a/PanCardView/Controls/IndicatorsControl.cs b/PanCardView/Controls/IndicatorsControl.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using PanCardView.Utility;
+using System.ComponentModel;
 
 namespace PanCardView.Controls
 {
@@ -155,6 +156,7 @@ public int ToFadeDuration
 
         public object this[int index] => IndicatorsContexts?.FindValue(index);
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void Preserve()
         {
         }

diff --git a/PanCardView/Controls/LeftArrowControl.cs b/PanCardView/Controls/LeftArrowControl.cs
@@ -1,4 +1,4 @@
-using PanCardView.Extensions;
+using System.ComponentModel;
 using Xamarin.Forms;
 
 namespace PanCardView.Controls
@@ -21,5 +21,10 @@ public LeftArrowControl()
                 Rotation = 180
             };
         }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
+        }
     }
 }
diff --git a/PanCardView/Controls/ParentScrollView.cs b/PanCardView/Controls/ParentScrollView.cs
@@ -1,11 +1,13 @@
-using Xamarin.Forms;
+using System.ComponentModel;
+using Xamarin.Forms;
 
 namespace PanCardView.Controls
 {
     public class ParentScrollView : ScrollView, IOrdinateHandlerParentView
     {
         private double _prevY;
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void Preserve()
         {
         }

diff --git a/PanCardView/Controls/RightArrowControl.cs b/PanCardView/Controls/RightArrowControl.cs
@@ -1,5 +1,5 @@
 using Xamarin.Forms;
-using PanCardView.Extensions;
+using System.ComponentModel;
 
 namespace PanCardView.Controls
 {
@@ -19,5 +19,10 @@ public RightArrowControl()
                 Text = "➤"
             };
         }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
+        }
     }
 }
diff --git a/PanCardView/CoverFlowView.cs b/PanCardView/CoverFlowView.cs
@@ -1,4 +1,5 @@
 using System.Collections.Specialized;
+using System.ComponentModel;
 using PanCardView.Extensions;
 using PanCardView.Processors;
 using Xamarin.Forms;
@@ -48,6 +49,11 @@ public double PositionShiftValue
             set => SetValue(PositionShiftValueProperty, value);
         }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new static void Preserve()
+        {
+        }
+
         protected override int DefaultBackViewsDepth => 2;
 
         protected override int DefaultMaxChildrenCount => 17;

diff --git a/PanCardView/Preserver.cs b/PanCardView/Preserver.cs
@@ -0,0 +1,20 @@
+using PanCardView.Controls;
+namespace PanCardView
+{
+    public static class Preserver
+    {
+        public static void Preserve()
+        {
+            CardsView.Preserve();
+            CarouselView.Preserve();
+            CoverFlowView.Preserve();
+            ArrowControl.Preserve();
+            LeftArrowControl.Preserve();
+            RightArrowControl.Preserve();
+            CircleFrame.Preserve();
+            IndicatorItemView.Preserve();
+            IndicatorsControl.Preserve();
+            ParentScrollView.Preserve();
+        }
+    }
+}