From: Seoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com> Date: Fri, 26 Jun 2020 05:37:26 +0000 (+0900) Subject: [NUI] Deprecate FlexContainer class (#1704) X-Git-Tag: accepted/tizen/unified/20210219.040944~633 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a58f98e49d46cc0bfd4d295d84b0332eee33ece;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Deprecate FlexContainer class (#1704) * [NUI] Deprecate FlexContainer class - FlexLayout can be replaced FlexContainer. Signed-off-by: Seoyeon Kim --- diff --git a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs index ba14df4..9a873c0 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs @@ -27,9 +27,10 @@ namespace Tizen.NUI.BaseComponents /// FlexContainer can expand items to fill available free space, or shrink them to prevent overflow.
/// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public class FlexContainer : View { - /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. + /// Property of ContentDirection [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty ContentDirectionProperty = BindableProperty.Create("ContentDirection", typeof(ContentDirectionType), typeof(FlexContainer), ContentDirectionType.Inherit, propertyChanged: (bindable, oldValue, newValue) => { @@ -46,7 +47,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.Object.GetProperty(flexContainer.swigCPtr, FlexContainer.Property.CONTENT_DIRECTION).Get(out temp); return (ContentDirectionType)temp; }); - /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. + /// Property of FlexDirection [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty FlexDirectionProperty = BindableProperty.Create("FlexDirection", typeof(FlexDirectionType), typeof(FlexContainer), FlexDirectionType.Column, propertyChanged: (bindable, oldValue, newValue) => { @@ -63,7 +64,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.Object.GetProperty(flexContainer.swigCPtr, FlexContainer.Property.FLEX_DIRECTION).Get(out temp); return (FlexDirectionType)temp; }); - /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. + /// Property of FlexWrap [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty FlexWrapProperty = BindableProperty.Create("FlexWrap", typeof(WrapType), typeof(FlexContainer), WrapType.NoWrap, propertyChanged: (bindable, oldValue, newValue) => { @@ -80,7 +81,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.Object.GetProperty(flexContainer.swigCPtr, FlexContainer.Property.FLEX_WRAP).Get(out temp); return (WrapType)temp; }); - /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. + /// Property of JustifyContent [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty JustifyContentProperty = BindableProperty.Create("JustifyContent", typeof(Justification), typeof(FlexContainer), Justification.JustifyFlexStart, propertyChanged: (bindable, oldValue, newValue) => { @@ -97,7 +98,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.Object.GetProperty(flexContainer.swigCPtr, FlexContainer.Property.JUSTIFY_CONTENT).Get(out temp); return (Justification)temp; }); - /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. + /// Property of AlignItems [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty AlignItemsProperty = BindableProperty.Create("AlignItems", typeof(Alignment), typeof(FlexContainer), Alignment.AlignAuto, propertyChanged: (bindable, oldValue, newValue) => { @@ -114,7 +115,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.Object.GetProperty(flexContainer.swigCPtr, FlexContainer.Property.ALIGN_ITEMS).Get(out temp); return (Alignment)temp; }); - /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. + /// Property of AlignContent [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty AlignContentProperty = BindableProperty.Create("AlignContent", typeof(Alignment), typeof(FlexContainer), Alignment.AlignAuto, propertyChanged: (bindable, oldValue, newValue) => { @@ -138,6 +139,7 @@ namespace Tizen.NUI.BaseComponents /// Calling member functions with an uninitialized handle is not allowed. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public FlexContainer() : this(Interop.FlexContainer.FlexContainer_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -152,27 +154,32 @@ namespace Tizen.NUI.BaseComponents /// the direction that flex items are laid out in the flex container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public enum FlexDirectionType { /// /// The flexible items are displayed vertically as a column. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] Column, /// /// The flexible items are displayed vertically as a column, but in reverse order. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] ColumnReverse, /// /// The flexible items are displayed horizontally as a row. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] Row, /// /// The flexible items are displayed horizontally as a row. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] RowReverse } @@ -181,22 +188,26 @@ namespace Tizen.NUI.BaseComponents /// and on which sides the ?�start??and ?�end??are. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public enum ContentDirectionType { /// /// Inherits the same direction from the parent. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] Inherit, /// /// From left to right. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] LTR, /// /// From right to left. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] RTL } @@ -205,32 +216,38 @@ namespace Tizen.NUI.BaseComponents /// space on the main axis. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public enum Justification { /// /// Items are positioned at the beginning of the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] JustifyFlexStart, /// /// Items are positioned at the center of the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] JustifyCenter, /// /// Items are positioned at the end of the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] JustifyFlexEnd, /// /// Items are positioned with equal space between the lines. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] JustifySpaceBetween, /// /// Items are positioned with equal space before, between, and after the lines. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] JustifySpaceAround } @@ -239,32 +256,38 @@ namespace Tizen.NUI.BaseComponents /// use all the available space on the cross axis. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public enum Alignment { /// /// Inherits the same alignment from the parent (only valid for "alignSelf" property). /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] AlignAuto, /// /// At the beginning of the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] AlignFlexStart, /// /// At the center of the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] AlignCenter, /// /// At the end of the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] AlignFlexEnd, /// /// Stretch to fit the container. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] AlignStretch } @@ -273,17 +296,20 @@ namespace Tizen.NUI.BaseComponents /// all the items on one flex line. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public enum WrapType { /// /// Flex items laid out in single line (shrunk to fit the flex container along the main axis). /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] NoWrap, /// /// Flex items laid out in multiple lines if needed. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] Wrap } @@ -291,6 +317,7 @@ namespace Tizen.NUI.BaseComponents /// The primary direction in which content is ordered. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public ContentDirectionType ContentDirection { get @@ -308,6 +335,7 @@ namespace Tizen.NUI.BaseComponents /// The direction of the main axis which determines the direction that flex items are laid out. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public FlexDirectionType FlexDirection { get @@ -325,6 +353,7 @@ namespace Tizen.NUI.BaseComponents /// Whether the flex items should wrap or not if there is no enough room for them on one flex line. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public WrapType FlexWrap { get @@ -342,6 +371,7 @@ namespace Tizen.NUI.BaseComponents /// The alignment of flex items when the items do not use all available space on the main axis. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public Justification JustifyContent { get @@ -359,6 +389,7 @@ namespace Tizen.NUI.BaseComponents /// The alignment of flex items when the items do not use all available space on the cross axis. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public Alignment AlignItems { get @@ -376,6 +407,7 @@ namespace Tizen.NUI.BaseComponents /// Similar to "alignItems", but it aligns flex lines; so only works when there are multiple lines. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10. Please use FlexLayout instead!")] public Alignment AlignContent { get @@ -390,7 +422,6 @@ namespace Tizen.NUI.BaseComponents } - /// This will not be public opened. [EditorBrowsable(EditorBrowsableState.Never)] protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr) { @@ -401,7 +432,7 @@ namespace Tizen.NUI.BaseComponents /// Enumeration for the instance of child properties belonging to the FlexContainer class. /// /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use View.Flex, View.AlignSelf, View.FlexMargin instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public class ChildProperty diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 7bd1d16..401b48d 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -490,6 +490,7 @@ namespace Tizen.NUI.BaseComponents /// If all items in the container set this property, their sizes will be proportional to the specified flex factor.
/// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10.")] public float Flex { get @@ -508,6 +509,7 @@ namespace Tizen.NUI.BaseComponents /// The alignment of the flex item along the cross axis, which, if set, overides the default alignment for all items in the container.
/// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10.")] public int AlignSelf { get @@ -529,6 +531,7 @@ namespace Tizen.NUI.BaseComponents /// The property cascade chaining set is possible. For example, this (view.FlexMargin.X = 0.1f;) is possible. /// /// 3 + [Obsolete("Deprecated in API8, will be removed in API10.")] public Vector4 FlexMargin { get