From b2bd1447085da0176652eaadc313dab79ece89f3 Mon Sep 17 00:00:00 2001 From: Clarik Date: Thu, 18 Apr 2024 14:47:44 +0700 Subject: [PATCH] [NUI] BindableProperty ImageView ImageViewBindableProperty changes --- .../src/public/Application/NUIApplication.cs | 2 + .../src/public/BaseComponents/ImageView.cs | 472 +++++++++++++++++++-- .../BaseComponents/ImageViewBindableProperty.cs | 264 +++++++----- 3 files changed, 595 insertions(+), 143 deletions(-) diff --git a/src/Tizen.NUI/src/public/Application/NUIApplication.cs b/src/Tizen.NUI/src/public/Application/NUIApplication.cs index b2bf8f5..0007792 100755 --- a/src/Tizen.NUI/src/public/Application/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/Application/NUIApplication.cs @@ -33,6 +33,8 @@ namespace Tizen.NUI /// 3 public class NUIApplication : CoreApplication { + [EditorBrowsable(EditorBrowsableState.Never)] + static public bool IsUsingXaml { get; set; } = true; /// /// The instance of ResourceManager. /// diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index c519769..6ff4035 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.ComponentModel; +using Tizen.NUI; using Tizen.NUI.Binding; namespace Tizen.NUI.BaseComponents @@ -30,7 +31,59 @@ namespace Tizen.NUI.BaseComponents /// 3 public partial class ImageView : View { - static ImageView() { } + static ImageView() + { + if(NUIApplication.IsUsingXaml) + { + ResourceUrlProperty = BindableProperty.Create(nameof(ImageView.ResourceUrl), typeof(string), typeof(ImageView), string.Empty, propertyChanged: SetInternalResourceUrlProperty, defaultValueCreator: GetInternalResourceUrlProperty); + + ImageProperty = BindableProperty.Create(nameof(ImageView.Image), typeof(PropertyMap), typeof(ImageView), null, propertyChanged: SetInternalImageProperty, defaultValueCreator: GetInternalImageProperty); + + PreMultipliedAlphaProperty = BindableProperty.Create(nameof(PreMultipliedAlpha), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalPreMultipliedAlphaProperty, defaultValueCreator: GetInternalPreMultipliedAlphaProperty); + + PixelAreaProperty = BindableProperty.Create(nameof(PixelArea), typeof(RelativeVector4), typeof(ImageView), null, propertyChanged: SetInternalPixelAreaProperty, defaultValueCreator: GetInternalPixelAreaProperty); + + BorderProperty = BindableProperty.Create(nameof(Border), typeof(Rectangle), typeof(ImageView), null, propertyChanged: SetInternalBorderProperty, defaultValueCreator: GetInternalBorderProperty); + + BorderOnlyProperty = BindableProperty.Create(nameof(BorderOnly), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalBorderOnlyProperty, defaultValueCreator: GetInternalBorderOnlyProperty); + + SynchronosLoadingProperty = BindableProperty.Create(nameof(SynchronousLoading), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalSynchronosLoadingProperty, defaultValueCreator: GetInternalSynchronosLoadingProperty); + + SynchronousLoadingProperty = BindableProperty.Create(nameof(SynchronousLoading), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalSynchronousLoadingProperty, defaultValueCreator: GetInternalSynchronousLoadingProperty); + + OrientationCorrectionProperty = BindableProperty.Create(nameof(OrientationCorrection), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalOrientationCorrectionProperty, defaultValueCreator: GetInternalOrientationCorrectionProperty); + + MaskingModeProperty = BindableProperty.Create(nameof(MaskingMode), typeof(MaskingModeType), typeof(ImageView), default(MaskingModeType), propertyChanged: SetInternalMaskingModeProperty, defaultValueCreator: GetInternalMaskingModeProperty); + + FastTrackUploadingProperty = BindableProperty.Create(nameof(FastTrackUploading), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalFastTrackUploadingProperty, defaultValueCreator: GetInternalFastTrackUploadingProperty); + + ImageMapProperty = BindableProperty.Create(nameof(ImageMap), typeof(Tizen.NUI.PropertyMap), typeof(ImageView), null, propertyChanged: SetInternalImageMapProperty, defaultValueCreator: GetInternalImageMapProperty); + + AlphaMaskURLProperty = BindableProperty.Create(nameof(AlphaMaskURL), typeof(string), typeof(ImageView), string.Empty, propertyChanged: SetInternalAlphaMaskURLProperty, defaultValueCreator: GetInternalAlphaMaskURLProperty); + + CropToMaskProperty = BindableProperty.Create(nameof(CropToMask), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalCropToMaskProperty, defaultValueCreator: GetInternalCropToMaskProperty); + + FittingModeProperty = BindableProperty.Create(nameof(FittingMode), typeof(FittingModeType), typeof(ImageView), default(FittingModeType), propertyChanged: SetInternalFittingModeProperty, defaultValueCreator: GetInternalFittingModeProperty); + + DesiredWidthProperty = BindableProperty.Create(nameof(DesiredWidth), typeof(int), typeof(ImageView), 0, propertyChanged: SetInternalDesiredWidthProperty, defaultValueCreator: GetInternalDesiredWidthProperty); + + DesiredHeightProperty = BindableProperty.Create(nameof(DesiredHeight), typeof(int), typeof(ImageView), 0, propertyChanged: SetInternalDesiredHeightProperty, defaultValueCreator: GetInternalDesiredHeightProperty); + + ReleasePolicyProperty = BindableProperty.Create(nameof(ReleasePolicy), typeof(ReleasePolicyType), typeof(ImageView), default(ReleasePolicyType), propertyChanged: SetInternalReleasePolicyProperty, defaultValueCreator: GetInternalReleasePolicyProperty); + + WrapModeUProperty = BindableProperty.Create(nameof(WrapModeU), typeof(Tizen.NUI.WrapModeType), typeof(ImageView), default(WrapModeType), propertyChanged: SetInternalWrapModeUProperty, defaultValueCreator: GetInternalWrapModeUProperty); + + WrapModeVProperty = BindableProperty.Create(nameof(WrapModeV), typeof(Tizen.NUI.WrapModeType), typeof(ImageView), default(WrapModeType), propertyChanged: SetInternalWrapModeVProperty, defaultValueCreator: GetInternalWrapModeVProperty); + + AdjustViewSizeProperty = BindableProperty.Create(nameof(AdjustViewSize), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalAdjustViewSizeProperty, defaultValueCreator: GetInternalAdjustViewSizeProperty); + + PlaceHolderUrlProperty = BindableProperty.Create(nameof(PlaceHolderUrl), typeof(string), typeof(ImageView), string.Empty, propertyChanged: SetInternalPlaceHolderUrlProperty, defaultValueCreator: GetInternalPlaceHolderUrlProperty); + + TransitionEffectProperty = BindableProperty.Create(nameof(TransitionEffect), typeof(bool), typeof(ImageView), false, propertyChanged: SetInternalTransitionEffectProperty, defaultValueCreator: GetInternalTransitionEffectProperty); + + ImageColorProperty = BindableProperty.Create(nameof(ImageColor), typeof(Color), typeof(ImageView), null, propertyChanged: SetInternalImageColorProperty, defaultValueCreator: GetInternalImageColorProperty); + } + } static internal new void Preload() { @@ -334,11 +387,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (string)GetValue(ResourceUrlProperty); + if (NUIApplication.IsUsingXaml) + { + return (string)GetValue(ResourceUrlProperty); + } + else + { + return GetInternalResourceUrlProperty(this) as string; + } } set { - SetValue(ResourceUrlProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(ResourceUrlProperty, value); + } + else + { + SetInternalResourceUrlProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -354,11 +421,25 @@ namespace Tizen.NUI.BaseComponents { get { - return GetValue(ImageMapProperty) as PropertyMap; + if (NUIApplication.IsUsingXaml) + { + return GetValue(ImageMapProperty) as PropertyMap; + } + else + { + return GetInternalImageMapProperty(this) as PropertyMap; + } } set { - SetValue(ImageMapProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(ImageMapProperty, value); + } + else + { + SetInternalImageMapProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -426,7 +507,14 @@ namespace Tizen.NUI.BaseComponents { if (_border == null) { - return (PropertyMap)GetValue(ImageProperty); + if (NUIApplication.IsUsingXaml) + { + return (PropertyMap)GetValue(ImageProperty); + } + else + { + return GetInternalImageProperty(this) as PropertyMap; + } } else { @@ -437,7 +525,14 @@ namespace Tizen.NUI.BaseComponents { if (_border == null) { - SetValue(ImageProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(ImageProperty, value); + } + else + { + SetInternalImageProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -452,11 +547,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(PreMultipliedAlphaProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(PreMultipliedAlphaProperty); + } + else + { + return (bool) GetInternalPreMultipliedAlphaProperty(this); + } } set { - SetValue(PreMultipliedAlphaProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(PreMultipliedAlphaProperty, value); + } + else + { + SetInternalPreMultipliedAlphaProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -473,11 +582,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (RelativeVector4)GetValue(PixelAreaProperty); + if (NUIApplication.IsUsingXaml) + { + return (RelativeVector4)GetValue(PixelAreaProperty); + } + else + { + return GetInternalPixelAreaProperty(this) as RelativeVector4; + } } set { - SetValue(PixelAreaProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(PixelAreaProperty, value); + } + else + { + SetInternalPixelAreaProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -496,7 +619,15 @@ namespace Tizen.NUI.BaseComponents { get { - Rectangle temp = (Rectangle)GetValue(BorderProperty); + Rectangle temp; + if (NUIApplication.IsUsingXaml) + { + temp = (Rectangle)GetValue(BorderProperty); + } + else + { + temp = GetInternalBorderProperty(this) as Rectangle; + } if (null == temp) { return null; @@ -508,7 +639,14 @@ namespace Tizen.NUI.BaseComponents } set { - SetValue(BorderProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(BorderProperty, value); + } + else + { + SetInternalBorderProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -524,11 +662,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(BorderOnlyProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(BorderOnlyProperty); + } + else + { + return (bool)GetInternalBorderOnlyProperty(this); + } } set { - SetValue(BorderOnlyProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(BorderOnlyProperty, value); + } + else + { + SetInternalBorderOnlyProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -563,11 +715,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(SynchronousLoadingProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(SynchronousLoadingProperty); + } + else + { + return (bool)GetInternalSynchronousLoadingProperty(this); + } } set { - SetValue(SynchronousLoadingProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(SynchronousLoadingProperty, value); + } + else + { + SetInternalSynchronousLoadingProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -580,11 +746,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(OrientationCorrectionProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(OrientationCorrectionProperty); + } + else + { + return (bool)GetInternalOrientationCorrectionProperty(this); + } } set { - SetValue(OrientationCorrectionProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(OrientationCorrectionProperty, value); + } + else + { + SetInternalOrientationCorrectionProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -597,11 +777,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (MaskingModeType)GetValue(MaskingModeProperty); + if (NUIApplication.IsUsingXaml) + { + return (MaskingModeType)GetValue(MaskingModeProperty); + } + else + { + return (MaskingModeType)GetInternalMaskingModeProperty(this); + } } set { - SetValue(MaskingModeProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(MaskingModeProperty, value); + } + else + { + SetInternalMaskingModeProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -646,11 +840,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(FastTrackUploadingProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(FastTrackUploadingProperty); + } + else + { + return (bool)GetInternalFastTrackUploadingProperty(this); + } } set { - SetValue(FastTrackUploadingProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(FastTrackUploadingProperty, value); + } + else + { + SetInternalFastTrackUploadingProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -828,11 +1036,25 @@ namespace Tizen.NUI.BaseComponents { get { - return GetValue(AlphaMaskURLProperty) as string; + if (NUIApplication.IsUsingXaml) + { + return GetValue(AlphaMaskURLProperty) as string; + } + else + { + return GetInternalAlphaMaskURLProperty(this) as string; + } } set { - SetValue(AlphaMaskURLProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(AlphaMaskURLProperty, value); + } + else + { + SetInternalAlphaMaskURLProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -875,11 +1097,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(CropToMaskProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(CropToMaskProperty); + } + else + { + return (bool)GetInternalCropToMaskProperty(this); + } } set { - SetValue(CropToMaskProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(CropToMaskProperty, value); + } + else + { + SetInternalCropToMaskProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -982,11 +1218,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (FittingModeType)GetValue(FittingModeProperty); + if (NUIApplication.IsUsingXaml) + { + return (FittingModeType)GetValue(FittingModeProperty); + } + else + { + return (FittingModeType)GetInternalFittingModeProperty(this); + } } set { - SetValue(FittingModeProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(FittingModeProperty, value); + } + else + { + SetInternalFittingModeProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1024,11 +1274,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (int)GetValue(DesiredWidthProperty); + if (NUIApplication.IsUsingXaml) + { + return (int)GetValue(DesiredWidthProperty); + } + else + { + return (int)GetInternalDesiredWidthProperty(this); + } } set { - SetValue(DesiredWidthProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(DesiredWidthProperty, value); + } + else + { + SetInternalDesiredWidthProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1071,11 +1335,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (int)GetValue(DesiredHeightProperty); + if (NUIApplication.IsUsingXaml) + { + return (int)GetValue(DesiredHeightProperty); + } + else + { + return (int)GetInternalDesiredHeightProperty(this); + } } set { - SetValue(DesiredHeightProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(DesiredHeightProperty, value); + } + else + { + SetInternalDesiredHeightProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1115,11 +1393,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (ReleasePolicyType)GetValue(ReleasePolicyProperty); + if (NUIApplication.IsUsingXaml) + { + return (ReleasePolicyType)GetValue(ReleasePolicyProperty); + } + else + { + return (ReleasePolicyType)GetInternalReleasePolicyProperty(this); + } } set { - SetValue(ReleasePolicyProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(ReleasePolicyProperty, value); + } + else + { + SetInternalReleasePolicyProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1157,11 +1449,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (WrapModeType)GetValue(WrapModeUProperty); + if (NUIApplication.IsUsingXaml) + { + return (WrapModeType)GetValue(WrapModeUProperty); + } + else + { + return (WrapModeType)GetInternalWrapModeUProperty(this); + } } set { - SetValue(WrapModeUProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(WrapModeUProperty, value); + } + else + { + SetInternalWrapModeUProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1200,11 +1506,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (WrapModeType)GetValue(WrapModeVProperty); + if (NUIApplication.IsUsingXaml) + { + return (WrapModeType)GetValue(WrapModeVProperty); + } + else + { + return (WrapModeType)GetInternalWrapModeVProperty(this); + } } set { - SetValue(WrapModeVProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(WrapModeVProperty, value); + } + else + { + SetInternalWrapModeVProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1245,11 +1565,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(AdjustViewSizeProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(AdjustViewSizeProperty); + } + else + { + return (bool)GetInternalAdjustViewSizeProperty(this); + } } set { - SetValue(AdjustViewSizeProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(AdjustViewSizeProperty, value); + } + else + { + SetInternalAdjustViewSizeProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1266,11 +1600,27 @@ namespace Tizen.NUI.BaseComponents { get { - return (string)GetValue(PlaceHolderUrlProperty); + if (NUIApplication.IsUsingXaml) + { + return (string)GetValue(PlaceHolderUrlProperty); + + } + else + { + return GetInternalPlaceHolderUrlProperty(this) as string; + } } set { - SetValue(PlaceHolderUrlProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(PlaceHolderUrlProperty, value); + } + else + { + SetInternalPlaceHolderUrlProperty(this, null, value); + } + NotifyPropertyChanged(); } } @@ -1284,11 +1634,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (bool)GetValue(TransitionEffectProperty); + if (NUIApplication.IsUsingXaml) + { + return (bool)GetValue(TransitionEffectProperty); + } + else + { + return (bool)GetInternalTransitionEffectProperty(this); + } } set { - SetValue(TransitionEffectProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(TransitionEffectProperty, value); + } + else + { + SetInternalTransitionEffectProperty(this, null, value); + } NotifyPropertyChanged(); } } @@ -1317,11 +1681,25 @@ namespace Tizen.NUI.BaseComponents { get { - return (Color)GetValue(ImageColorProperty); + if (NUIApplication.IsUsingXaml) + { + return (Color)GetValue(ImageColorProperty); + } + else + { + return GetInternalImageColorProperty(this) as Color; + } } set { - SetValue(ImageColorProperty, value); + if (NUIApplication.IsUsingXaml) + { + SetValue(ImageColorProperty, value); + } + else + { + SetInternalImageColorProperty(this, null, value); + } NotifyPropertyChanged(); } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs index 05b6a59..a4e3b9b 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs @@ -25,7 +25,9 @@ namespace Tizen.NUI.BaseComponents { /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty ResourceUrlProperty = BindableProperty.Create(nameof(ImageView.ResourceUrl), typeof(string), typeof(ImageView), string.Empty, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty ResourceUrlProperty = null; + + internal static void SetInternalResourceUrlProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; @@ -38,17 +40,20 @@ namespace Tizen.NUI.BaseComponents imageView.resourceUrlSelector?.Reset(imageView); imageView.SetResourceUrl((string)newValue); } - }, - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalResourceUrlProperty(BindableObject bindable) { var imageView = (ImageView)bindable; return imageView?._resourceUrl ?? ""; - })); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty ImageProperty = BindableProperty.Create(nameof(ImageView.Image), typeof(PropertyMap), typeof(ImageView), null, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => + public static readonly BindableProperty ImageProperty = null; + + internal static void SetInternalImageProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -93,8 +98,9 @@ namespace Tizen.NUI.BaseComponents imageView.SetImageByPropertyMap(map); } } - }), - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalImageProperty(BindableObject bindable) { var imageView = (ImageView)bindable; if (imageView._border == null) @@ -117,11 +123,13 @@ namespace Tizen.NUI.BaseComponents { return null; } - })); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty PreMultipliedAlphaProperty = BindableProperty.Create(nameof(PreMultipliedAlpha), typeof(bool), typeof(ImageView), false, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => + public static readonly BindableProperty PreMultipliedAlphaProperty = null; + + internal static void SetInternalPreMultipliedAlphaProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -137,8 +145,9 @@ namespace Tizen.NUI.BaseComponents Object.InternalSetPropertyBool(imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha, (bool)newValue); } } - }), - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalPreMultipliedAlphaProperty(BindableObject bindable) { var imageView = (ImageView)bindable; bool temp = false; @@ -154,11 +163,13 @@ namespace Tizen.NUI.BaseComponents temp = Object.InternalGetPropertyBool(imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha); } return temp; - })); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty PixelAreaProperty = BindableProperty.Create(nameof(PixelArea), typeof(RelativeVector4), typeof(ImageView), null, propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => + public static readonly BindableProperty PixelAreaProperty = null; + + internal static void SetInternalPixelAreaProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -166,8 +177,9 @@ namespace Tizen.NUI.BaseComponents Object.InternalSetPropertyVector4(imageView.SwigCPtr, ImageView.Property.PixelArea, ((RelativeVector4)newValue).SwigCPtr); } - }), - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalPixelAreaProperty(BindableObject bindable) { var imageView = (ImageView)bindable; @@ -177,11 +189,13 @@ namespace Tizen.NUI.BaseComponents } Object.InternalRetrievingPropertyVector4(imageView.SwigCPtr, ImageView.Property.PixelArea, imageView.internalPixelArea.SwigCPtr); return imageView.internalPixelArea; - })); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty BorderProperty = BindableProperty.Create(nameof(Border), typeof(Rectangle), typeof(ImageView), null, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty BorderProperty = null; + + internal static void SetInternalBorderProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; imageView.borderSelector?.Reset(imageView); @@ -195,16 +209,19 @@ namespace Tizen.NUI.BaseComponents { imageView.SetBorder((Rectangle)newValue); } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalBorderProperty(BindableObject bindable) { var imageView = (ImageView)bindable; return imageView._border; - }); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty BorderOnlyProperty = BindableProperty.Create(nameof(BorderOnly), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty BorderOnlyProperty = null; + + internal static void SetInternalBorderOnlyProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -220,8 +237,9 @@ namespace Tizen.NUI.BaseComponents } imageView.UpdateImage(NpatchImageVisualProperty.BorderOnly, new PropertyValue((bool)newValue)); } - }, - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalBorderOnlyProperty(BindableObject bindable) { var imageView = (ImageView)bindable; bool ret = false; @@ -229,11 +247,13 @@ namespace Tizen.NUI.BaseComponents imageView.GetCachedImageVisualProperty(NpatchImageVisualProperty.BorderOnly)?.Get(out ret); return ret; - })); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty SynchronosLoadingProperty = BindableProperty.Create(nameof(SynchronousLoading), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty SynchronosLoadingProperty = null; + + internal static void SetInternalSynchronosLoadingProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -250,8 +270,9 @@ namespace Tizen.NUI.BaseComponents // Note : We need to create new visual if previous visual was async, and now we set value as sync. imageView.UpdateImage(ImageVisualProperty.SynchronousLoading, new PropertyValue((bool)newValue), (bool)newValue); } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalSynchronosLoadingProperty(BindableObject bindable) { var imageView = (ImageView)bindable; bool ret = false; @@ -259,11 +280,13 @@ namespace Tizen.NUI.BaseComponents imageView.GetCachedImageVisualProperty(ImageVisualProperty.SynchronousLoading)?.Get(out ret); return ret; - }); + } /// This will be public opened in tizen_7.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty SynchronousLoadingProperty = BindableProperty.Create(nameof(SynchronousLoading), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty SynchronousLoadingProperty = null; + + internal static void SetInternalSynchronousLoadingProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -280,8 +303,9 @@ namespace Tizen.NUI.BaseComponents // Note : We need to create new visual if previous visual was async, and now we set value as sync. imageView.UpdateImage(ImageVisualProperty.SynchronousLoading, new PropertyValue((bool)newValue), (bool)newValue); } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalSynchronousLoadingProperty(BindableObject bindable) { var imageView = (ImageView)bindable; bool ret = false; @@ -289,11 +313,13 @@ namespace Tizen.NUI.BaseComponents imageView.GetCachedImageVisualProperty(ImageVisualProperty.SynchronousLoading)?.Get(out ret); return ret; - }); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty OrientationCorrectionProperty = BindableProperty.Create(nameof(OrientationCorrection), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty OrientationCorrectionProperty = null; + + internal static void SetInternalOrientationCorrectionProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -309,8 +335,9 @@ namespace Tizen.NUI.BaseComponents } imageView.UpdateImage(ImageVisualProperty.OrientationCorrection, new PropertyValue((bool)newValue)); } - }, - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalOrientationCorrectionProperty(BindableObject bindable) { var imageView = (ImageView)bindable; @@ -319,263 +346,307 @@ namespace Tizen.NUI.BaseComponents imageView.GetCachedImageVisualProperty(ImageVisualProperty.OrientationCorrection)?.Get(out ret); return ret; - })); + } /// /// MaskingModeProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty MaskingModeProperty = BindableProperty.Create(nameof(MaskingMode), typeof(MaskingModeType), typeof(ImageView), default(MaskingModeType), propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty MaskingModeProperty = null; + + internal static void SetInternalMaskingModeProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalMaskingMode = (ImageView.MaskingModeType)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalMaskingModeProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalMaskingMode; - }); + } /// /// FastTrackUploadingProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty FastTrackUploadingProperty = BindableProperty.Create(nameof(FastTrackUploading), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty FastTrackUploadingProperty = null; + + internal static void SetInternalFastTrackUploadingProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalFastTrackUploading = (bool)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalFastTrackUploadingProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalFastTrackUploading; - }); + } /// /// ImageMapProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty ImageMapProperty = BindableProperty.Create(nameof(ImageMap), typeof(Tizen.NUI.PropertyMap), typeof(ImageView), null, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty ImageMapProperty = null; + + internal static void SetInternalImageMapProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalImageMap = (Tizen.NUI.PropertyMap)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalImageMapProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalImageMap; - }); + } /// /// AlphaMaskURLProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty AlphaMaskURLProperty = BindableProperty.Create(nameof(AlphaMaskURL), typeof(string), typeof(ImageView), string.Empty, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty AlphaMaskURLProperty = null; + + internal static void SetInternalAlphaMaskURLProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalAlphaMaskURL = (string)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalAlphaMaskURLProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalAlphaMaskURL; - }); + } /// /// CropToMaskProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty CropToMaskProperty = BindableProperty.Create(nameof(CropToMask), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty CropToMaskProperty = null; + + internal static void SetInternalCropToMaskProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalCropToMask = (bool)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalCropToMaskProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalCropToMask; - }); + } /// /// FittingModeProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty FittingModeProperty = BindableProperty.Create(nameof(FittingMode), typeof(FittingModeType), typeof(ImageView), default(FittingModeType), propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty FittingModeProperty = null; + + internal static void SetInternalFittingModeProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalFittingMode = (Tizen.NUI.FittingModeType)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalFittingModeProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalFittingMode; - }); + } /// /// DesiredWidthProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty DesiredWidthProperty = BindableProperty.Create(nameof(DesiredWidth), typeof(int), typeof(ImageView), 0, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty DesiredWidthProperty = null; + + internal static void SetInternalDesiredWidthProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalDesiredWidth = (int)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalDesiredWidthProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalDesiredWidth; - }); + } /// /// DesiredHeightProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty DesiredHeightProperty = BindableProperty.Create(nameof(DesiredHeight), typeof(int), typeof(ImageView), 0, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty DesiredHeightProperty = null; + + internal static void SetInternalDesiredHeightProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalDesiredHeight = (int)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalDesiredHeightProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalDesiredHeight; - }); + } /// /// ReleasePolicyProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty ReleasePolicyProperty = BindableProperty.Create(nameof(ReleasePolicy), typeof(ReleasePolicyType), typeof(ImageView), default(ReleasePolicyType), propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty ReleasePolicyProperty = null; + + internal static void SetInternalReleasePolicyProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalReleasePolicy = (Tizen.NUI.ReleasePolicyType)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalReleasePolicyProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalReleasePolicy; - }); + } /// /// WrapModeUProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty WrapModeUProperty = BindableProperty.Create(nameof(WrapModeU), typeof(Tizen.NUI.WrapModeType), typeof(ImageView), default(WrapModeType), propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty WrapModeUProperty = null; + + internal static void SetInternalWrapModeUProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalWrapModeU = (Tizen.NUI.WrapModeType)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalWrapModeUProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalWrapModeU; - }); + } /// /// WrapModeVProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty WrapModeVProperty = BindableProperty.Create(nameof(WrapModeV), typeof(Tizen.NUI.WrapModeType), typeof(ImageView), default(WrapModeType), propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty WrapModeVProperty = null; + + internal static void SetInternalWrapModeVProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.InternalWrapModeV = (Tizen.NUI.WrapModeType)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalWrapModeVProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.InternalWrapModeV; - }); + } /// /// AdjustViewSizeProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty AdjustViewSizeProperty = BindableProperty.Create(nameof(AdjustViewSize), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty AdjustViewSizeProperty = null; + + internal static void SetInternalAdjustViewSizeProperty(BindableObject bindable, object oldValue, object newValue) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { instance.adjustViewSize = (bool)newValue; } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalAdjustViewSizeProperty(BindableObject bindable) { var instance = (Tizen.NUI.BaseComponents.ImageView)bindable; return instance.adjustViewSize; - }); + } /// /// PlaceHolderUrlProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty PlaceHolderUrlProperty = BindableProperty.Create(nameof(PlaceHolderUrl), typeof(string), typeof(ImageView), string.Empty, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty PlaceHolderUrlProperty = null; + + internal static void SetInternalPlaceHolderUrlProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (Tizen.NUI.BaseComponents.ImageView)bindable; if (newValue != null) { Object.InternalSetPropertyString(imageView.SwigCPtr, ImageView.Property.PlaceHolderUrl, (string)newValue); } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalPlaceHolderUrlProperty(BindableObject bindable) { var imageView = (Tizen.NUI.BaseComponents.ImageView)bindable; return Object.InternalGetPropertyString(imageView.SwigCPtr, ImageView.Property.PlaceHolderUrl); - }); + } /// Intenal used, will never be opened. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty TransitionEffectProperty = BindableProperty.Create(nameof(TransitionEffect), typeof(bool), typeof(ImageView), false, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty TransitionEffectProperty = null; + + internal static void SetInternalTransitionEffectProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) { Object.InternalSetPropertyBool(imageView.SwigCPtr, ImageView.Property.TransitionEffect, (bool)newValue); } - }, - defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => + } + + internal static object GetInternalTransitionEffectProperty(BindableObject bindable) { var imageView = (ImageView)bindable; return Object.InternalGetPropertyBool(imageView.SwigCPtr, ImageView.Property.TransitionEffect); - })); + } /// /// ImageColorProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty ImageColorProperty = BindableProperty.Create(nameof(ImageColor), typeof(Color), typeof(ImageView), null, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty ImageColorProperty = null; + + internal static void SetInternalImageColorProperty(BindableObject bindable, object oldValue, object newValue) { var imageView = (ImageView)bindable; if (newValue != null) @@ -586,8 +657,9 @@ namespace Tizen.NUI.BaseComponents // Update property Interop.View.InternalUpdateVisualPropertyVector4(imageView.SwigCPtr, ImageView.Property.IMAGE, Visual.Property.MixColor, Vector4.getCPtr((Color)newValue)); } - }, - defaultValueCreator: (bindable) => + } + + internal static object GetInternalImageColorProperty(BindableObject bindable) { var imageView = (ImageView)bindable; Color ret = new Color(); @@ -595,6 +667,6 @@ namespace Tizen.NUI.BaseComponents imageView.GetCachedImageVisualProperty(Visual.Property.MixColor)?.Get(ret); return ret; - }); + } } } -- 2.7.4