Put SwipeView behind experimental flag (#8786)

* Put SwipeView behind experimental flag * Update Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
xamarin · Dec 6, 2019 · 5677829 · 5677829
1 parent 75f101f
commit 5677829
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 3 deletions.
diff --git a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
@@ -44,7 +44,7 @@ protected override void OnCreate(Bundle bundle)
 			// Fake_Flag is here so we can test for flag initialization issues
 			Forms.SetFlags("Fake_Flag"/*, "CollectionView_Experimental", "Shell_Experimental"*/); 
 #else
-			Forms.SetFlags("UseLegacyRenderers"/*, "CollectionView_Experimental", "Shell_Experimental" */);
+			Forms.SetFlags("UseLegacyRenderers", "SwipeView_Experimental");
 #endif
 			Forms.Init(this, bundle);
 

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs b/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs
@@ -70,7 +70,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 
                 rootFrame.NavigationFailed += OnNavigationFailed;
 
-				Forms.SetFlags("Shell_UWP_Experimental");
+				Forms.SetFlags("Shell_UWP_Experimental", "SwipeView_Experimental");
 				Forms.Init (e);
 				//FormsMaps.Init (Controls.App.Config["UWPMapsAuthKey"]);
 

diff --git a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs b/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
@@ -150,7 +150,7 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
 			App.IOSVersion = int.Parse(versionPart[0]);
 
 			Xamarin.Calabash.Start();
-			// Forms.SetFlags("CollectionView_Experimental", "Shell_Experimental");
+			Forms.SetFlags("SwipeView_Experimental");
 			Forms.Init();
 			FormsMaps.Init();
 			FormsMaterial.Init();

diff --git a/Xamarin.Forms.Core/ExperimentalFlags.cs b/Xamarin.Forms.Core/ExperimentalFlags.cs
@@ -12,6 +12,7 @@ internal static class ExperimentalFlags
 		internal const string IndicatorViewExperimental = "IndicatorView_Experimental";
 		internal const string ShellUWPExperimental = "Shell_UWP_Experimental";
 		internal const string CarouselViewExperimental = "CarouselView_Experimental";
+		internal const string SwipeViewExperimental = "SwipeView_Experimental";
 
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void VerifyFlagEnabled(

diff --git a/Xamarin.Forms.Core/SwipeView.cs b/Xamarin.Forms.Core/SwipeView.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using Xamarin.Forms.Platform;
 
 namespace Xamarin.Forms
@@ -15,6 +16,15 @@ public SwipeView()
 			_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<SwipeView>>(() => new PlatformConfigurationRegistry<SwipeView>(this));
 		}
 
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static void VerifySwipeViewFlagEnabled(
+			string constructorHint = null,
+			[CallerMemberName] string memberName = "")
+		{
+			ExperimentalFlags.VerifyFlagEnabled(nameof(SwipeView), ExperimentalFlags.SwipeViewExperimental, memberName: memberName);
+		}
+
 		public static readonly BindableProperty LeftItemsProperty = BindableProperty.Create(nameof(LeftItems), typeof(SwipeItems), typeof(SwipeView), null, BindingMode.OneWay, null, defaultValueCreator: SwipeItemsDefaultValueCreator);
 		public static readonly BindableProperty RightItemsProperty = BindableProperty.Create(nameof(RightItems), typeof(SwipeItems), typeof(SwipeView), null, BindingMode.OneWay, null, defaultValueCreator: SwipeItemsDefaultValueCreator);
 		public static readonly BindableProperty TopItemsProperty = BindableProperty.Create(nameof(TopItems), typeof(SwipeItems), typeof(SwipeView), null, BindingMode.OneWay, null, defaultValueCreator: SwipeItemsDefaultValueCreator);

diff --git a/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs
@@ -45,6 +45,7 @@ public class SwipeViewRenderer : ViewRenderer<SwipeView, AView>, GestureDetector
 
 		public SwipeViewRenderer(Context context) : base(context)
 		{
+			Xamarin.Forms.SwipeView.VerifySwipeViewFlagEnabled(nameof(SwipeViewRenderer));
 			_context = context;
 
 			AutoPackage = false;

diff --git a/Xamarin.Forms.Platform.UAP/SwipeViewRenderer.cs b/Xamarin.Forms.Platform.UAP/SwipeViewRenderer.cs
@@ -21,6 +21,7 @@ public class SwipeViewRenderer : ViewRenderer<SwipeView, WSwipeControl>
 
 		public SwipeViewRenderer()
 		{
+			Xamarin.Forms.SwipeView.VerifySwipeViewFlagEnabled(nameof(SwipeViewRenderer));
 			AutoPackage = false;
 		}
 

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs
@@ -35,6 +35,8 @@ public class SwipeViewRenderer : ViewRenderer<SwipeView, UIView>
 
 		public SwipeViewRenderer()
 		{
+			Xamarin.Forms.SwipeView.VerifySwipeViewFlagEnabled(nameof(SwipeViewRenderer));
+
 			_tapGestureRecognizer = new UITapGestureRecognizer(OnTap)
 			{
 				CancelsTouchesInView = true