feat(iOS): Add TimePicker Feature Flag

unoplatform · Nov 27, 2020 · c332a25 · c332a25
1 parent 9171f2e
commit c332a25
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 35 deletions.
diff --git a/src/Uno.UI/FeatureConfiguration.cs b/src/Uno.UI/FeatureConfiguration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Windows.UI.Xaml;
@@ -450,5 +450,12 @@ public static class Xaml
 			[EditorBrowsable(EditorBrowsableState.Never)]
 			public static int MaxRecursiveResolvingDepth { get; set; } = 12;
 		}
+
+		public static class TimePicker
+		{
+#if __IOS__
+			public static bool UseLegacyStyle { get; set; } = false;
+#endif
+		}
 	}
 }
diff --git a/src/Uno.UI/UI/Xaml/Controls/TimePicker/TimePickerSelector.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/TimePicker/TimePickerSelector.iOS.cs
@@ -14,17 +14,10 @@ namespace Windows.UI.Xaml.Controls
 {
 	public partial class TimePickerSelector
 	{
-		private readonly UIDatePickerStyle _iOSDefaultStyle = UIDatePickerStyle.Wheels;
-
 		private UIDatePicker _picker;
 		private NSDate _initialTime;
 		private NSDate _newDate;
 
-		partial void InitPartial()
-		{
-			ResourceResolver.ApplyResource(this, UsePlatformDefaultStyleProperty, "TimePickerSelectorUsePlatformDefaultStyle", isThemeResourceExtension: false);
-		}
-
 		private protected override void OnLoaded()
 		{
 			base.OnLoaded();
@@ -155,38 +148,23 @@ private protected override void OnUnloaded()
 			base.OnUnloaded();
 		}
 
-		/// <summary>
-		/// Used to set whether or not we want to use the default <see cref="PreferredDatePickerStyle" /> specified for the os Version
-		/// Default value is False
-		/// </summary>
-		public bool UsePlatformDefaultStyle
-		{
-			get => (bool)GetValue(UsePlatformDefaultStyleProperty);
-			set => SetValue(UsePlatformDefaultStyleProperty, value);
-		}
-
-		public static DependencyProperty UsePlatformDefaultStyleProperty { get; } =
-			DependencyProperty.Register(
-				nameof(UsePlatformDefaultStyle),
-				typeof(bool),
-				typeof(TimePickerSelector),
-				new FrameworkPropertyMetadata(
-				 defaultValue: false,
-				 propertyChangedCallback: (s, e) => ((TimePickerSelector)s)?.OnUseDefaultStyleChanged()
-				));
-
-		private void OnUseDefaultStyleChanged() => UpdatePickerStyle();
-
 		private void UpdatePickerStyle()
 		{
 			if (_picker == null)
 			{
 				return;
 			}
 
-			_picker.PreferredDatePickerStyle = UIDevice.CurrentDevice.CheckSystemVersion(14, 0) && UsePlatformDefaultStyle
-						   ? UIDatePickerStyle.Inline
-						   : _iOSDefaultStyle;
+			if (UIDevice.CurrentDevice.CheckSystemVersion(14, 0))
+			{
+				_picker.PreferredDatePickerStyle = FeatureConfiguration.TimePicker.UseLegacyStyle
+																			? UIDatePickerStyle.Wheels
+																			: UIDatePickerStyle.Inline;
+			}
+			else
+			{
+				_picker.PreferredDatePickerStyle = UIDatePickerStyle.Wheels;
+			}
 		}
 	}
 }

diff --git a/src/Uno.UI/UI/Xaml/Style/Generic/Generic.Native.xaml b/src/Uno.UI/UI/Xaml/Style/Generic/Generic.Native.xaml
@@ -25,10 +25,8 @@
 
 	<!--iOS14 feature flag-->
 	<x:Boolean x:Key="DatePickerUsePlatformDefaultStyle">False</x:Boolean>
-	<x:Boolean x:Key="TimePickerUsePlatformDefaultStyle">False</x:Boolean>
 
 	<ios:StaticResource x:Key="DatePickerSelectorUsePlatformDefaultStyle" ResourceKey="DatePickerUsePlatformDefaultStyle" />
-	<ios:StaticResource x:Key="TimePickerSelectorUsePlatformDefaultStyle" ResourceKey="TimePickerUsePlatformDefaultStyle" />	
 	<!--iOS14 feature flag-->
 
 	<!-- Default native Button styles -->