From dd05c8f64df88ae85d2a36e1936edfd77f0e74da Mon Sep 17 00:00:00 2001 From: Andres Pineda Date: Fri, 18 Jun 2021 10:24:10 -0400 Subject: [PATCH] fix: Move property to main class --- src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.cs | 10 ++++++++++ .../Xaml/Controls/FlipView/FlipView.iOSAndroid.cs | 10 ---------- .../UI/Xaml/Controls/FlipView/FlipView.managed.cs | 13 +------------ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.cs b/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.cs index 2172f73a92bd..3a04985ae8f2 100644 --- a/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.cs +++ b/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.cs @@ -19,6 +19,16 @@ public FlipView() InitializePartial(); } + public bool UseTouchAnimationsForAllNavigation + { + get { return (bool)GetValue(UseTouchAnimationsForAllNavigationProperty); } + set { SetValue(UseTouchAnimationsForAllNavigationProperty, value); } + } + + // Using a DependencyProperty as the backing store for UseTouchAnimationsForAllNavigation. This enables animation, styling, binding, etc... + public static DependencyProperty UseTouchAnimationsForAllNavigationProperty { get; } = + DependencyProperty.Register("UseTouchAnimationsForAllNavigation", typeof(bool), typeof(FlipView), new FrameworkPropertyMetadata(true)); + partial void InitializePartial(); partial void OnSelectedIndexChangedPartial(int oldValue, int newValue, bool animateChange); diff --git a/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.iOSAndroid.cs b/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.iOSAndroid.cs index 1a9c82a75ff7..6d288bec8f63 100644 --- a/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.iOSAndroid.cs +++ b/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.iOSAndroid.cs @@ -13,16 +13,6 @@ namespace Windows.UI.Xaml.Controls { public partial class FlipView : Selector { - public bool UseTouchAnimationsForAllNavigation - { - get { return (bool)GetValue(UseTouchAnimationsForAllNavigationProperty); } - set { SetValue(UseTouchAnimationsForAllNavigationProperty, value); } - } - - // Using a DependencyProperty as the backing store for UseTouchAnimationsForAllNavigation. This enables animation, styling, binding, etc... - public static DependencyProperty UseTouchAnimationsForAllNavigationProperty { get; } = - DependencyProperty.Register("UseTouchAnimationsForAllNavigation", typeof(bool), typeof(FlipView), new FrameworkPropertyMetadata(true)); - protected override void OnItemsSourceChanged(DependencyPropertyChangedEventArgs e) { base.OnItemsSourceChanged(e); diff --git a/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.managed.cs b/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.managed.cs index 19d646fdb5ef..f2766a52cd2f 100644 --- a/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.managed.cs +++ b/src/Uno.UI/UI/Xaml/Controls/FlipView/FlipView.managed.cs @@ -1,4 +1,4 @@ -#if __WASM__ || __SKIA__ +#if __WASM__ || __SKIA__ using System; using System.Collections; using System.Collections.Generic; @@ -249,17 +249,6 @@ private void HookTemplate() /// VERIFYHR / (hr); } - public bool UseTouchAnimationsForAllNavigation - { - get { return (bool)this.GetValue(UseTouchAnimationsForAllNavigationProperty); } - set { this.SetValue(UseTouchAnimationsForAllNavigationProperty, value); } - } - - // Using a DependencyProperty as the backing store for UseTouchAnimationsForAllNavigation. This enables animation, styling, binding, etc... - public static DependencyProperty UseTouchAnimationsForAllNavigationProperty { get; } = - DependencyProperty.Register("UseTouchAnimationsForAllNavigation", typeof(bool), typeof(FlipView), new FrameworkPropertyMetadata(true)); - - // Saves the Vertical/HorizontalSnapPointsTypes and clears them. This is necessary for us to // be able to chain animate FlipViewItems. void SaveAndClearSnapPointsTypes()