From f347c5fe41796400bb2ad2a4af73a363951db6c0 Mon Sep 17 00:00:00 2001 From: Xianbing Teng Date: Thu, 19 Mar 2020 11:59:24 +0800 Subject: [PATCH] [NUI] Public Style apis (#1434) * [Tizen.NUI.Components] Public Style apis * [NUI.Components] Add description of public apis * [NUI.Components] Change public api version to 8 * Open the public things of Style in Components * Open public property of Style in Loading and Popup * [NUI.Components] Public StyleBase and StyleManager * [NUI.Components] Replace attributes with style * [NUI.Components] Update description of apis * [NUI.Components] Fix comments error Co-authored-by: Fang Xiaohui --- src/Tizen.NUI.Components/Controls/Button.cs | 48 ++++---- src/Tizen.NUI.Components/Controls/CheckBox.cs | 6 +- src/Tizen.NUI.Components/Controls/Control.cs | 2 +- src/Tizen.NUI.Components/Controls/DropDown.cs | 21 ++-- .../Controls/FlexibleView/FlexibleView.cs | 2 +- src/Tizen.NUI.Components/Controls/Loading.cs | 23 ++-- src/Tizen.NUI.Components/Controls/Pagination.cs | 6 +- src/Tizen.NUI.Components/Controls/Popup.cs | 62 +++++----- src/Tizen.NUI.Components/Controls/Progress.cs | 33 +++--- src/Tizen.NUI.Components/Controls/RadioButton.cs | 6 +- src/Tizen.NUI.Components/Controls/Scrollbar.cs | 29 ++--- src/Tizen.NUI.Components/Controls/SelectButton.cs | 4 +- src/Tizen.NUI.Components/Controls/Slider.cs | 62 +++++----- src/Tizen.NUI.Components/Controls/Switch.cs | 37 +++--- src/Tizen.NUI.Components/Controls/Tab.cs | 59 ++++------ src/Tizen.NUI.Components/Controls/Toast.cs | 30 +++-- .../PreloadStyle/DefaultButtonStyle.cs | 2 +- .../PreloadStyle/DefaultCheckBoxStyle.cs | 2 +- .../PreloadStyle/DefaultDropDownStyle.cs | 4 +- .../PreloadStyle/DefaultPopupStyle.cs | 2 +- .../PreloadStyle/DefaultProgressStyle.cs | 2 +- .../PreloadStyle/DefaultRadioButtonStyle.cs | 2 +- .../PreloadStyle/DefaultSliderStyle.cs | 2 +- .../PreloadStyle/DefaultSwitchStyle.cs | 2 +- .../PreloadStyle/DefaultTabStyle.cs | 2 +- .../PreloadStyle/DefaultToastStyle.cs | 2 +- src/Tizen.NUI.Components/Style/ButtonStyle.cs | 71 ++++++----- src/Tizen.NUI.Components/Style/DropDownStyle.cs | 16 +-- src/Tizen.NUI.Components/Style/LoadingStyle.cs | 33 ++---- src/Tizen.NUI.Components/Style/PaginationStyle.cs | 2 +- src/Tizen.NUI.Components/Style/PopupStyle.cs | 43 +++---- src/Tizen.NUI.Components/Style/ProgressStyle.cs | 37 ++---- src/Tizen.NUI.Components/Style/ScrollbarStyle.cs | 47 +++----- src/Tizen.NUI.Components/Style/SliderStyle.cs | 131 ++++++--------------- src/Tizen.NUI.Components/Style/SwitchStyle.cs | 29 ++--- src/Tizen.NUI.Components/Style/TabStyle.cs | 57 ++++----- src/Tizen.NUI.Components/Style/ToastStyle.cs | 27 ++--- src/Tizen.NUI.Components/Utils/StyleBase.cs | 25 ++-- src/Tizen.NUI.Components/Utils/StyleManager.cs | 48 +++----- 39 files changed, 410 insertions(+), 608 deletions(-) mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultButtonStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultCheckBoxStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultDropDownStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultPopupStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultProgressStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultRadioButtonStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultSliderStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultSwitchStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultTabStyle.cs mode change 100644 => 100755 src/Tizen.NUI.Components/PreloadStyle/DefaultToastStyle.cs diff --git a/src/Tizen.NUI.Components/Controls/Button.cs b/src/Tizen.NUI.Components/Controls/Button.cs index fdc21dc..6da957d 100755 --- a/src/Tizen.NUI.Components/Controls/Button.cs +++ b/src/Tizen.NUI.Components/Controls/Button.cs @@ -147,22 +147,18 @@ namespace Tizen.NUI.Components /// Creates a new instance of a Button with style. /// /// Create Button by special style defined in UX. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Button(string style) : base(style) { Initialize(); } /// - /// Creates a new instance of a Button with attributes. + /// Creates a new instance of a Button with style. /// - /// Create Button by attributes customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Button(ButtonStyle controlStyle) : base(controlStyle) + /// Create Button by style customized by user. + /// 8 + public Button(ButtonStyle buttonStyle) : base(buttonStyle) { Initialize(); } @@ -215,8 +211,10 @@ namespace Tizen.NUI.Components Right, } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Style of the button. + /// + /// 8 public new ButtonStyle Style => ViewStyle as ButtonStyle; /// @@ -716,8 +714,11 @@ namespace Tizen.NUI.Components return base.OnTouch(touch); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Apply style to button. + /// + /// The style to apply. + /// 8 public override void ApplyStyle(ViewStyle viewStyle) { base.ApplyStyle(viewStyle); @@ -755,11 +756,10 @@ namespace Tizen.NUI.Components } /// - /// Get Button attribues. + /// Get Button style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default button style. + /// 8 protected override ViewStyle GetViewStyle() { return new ButtonStyle(); @@ -809,7 +809,7 @@ namespace Tizen.NUI.Components } /// - /// It is hijack by using protected, attributes copy problem when class inherited from Button. + /// It is hijack by using protected, style copy problem when class inherited from Button. /// /// 6 private void Initialize() @@ -966,15 +966,15 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { - ButtonStyle tempAttributes = StyleManager.Instance.GetViewStyle(style) as ButtonStyle; - if (tempAttributes != null) + ButtonStyle buttonStyle = StyleManager.Instance.GetViewStyle(style) as ButtonStyle; + if (buttonStyle != null) { - Style.CopyFrom(tempAttributes); + Style.CopyFrom(buttonStyle); UpdateUIContent(); } } diff --git a/src/Tizen.NUI.Components/Controls/CheckBox.cs b/src/Tizen.NUI.Components/Controls/CheckBox.cs index b4d3dec..a5a6bac 100755 --- a/src/Tizen.NUI.Components/Controls/CheckBox.cs +++ b/src/Tizen.NUI.Components/Controls/CheckBox.cs @@ -41,12 +41,12 @@ namespace Tizen.NUI.Components public CheckBox(string style) : base(style) { } /// - /// Creates a new instance of a CheckBox with attributes. + /// Creates a new instance of a CheckBox with style. /// - /// + /// /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public CheckBox(ButtonStyle attrs) : base(attrs) { } + public CheckBox(ButtonStyle buttonStyle) : base(buttonStyle) { } /// /// Get CheckBoxGroup to which this CheckBox belong. diff --git a/src/Tizen.NUI.Components/Controls/Control.cs b/src/Tizen.NUI.Components/Controls/Control.cs index eab871d..7055824 100755 --- a/src/Tizen.NUI.Components/Controls/Control.cs +++ b/src/Tizen.NUI.Components/Controls/Control.cs @@ -227,7 +227,7 @@ namespace Tizen.NUI.Components } /// - /// Update by attributes. + /// Update by style. /// /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. diff --git a/src/Tizen.NUI.Components/Controls/DropDown.cs b/src/Tizen.NUI.Components/Controls/DropDown.cs index 08e05fa..d539b79 100755 --- a/src/Tizen.NUI.Components/Controls/DropDown.cs +++ b/src/Tizen.NUI.Components/Controls/DropDown.cs @@ -155,13 +155,13 @@ namespace Tizen.NUI.Components public DropDown(string style) : base(style) { } /// - /// Creates a new instance of a DropDown with attributes. + /// Creates a new instance of a DropDown with style. /// - /// Create DropDown by attributes customized by user. + /// Create DropDown by style customized by user. /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public DropDown(DropDownStyle attributes) : base(attributes) + public DropDown(DropDownStyle dropDownStyle) : base(dropDownStyle) { } @@ -401,7 +401,7 @@ namespace Tizen.NUI.Components } /// - /// Update DropDown by attributes. + /// Update DropDown by style. /// /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -492,8 +492,9 @@ namespace Tizen.NUI.Components } /// - /// Get DropDown attribues. + /// Get DropDown style. /// + /// The default dropdown style. /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -790,12 +791,12 @@ namespace Tizen.NUI.Components { if(style != null) { - ViewStyle attributes = StyleManager.Instance.GetViewStyle(style); - if(attributes == null) + ViewStyle viewStyle = StyleManager.Instance.GetViewStyle(style); + if(viewStyle == null) { throw new InvalidOperationException($"There is no style {style}"); } - itemDataStyle = attributes as DropDownItemStyle; + itemDataStyle = viewStyle as DropDownItemStyle; } Initialize(); } @@ -1336,6 +1337,10 @@ namespace Tizen.NUI.Components base.Dispose(type); } + /// + /// Get DropDownItemView style. + /// + /// The empty. /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] protected override ViewStyle GetViewStyle() diff --git a/src/Tizen.NUI.Components/Controls/FlexibleView/FlexibleView.cs b/src/Tizen.NUI.Components/Controls/FlexibleView/FlexibleView.cs index 0740597..22bbcb0 100755 --- a/src/Tizen.NUI.Components/Controls/FlexibleView/FlexibleView.cs +++ b/src/Tizen.NUI.Components/Controls/FlexibleView/FlexibleView.cs @@ -467,7 +467,7 @@ namespace Tizen.NUI.Components } /// - /// you can override it to create your own default attributes. + /// you can override it to create your own default style. /// /// 6 /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. diff --git a/src/Tizen.NUI.Components/Controls/Loading.cs b/src/Tizen.NUI.Components/Controls/Loading.cs index 416863c..0907ac0 100755 --- a/src/Tizen.NUI.Components/Controls/Loading.cs +++ b/src/Tizen.NUI.Components/Controls/Loading.cs @@ -102,9 +102,7 @@ namespace Tizen.NUI.Components /// Constructor of the Loading class with special style. /// /// The string to initialize the Loading. - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Loading(string style) : base(style) { Initialize(); @@ -113,17 +111,17 @@ namespace Tizen.NUI.Components /// /// The constructor of the Loading class with specific style. /// - /// The style object to initialize the Loading. - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Loading(LoadingStyle style) : base(style) + /// The style object to initialize the Loading. + /// 8 + public Loading(LoadingStyle loadingStyle) : base(loadingStyle) { Initialize(); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of loading. + /// + /// 8 public new LoadingStyle Style => ViewStyle as LoadingStyle; /// @@ -195,9 +193,8 @@ namespace Tizen.NUI.Components /// /// Get Loading style. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default loading style. + /// 8 protected override ViewStyle GetViewStyle() { return new LoadingStyle(); diff --git a/src/Tizen.NUI.Components/Controls/Pagination.cs b/src/Tizen.NUI.Components/Controls/Pagination.cs index 7a55ad3..80d1c93 100755 --- a/src/Tizen.NUI.Components/Controls/Pagination.cs +++ b/src/Tizen.NUI.Components/Controls/Pagination.cs @@ -68,7 +68,7 @@ namespace Tizen.NUI.Components /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public Pagination(PaginationStyle style) : base(style) + public Pagination(PaginationStyle paginationStyle) : base(paginationStyle) { Initialize(); } @@ -266,7 +266,7 @@ namespace Tizen.NUI.Components } /// - /// you can override it to create your own default attributes. + /// you can override it to create your own default style. /// /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -308,7 +308,7 @@ namespace Tizen.NUI.Components paginationStyle = Style as PaginationStyle; if (paginationStyle == null) { - throw new Exception("Pagination attributes is null."); + throw new Exception("Pagination style is null."); } container = new VisualView() diff --git a/src/Tizen.NUI.Components/Controls/Popup.cs b/src/Tizen.NUI.Components/Controls/Popup.cs index 5070cb8..3cf1153 100755 --- a/src/Tizen.NUI.Components/Controls/Popup.cs +++ b/src/Tizen.NUI.Components/Controls/Popup.cs @@ -215,22 +215,18 @@ namespace Tizen.NUI.Components /// Creates a new instance of a Popup with style. /// /// Create Popup by special style defined in UX. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Popup(string style) : base(style) { Initialize(); } /// - /// Creates a new instance of a Popup with attributes. + /// Creates a new instance of a Popup with style. /// - /// Create Popup by attributes customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Popup(PopupStyle attributes) : base(attributes) + /// Create Popup by style customized by user. + /// 8 + public Popup(PopupStyle popupStyle) : base(popupStyle) { Initialize(); } @@ -278,15 +274,19 @@ namespace Tizen.NUI.Components } } - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Add button by style's name. + /// + /// 8 public void AddButton(string buttonText, string style) { AddButton(buttonText); } - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Add button by style. + /// + /// 8 public void AddButton(string buttonText, ButtonStyle style) { if (Style.Buttons != null && style != null) @@ -327,8 +327,10 @@ namespace Tizen.NUI.Components /// 6 public event EventHandler PopupButtonClickEvent; - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of popup. + /// + /// 8 public new PopupStyle Style => ViewStyle as PopupStyle; /// @@ -680,8 +682,11 @@ namespace Tizen.NUI.Components base.OnFocusLost(); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Apply style to popup. + /// + /// The style to apply. + /// 8 public override void ApplyStyle(ViewStyle viewStyle) { base.ApplyStyle(viewStyle); @@ -699,11 +704,10 @@ namespace Tizen.NUI.Components } /// - /// Get Popup attribues. + /// Get Popup style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default popup style. + /// 8 protected override ViewStyle GetViewStyle() { return new PopupStyle(); @@ -712,16 +716,16 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { - PopupStyle tempAttributes = StyleManager.Instance.GetViewStyle(style) as PopupStyle; - if (tempAttributes != null) + PopupStyle popupStyle = StyleManager.Instance.GetViewStyle(style) as PopupStyle; + if (popupStyle != null) { string strSaveTitleText = TitleText; - Style.CopyFrom(tempAttributes); + Style.CopyFrom(popupStyle); Style.Title.Text = strSaveTitleText; UpdateView(); } @@ -731,7 +735,7 @@ namespace Tizen.NUI.Components { container.Add(this); LeaveRequired = true; - PropertyChanged += PopupAttributesPropertyChanged; + PropertyChanged += PopupStylePropertyChanged; // ContentView ContentView = new View() @@ -779,7 +783,7 @@ namespace Tizen.NUI.Components } } - private void PopupAttributesPropertyChanged(object sender, PropertyChangedEventArgs e) + private void PopupStylePropertyChanged(object sender, PropertyChangedEventArgs e) { if (e.PropertyName.Equals("LayoutDirection")) { diff --git a/src/Tizen.NUI.Components/Controls/Progress.cs b/src/Tizen.NUI.Components/Controls/Progress.cs index 5a0a47b..7bcce34 100755 --- a/src/Tizen.NUI.Components/Controls/Progress.cs +++ b/src/Tizen.NUI.Components/Controls/Progress.cs @@ -147,21 +147,17 @@ namespace Tizen.NUI.Components /// The constructor of the Progress class with specific style. /// /// style name - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Progress(string style) : base(style) { Initialize(); } /// - /// The constructor of the Progress class with specific Attributes. + /// The constructor of the Progress class with specific style. /// - /// The Attributes object to initialize the Progress. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style object to initialize the Progress. + /// 8 public Progress(ProgressStyle progressStyle) : base(progressStyle) { Initialize(); @@ -192,8 +188,10 @@ namespace Tizen.NUI.Components Indeterminate } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of progress. + /// + /// 8 public new ProgressStyle Style => ViewStyle as ProgressStyle; /// @@ -420,11 +418,9 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// serder object - /// ThemeChangeEventArgs - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { ProgressStyle tempStyle = StyleManager.Instance.GetViewStyle(style) as ProgressStyle; @@ -483,11 +479,10 @@ namespace Tizen.NUI.Components } /// - /// Get Progress attribues. + /// Get Progress style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default progress style. + /// 8 protected override ViewStyle GetViewStyle() { return new ProgressStyle(); diff --git a/src/Tizen.NUI.Components/Controls/RadioButton.cs b/src/Tizen.NUI.Components/Controls/RadioButton.cs index bedb5e7..21b77c5 100755 --- a/src/Tizen.NUI.Components/Controls/RadioButton.cs +++ b/src/Tizen.NUI.Components/Controls/RadioButton.cs @@ -51,13 +51,13 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public RadioButton(string style) : base(style) { } /// - /// Creates a new instance of a RadioButton with attributes. + /// Creates a new instance of a RadioButton with style. /// - /// + /// /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public RadioButton(ButtonStyle attrs) : base(attrs) { } + public RadioButton(ButtonStyle buttonStyle) : base(buttonStyle) { } /// /// Get RadioButtonGroup to which this selections belong. /// diff --git a/src/Tizen.NUI.Components/Controls/Scrollbar.cs b/src/Tizen.NUI.Components/Controls/Scrollbar.cs index 45d4080..64a2d49 100755 --- a/src/Tizen.NUI.Components/Controls/Scrollbar.cs +++ b/src/Tizen.NUI.Components/Controls/Scrollbar.cs @@ -144,9 +144,7 @@ namespace Tizen.NUI.Components /// The constructor of ScrollBar with specific style. /// /// style name - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ScrollBar(string style) : base(style) { Initialize(); @@ -155,11 +153,9 @@ namespace Tizen.NUI.Components /// /// The constructor of ScrollBar with specific style. /// - /// The style object to initialize the ScrollBar. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public ScrollBar(ScrollBarStyle style) : base(style) + /// The style object to initialize the ScrollBar. + /// 8 + public ScrollBar(ScrollBarStyle scrollBarStyle) : base(scrollBarStyle) { Initialize(); } @@ -184,8 +180,10 @@ namespace Tizen.NUI.Components } #region public property - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of scrollbar. + /// + /// 8 public new ScrollBarStyle Style => ViewStyle as ScrollBarStyle; /// @@ -457,9 +455,8 @@ namespace Tizen.NUI.Components /// /// Get Scrollbar style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default scrollbar style. + /// 8 protected override ViewStyle GetViewStyle() { return new ScrollBarStyle(); @@ -468,9 +465,9 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { ScrollBarStyle tempStyle = StyleManager.Instance.GetViewStyle(style) as ScrollBarStyle; diff --git a/src/Tizen.NUI.Components/Controls/SelectButton.cs b/src/Tizen.NUI.Components/Controls/SelectButton.cs index e573863..9f3a147 100755 --- a/src/Tizen.NUI.Components/Controls/SelectButton.cs +++ b/src/Tizen.NUI.Components/Controls/SelectButton.cs @@ -65,11 +65,11 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a SelectButton with style. /// - /// Create SelectButton by style customized by user. + /// Create SelectButton by style customized by user. /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public SelectButton(ButtonStyle style) : base(style) + public SelectButton(ButtonStyle buttonStyle) : base(buttonStyle) { Initialize(); } diff --git a/src/Tizen.NUI.Components/Controls/Slider.cs b/src/Tizen.NUI.Components/Controls/Slider.cs index 7f1bc9a..fc46ae7 100755 --- a/src/Tizen.NUI.Components/Controls/Slider.cs +++ b/src/Tizen.NUI.Components/Controls/Slider.cs @@ -162,9 +162,7 @@ namespace Tizen.NUI.Components /// The constructor of the Slider class with specific style. /// /// The string to initialize the Slider - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Slider(string style) : base(style) { Initialize(); @@ -173,11 +171,9 @@ namespace Tizen.NUI.Components /// /// The constructor of the Slider class with specific style. /// - /// The style object to initialize the Slider - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Slider(SliderStyle style) : base(style) + /// The style object to initialize the Slider + /// 8 + public Slider(SliderStyle sliderStyle) : base(sliderStyle) { Initialize(); } @@ -268,8 +264,10 @@ namespace Tizen.NUI.Components Text } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of slider. + /// + /// 8 public new SliderStyle Style => ViewStyle as SliderStyle; /// @@ -721,11 +719,10 @@ namespace Tizen.NUI.Components } /// - /// Get Slider attribues. + /// Get Slider style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default slider style. + /// 8 protected override ViewStyle GetViewStyle() { return new SliderStyle(); @@ -777,7 +774,7 @@ namespace Tizen.NUI.Components } /// - /// Update Slider by attributes. + /// Update Slider by style. /// /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -796,11 +793,9 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// serder object - /// ThemeChangeEventArgs - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { SliderStyle sliderStyle = StyleManager.Instance.GetViewStyle(style) as SliderStyle; @@ -811,8 +806,11 @@ namespace Tizen.NUI.Components } } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Apply style to scrollbar. + /// + /// The style to apply. + /// 8 public override void ApplyStyle(ViewStyle viewStyle) { base.ApplyStyle(viewStyle); @@ -821,27 +819,27 @@ namespace Tizen.NUI.Components if (null != sliderStyle?.Progress) { - CreateSlidedTrackAttributes(); + CreateSlidedTrack(); } if (null != sliderStyle?.LowIndicator) { - CreateLowIndicatorTextAttributes(); + CreateLowIndicatorText(); } if (null != sliderStyle?.HighIndicator) { - CreateHighIndicatorTextAttributes(); + CreateHighIndicatorText(); } if (null != sliderStyle?.Track) { - CreateBackgroundTrackAttributes(); + CreateBackgroundTrack(); } if (null != sliderStyle?.Thumb) { - CreateThumbAttributes(); + CreateThumb(); } } @@ -858,7 +856,7 @@ namespace Tizen.NUI.Components RelayoutRequest(); } - private void CreateSlidedTrackAttributes() + private void CreateSlidedTrack() { if (null == slidedTrackImage) { @@ -887,7 +885,7 @@ namespace Tizen.NUI.Components slidedTrackImage.ApplyStyle(Style.Progress); } - private void CreateLowIndicatorTextAttributes() + private void CreateLowIndicatorText() { if (null == lowIndicatorText) { @@ -907,7 +905,7 @@ namespace Tizen.NUI.Components lowIndicatorText.ApplyStyle(Style.LowIndicator); } - private void CreateHighIndicatorTextAttributes() + private void CreateHighIndicatorText() { if (null == highIndicatorText) { @@ -927,7 +925,7 @@ namespace Tizen.NUI.Components highIndicatorText.ApplyStyle(Style.HighIndicator); } - private void CreateBackgroundTrackAttributes() + private void CreateBackgroundTrack() { if (null == bgTrackImage) { @@ -957,7 +955,7 @@ namespace Tizen.NUI.Components bgTrackImage.ApplyStyle(Style.Track); } - private void CreateThumbAttributes() + private void CreateThumb() { if (null == thumbImage) { diff --git a/src/Tizen.NUI.Components/Controls/Switch.cs b/src/Tizen.NUI.Components/Controls/Switch.cs index c89449e..69e5842 100755 --- a/src/Tizen.NUI.Components/Controls/Switch.cs +++ b/src/Tizen.NUI.Components/Controls/Switch.cs @@ -46,9 +46,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a Switch with style. /// /// Create Switch by special style defined in UX. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Switch(string style) : base(style) { Initialize(); @@ -57,11 +55,9 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a Switch with style. /// - /// Create Switch by style customized by user. - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Switch(SwitchStyle style) : base(style) + /// Create Switch by style customized by user. + /// 8 + public Switch(SwitchStyle switchStyle) : base(switchStyle) { Initialize(); } @@ -72,8 +68,10 @@ namespace Tizen.NUI.Components /// 6 public event EventHandler SelectedEvent; - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of switch. + /// + /// 8 public new SwitchStyle Style => ViewStyle as SwitchStyle; /// @@ -256,11 +254,10 @@ namespace Tizen.NUI.Components } /// - /// Get Switch attribues. + /// Get Switch style. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default switch style. + /// 8 protected override ViewStyle GetViewStyle() { return new SwitchStyle(); @@ -296,15 +293,15 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { - SwitchStyle tempAttributes = StyleManager.Instance.GetViewStyle(style) as SwitchStyle; - if (null != tempAttributes) + SwitchStyle switchStyle = StyleManager.Instance.GetViewStyle(style) as SwitchStyle; + if (null != switchStyle) { - Style.CopyFrom(tempAttributes); + Style.CopyFrom(switchStyle); } } diff --git a/src/Tizen.NUI.Components/Controls/Tab.cs b/src/Tizen.NUI.Components/Controls/Tab.cs index c8797b4..3606a82 100755 --- a/src/Tizen.NUI.Components/Controls/Tab.cs +++ b/src/Tizen.NUI.Components/Controls/Tab.cs @@ -50,9 +50,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a Tab with style. /// /// Create Tab by special style defined in UX. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Tab(string style) : base(style) { Initialize(); @@ -61,11 +59,9 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a Tab with style. /// - /// Create Tab by style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Tab(TabStyle style) : base(style) + /// Create Tab by style customized by user. + /// 8 + public Tab(TabStyle tabStyle) : base(tabStyle) { Initialize(); } @@ -76,8 +72,10 @@ namespace Tizen.NUI.Components /// 6 public event EventHandler ItemChangedEvent; - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of tab. + /// + /// 8 public new TabStyle Style => ViewStyle as TabStyle; /// @@ -352,8 +350,11 @@ namespace Tizen.NUI.Components UpdateItems(); } - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Apply style to tab. + /// + /// The style to apply. + /// 8 public override void ApplyStyle(ViewStyle viewStyle) { base.ApplyStyle(viewStyle); @@ -419,7 +420,7 @@ namespace Tizen.NUI.Components } /// - /// Update Tab by attributes. + /// Update Tab. /// /// 6 /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -430,11 +431,10 @@ namespace Tizen.NUI.Components } /// - /// Get Tab attribues. + /// Get Tab style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default tab style. + /// 8 protected override ViewStyle GetViewStyle() { return new TabStyle(); @@ -443,15 +443,15 @@ namespace Tizen.NUI.Components /// /// Theme change callback when theme is changed, this callback will be trigger. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The sender + /// The event data + /// 8 protected override void OnThemeChangedEvent(object sender, StyleManager.ThemeChangeEventArgs e) { - TabStyle tempAttributes = StyleManager.Instance.GetViewStyle(style) as TabStyle; - if (tempAttributes != null) + TabStyle tabStyle = StyleManager.Instance.GetViewStyle(style) as TabStyle; + if (tabStyle != null) { - Style.CopyFrom(tempAttributes); + Style.CopyFrom(tabStyle); } } @@ -591,19 +591,6 @@ namespace Tizen.NUI.Components } } - private void CreateUnderLineAttributes() - { - if (Style.UnderLine == null) - { - Style.UnderLine = new ViewStyle() - { - PositionUsesPivotPoint = true, - ParentOrigin = Tizen.NUI.ParentOrigin.BottomLeft, - PivotPoint = Tizen.NUI.PivotPoint.BottomLeft, - }; - } - } - private void CreateUnderLineAnimation() { if (underlineAni == null) diff --git a/src/Tizen.NUI.Components/Controls/Toast.cs b/src/Tizen.NUI.Components/Controls/Toast.cs index 3eaaac1..14d90a3 100755 --- a/src/Tizen.NUI.Components/Controls/Toast.cs +++ b/src/Tizen.NUI.Components/Controls/Toast.cs @@ -81,8 +81,10 @@ namespace Tizen.NUI.Components private Timer timer = null; private readonly uint duration = 3000; - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Get style of toast. + /// + /// 8 public new ToastStyle Style => ViewStyle as ToastStyle; static Toast() { } @@ -98,11 +100,9 @@ namespace Tizen.NUI.Components /// /// The constructor of the Toast class with specific Style. /// - /// Construct Style - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public Toast(ToastStyle style) : base(style) + /// Construct Style + /// 8 + public Toast(ToastStyle toastStyle) : base(toastStyle) { Initialize(); } @@ -111,9 +111,7 @@ namespace Tizen.NUI.Components /// Constructor of the Toast class with special style. /// /// style name - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Toast(string style) : base(style) { Initialize(); @@ -282,9 +280,10 @@ namespace Tizen.NUI.Components } /// - /// Apply style. + /// Apply style to toast. /// - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style to apply. + /// 8 public override void ApplyStyle(ViewStyle viewStyle) { base.ApplyStyle(viewStyle); @@ -334,11 +333,10 @@ namespace Tizen.NUI.Components } /// - /// Get Toast attribues. + /// Get Toast style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The default toast style. + /// 8 protected override ViewStyle GetViewStyle() { return new ToastStyle(); diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultButtonStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultButtonStyle.cs old mode 100644 new mode 100755 index 1064281..9e4bb20 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultButtonStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultButtonStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Button style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { ButtonStyle style = new ButtonStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultCheckBoxStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultCheckBoxStyle.cs old mode 100644 new mode 100755 index 49d5972..3dfdeb7 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultCheckBoxStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultCheckBoxStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default CheckBox style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { ButtonStyle style = new ButtonStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultDropDownStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultDropDownStyle.cs old mode 100644 new mode 100755 index b220354..e2ba859 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultDropDownStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultDropDownStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default DropDown style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { DropDownStyle style = new DropDownStyle { @@ -90,7 +90,7 @@ namespace Tizen.NUI.Components /// /// Return default DropDownItem style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { DropDownItemStyle style = new DropDownItemStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultPopupStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultPopupStyle.cs old mode 100644 new mode 100755 index efa265f..2e4e328 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultPopupStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultPopupStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Popup style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { PopupStyle style = new PopupStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultProgressStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultProgressStyle.cs old mode 100644 new mode 100755 index f41ea26..8f664c5 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultProgressStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultProgressStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Progress style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { ProgressStyle style = new ProgressStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultRadioButtonStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultRadioButtonStyle.cs old mode 100644 new mode 100755 index ce45a95..1573894 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultRadioButtonStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultRadioButtonStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default RadioButton style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { ButtonStyle style = new ButtonStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultSliderStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultSliderStyle.cs old mode 100644 new mode 100755 index ef8041c..7e7ec7b --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultSliderStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultSliderStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Slider style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { SliderStyle style = new SliderStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultSwitchStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultSwitchStyle.cs old mode 100644 new mode 100755 index f97e088..676a2d3 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultSwitchStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultSwitchStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Switch style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { SwitchStyle style = new SwitchStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultTabStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultTabStyle.cs old mode 100644 new mode 100755 index 5a4f895..3f0919d --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultTabStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultTabStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Tab style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { TabStyle style = new TabStyle { diff --git a/src/Tizen.NUI.Components/PreloadStyle/DefaultToastStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/DefaultToastStyle.cs old mode 100644 new mode 100755 index f348491..6006ba8 --- a/src/Tizen.NUI.Components/PreloadStyle/DefaultToastStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/DefaultToastStyle.cs @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components /// /// Return default Toast style /// - internal protected override ViewStyle GetAttributes() + internal protected override ViewStyle GetViewStyle() { ToastStyle style = new ToastStyle { diff --git a/src/Tizen.NUI.Components/Style/ButtonStyle.cs b/src/Tizen.NUI.Components/Style/ButtonStyle.cs index 9469c97..c3f8e1e 100755 --- a/src/Tizen.NUI.Components/Style/ButtonStyle.cs +++ b/src/Tizen.NUI.Components/Style/ButtonStyle.cs @@ -22,11 +22,9 @@ using Tizen.NUI.Binding; namespace Tizen.NUI.Components { /// - /// ButtonAttributes is a class which saves Button's ux data. + /// ButtonStyle is a class which saves Button's ux data. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class ButtonStyle : ControlStyle { /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -116,9 +114,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a ButtonStyle. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ButtonStyle() : base() { InitSubStyle(); @@ -128,9 +124,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a ButtonStyle with style. /// /// Create ButtonStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ButtonStyle(ButtonStyle style) : base(style) { if(style == null) @@ -145,37 +139,35 @@ namespace Tizen.NUI.Components /// /// Overlay image's Style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Overlay { get; set; } /// /// Text's Style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TextLabelStyle Text { get; set; } /// /// Icon's Style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Icon { get; set; } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Flag to decide Button can be selected or not. + /// + /// 8 public bool? IsSelectable { get => (bool?)GetValue(IsSelectableProperty); set => SetValue(IsSelectableProperty, value); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Flag to decide selected state in Button. + /// + /// 8 public bool? IsSelected { get => (bool?)GetValue(IsSelectedProperty); @@ -185,9 +177,7 @@ namespace Tizen.NUI.Components /// /// Flag to decide button can be selected or not. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public bool? IsEnabled { get => (bool?)GetValue(IsEnabledProperty); @@ -197,17 +187,17 @@ namespace Tizen.NUI.Components /// /// Icon relative orientation. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Button.IconOrientation? IconRelativeOrientation { get => (Button.IconOrientation?)GetValue(IconRelativeOrientationProperty); set => SetValue(IconRelativeOrientationProperty, value); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Icon padding in Button, work only when show icon and text. + /// + /// 8 public Extents IconPadding { get @@ -218,8 +208,10 @@ namespace Tizen.NUI.Components set => SetValue(IconPaddingProperty, value); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Text padding in Button, work only when show icon and text. + /// + /// 8 public Extents TextPadding { get @@ -230,8 +222,11 @@ namespace Tizen.NUI.Components set => SetValue(TextPaddingProperty, value); } - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// + /// Style's clone function. + /// + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -242,17 +237,17 @@ namespace Tizen.NUI.Components { if (null != buttonStyle.Overlay) { - Overlay.CopyFrom(buttonStyle.Overlay); + Overlay?.CopyFrom(buttonStyle.Overlay); } if (null != buttonStyle.Text) { - Text.CopyFrom(buttonStyle.Text); + Text?.CopyFrom(buttonStyle.Text); } if (null != buttonStyle.Icon) { - Icon.CopyFrom(buttonStyle.Icon); + Icon?.CopyFrom(buttonStyle.Icon); } IsSelectable = buttonStyle.IsSelectable; diff --git a/src/Tizen.NUI.Components/Style/DropDownStyle.cs b/src/Tizen.NUI.Components/Style/DropDownStyle.cs index 237da27..19ac02b 100755 --- a/src/Tizen.NUI.Components/Style/DropDownStyle.cs +++ b/src/Tizen.NUI.Components/Style/DropDownStyle.cs @@ -223,14 +223,14 @@ namespace Tizen.NUI.Components if (null != dropDownStyle) { - Button.CopyFrom(dropDownStyle.Button); - HeaderText.CopyFrom(dropDownStyle.HeaderText); - ListBackgroundImage.CopyFrom(dropDownStyle.ListBackgroundImage); + Button?.CopyFrom(dropDownStyle.Button); + HeaderText?.CopyFrom(dropDownStyle.HeaderText); + ListBackgroundImage?.CopyFrom(dropDownStyle.ListBackgroundImage); SpaceBetweenButtonTextAndIcon = dropDownStyle.SpaceBetweenButtonTextAndIcon; ListRelativeOrientation = dropDownStyle.ListRelativeOrientation; - ListMargin.CopyFrom(dropDownStyle.ListMargin); + ListMargin?.CopyFrom(dropDownStyle.ListMargin); SelectedItemIndex = dropDownStyle.SelectedItemIndex; - ListPadding.CopyFrom(dropDownStyle.ListPadding); + ListPadding?.CopyFrom(dropDownStyle.ListPadding); } } @@ -325,9 +325,9 @@ namespace Tizen.NUI.Components if (null != dropDownItemStyle) { - Text.CopyFrom(dropDownItemStyle.Text); - Icon.CopyFrom(dropDownItemStyle.Icon); - CheckImage.CopyFrom(dropDownItemStyle.CheckImage); + Text?.CopyFrom(dropDownItemStyle.Text); + Icon?.CopyFrom(dropDownItemStyle.Icon); + CheckImage?.CopyFrom(dropDownItemStyle.CheckImage); CheckImageGapToBoundary = dropDownItemStyle.CheckImageGapToBoundary; IsSelected = dropDownItemStyle.IsSelected; } diff --git a/src/Tizen.NUI.Components/Style/LoadingStyle.cs b/src/Tizen.NUI.Components/Style/LoadingStyle.cs index 2d9de1d..08f757c 100755 --- a/src/Tizen.NUI.Components/Style/LoadingStyle.cs +++ b/src/Tizen.NUI.Components/Style/LoadingStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// LoadingStyle is a class which saves Loading's ux data. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class LoadingStyle : ControlStyle { static LoadingStyle() { } @@ -33,18 +31,14 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a LoadingStyle. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public LoadingStyle() : base() { } /// /// Creates a new instance of a LoadingStyle with style. /// /// Create LoadingStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public LoadingStyle(LoadingStyle style) : base(style) { if(null == style) @@ -57,33 +51,26 @@ namespace Tizen.NUI.Components /// /// Gets or sets loading image resources. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public string[] Images { get; set; } /// /// Gets or sets loading image size. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Size LoadingSize { get; set; } /// /// Gets or sets loading frame per second. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Selector FrameRate { get; set; } = new Selector(); /// - /// Attributes's clone function. + /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -94,7 +81,7 @@ namespace Tizen.NUI.Components { if (null != loadingStyle.FrameRate) { - FrameRate.Clone(loadingStyle.FrameRate); + FrameRate?.Clone(loadingStyle.FrameRate); } if (null != loadingStyle.LoadingSize) { diff --git a/src/Tizen.NUI.Components/Style/PaginationStyle.cs b/src/Tizen.NUI.Components/Style/PaginationStyle.cs index 2eedff6..962391e 100755 --- a/src/Tizen.NUI.Components/Style/PaginationStyle.cs +++ b/src/Tizen.NUI.Components/Style/PaginationStyle.cs @@ -94,7 +94,7 @@ namespace Tizen.NUI.Components } if (null != paginationStyle.IndicatorImageURL) { - IndicatorImageURL.Clone(paginationStyle.IndicatorImageURL); + IndicatorImageURL?.Clone(paginationStyle.IndicatorImageURL); } IndicatorSpacing = paginationStyle.IndicatorSpacing; } diff --git a/src/Tizen.NUI.Components/Style/PopupStyle.cs b/src/Tizen.NUI.Components/Style/PopupStyle.cs index ab365f5..51eb137 100755 --- a/src/Tizen.NUI.Components/Style/PopupStyle.cs +++ b/src/Tizen.NUI.Components/Style/PopupStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// PopupStyle is a class which saves Popup's ux data. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class PopupStyle : ControlStyle { static PopupStyle() { } @@ -33,9 +31,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a PopupStyle. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public PopupStyle() : base() { InitSubStyle(); @@ -45,9 +41,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a PopupStyle with style. /// /// Create PopupStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public PopupStyle(PopupStyle style) : base(style) { InitSubStyle(); @@ -55,42 +49,37 @@ namespace Tizen.NUI.Components } /// - /// Title Text's Style. + /// Title Text's style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TextLabelStyle Title { get; set; } /// - /// Popup button's attributes. + /// Popup button's style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ButtonStyle Buttons { get; set; } /// - /// Attributes's clone function. + /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); - PopupStyle popupAttributes = bindableObject as PopupStyle; - if (popupAttributes != null) + PopupStyle popupStyle = bindableObject as PopupStyle; + if (popupStyle != null) { - if (popupAttributes.Title != null) + if (popupStyle.Title != null) { - Title.CopyFrom(popupAttributes.Title); + Title?.CopyFrom(popupStyle.Title); } - if (popupAttributes.Buttons != null) + if (popupStyle.Buttons != null) { - Buttons.CopyFrom(popupAttributes.Buttons); + Buttons?.CopyFrom(popupStyle.Buttons); } } } diff --git a/src/Tizen.NUI.Components/Style/ProgressStyle.cs b/src/Tizen.NUI.Components/Style/ProgressStyle.cs index c237827..0731b7e 100755 --- a/src/Tizen.NUI.Components/Style/ProgressStyle.cs +++ b/src/Tizen.NUI.Components/Style/ProgressStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// ProgressStyle is a class which saves Progress's ux data. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class ProgressStyle : ControlStyle { static ProgressStyle() { } @@ -33,9 +31,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a ProgressStyle. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ProgressStyle() : base() { InitSubStyle(); @@ -45,9 +41,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a ProgressStyle with style. /// /// Create ProgressStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ProgressStyle(ProgressStyle style) : base(style) { if (null == style) return; @@ -60,33 +54,26 @@ namespace Tizen.NUI.Components /// /// Get or set track image. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Track { get; set; } /// /// Get or set progress image. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Progress { get; set; } /// /// Get or set buffer image. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Buffer { get; set; } /// - /// Clone function. + /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -97,17 +84,17 @@ namespace Tizen.NUI.Components { if (null != progressStyle.Track) { - Track.CopyFrom(progressStyle.Track); + Track?.CopyFrom(progressStyle.Track); } if (null != progressStyle.Progress) { - Progress.CopyFrom(progressStyle.Progress); + Progress?.CopyFrom(progressStyle.Progress); } if (null != progressStyle.Buffer) { - Buffer.CopyFrom(progressStyle.Buffer); + Buffer?.CopyFrom(progressStyle.Buffer); } } } diff --git a/src/Tizen.NUI.Components/Style/ScrollbarStyle.cs b/src/Tizen.NUI.Components/Style/ScrollbarStyle.cs index 87f6e30..461f00c 100755 --- a/src/Tizen.NUI.Components/Style/ScrollbarStyle.cs +++ b/src/Tizen.NUI.Components/Style/ScrollbarStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// ScrollBarStyle is a class which saves Scrollbar's ux data. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class ScrollBarStyle : ControlStyle { static ScrollBarStyle() { } @@ -33,9 +31,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a ScrollBarStyle. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ScrollBarStyle() : base() { InitSubStyle(); @@ -46,9 +42,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a ScrollBarStyle with style. /// /// Create ScrollBarStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ScrollBarStyle(ScrollBarStyle style) : base(style) { if (null == style) return; @@ -59,43 +53,34 @@ namespace Tizen.NUI.Components } /// - /// Get or set track image style + /// Get or set track image style. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Track { get; set; } /// - /// Get or set thumb image style + /// Get or set thumb image style. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Thumb { get; set; } /// - /// Get or set direction type + /// Get or set direction type. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ScrollBar.DirectionType? Direction { get; set; } /// - /// Get or set duration + /// Get or set duration. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public uint Duration { get; set; } /// - /// Attributes's clone function. + /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -106,12 +91,12 @@ namespace Tizen.NUI.Components { if (null != scrollBarStyle.Track) { - Track.CopyFrom(scrollBarStyle.Track); + Track?.CopyFrom(scrollBarStyle.Track); } if (null != scrollBarStyle.Thumb) { - Thumb.CopyFrom(scrollBarStyle.Thumb); + Thumb?.CopyFrom(scrollBarStyle.Thumb); } Direction = scrollBarStyle.Direction; diff --git a/src/Tizen.NUI.Components/Style/SliderStyle.cs b/src/Tizen.NUI.Components/Style/SliderStyle.cs index 7350a8f..02e4209 100755 --- a/src/Tizen.NUI.Components/Style/SliderStyle.cs +++ b/src/Tizen.NUI.Components/Style/SliderStyle.cs @@ -24,9 +24,7 @@ namespace Tizen.NUI.Components /// /// SliderStyle is a class which saves Slider's ux data. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class SliderStyle : ControlStyle { /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -101,9 +99,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a SliderStyle. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public SliderStyle() : base() { IndicatorType = Slider.IndicatorType.None; @@ -114,9 +110,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a SliderStyle with style. /// /// Create SliderStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public SliderStyle(SliderStyle style) : base(style) { if(style == null) @@ -134,65 +128,49 @@ namespace Tizen.NUI.Components /// /// Get or set background track. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Track { get; set; } /// /// Get or set slided track. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Progress { get; set; } /// /// Get or set thumb. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Thumb { get; set; } /// /// Get or set low indicator image. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle LowIndicatorImage { get; set; } /// /// Get or set high indicator image. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle HighIndicatorImage { get; set; } /// /// Get or set low indicator text. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TextLabelStyle LowIndicator { get; set; } /// /// Get or set high indicator text. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TextLabelStyle HighIndicator { get; set; } /// /// Get or set Indicator type /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public IndicatorType? IndicatorType { get => (IndicatorType?)GetValue(IndicatorTypeProperty); @@ -202,9 +180,7 @@ namespace Tizen.NUI.Components /// /// Get or set track thickness /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public uint? TrackThickness { get => (uint?)GetValue(TrackThicknessProperty); @@ -214,9 +190,7 @@ namespace Tizen.NUI.Components /// /// Get or set space between track and indicator /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public uint? SpaceBetweenTrackAndIndicator { get => (uint?)GetValue(SpaceBetweenTrackAndIndicatorProperty); @@ -226,9 +200,7 @@ namespace Tizen.NUI.Components /// /// Get or set space between track and indicator /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Extents TrackPadding { get @@ -240,90 +212,61 @@ namespace Tizen.NUI.Components } /// - /// Attributes's clone function. + /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); - SliderStyle sliderAttributes = bindableObject as SliderStyle; + SliderStyle sliderStyle = bindableObject as SliderStyle; - if (null != sliderAttributes) + if (null != sliderStyle) { - if (sliderAttributes.Track != null) + if (sliderStyle.Track != null) { - if (null == Track) - { - Track = new ImageViewStyle(); - } - Track.CopyFrom(sliderAttributes.Track); + Track?.CopyFrom(sliderStyle.Track); } - if (sliderAttributes.Progress != null) + if (sliderStyle.Progress != null) { - if (null == Progress) - { - Progress = new ImageViewStyle(); - } - Progress.CopyFrom(sliderAttributes.Progress); + Progress?.CopyFrom(sliderStyle.Progress); } - if (sliderAttributes.Thumb != null) + if (sliderStyle.Thumb != null) { - if (null == Thumb) - { - Thumb = new ImageViewStyle(); - } - Thumb.CopyFrom(sliderAttributes.Thumb); + Thumb?.CopyFrom(sliderStyle.Thumb); } - if (sliderAttributes.LowIndicatorImage != null) + if (sliderStyle.LowIndicatorImage != null) { - if (null == LowIndicatorImage) - { - LowIndicatorImage = new ImageViewStyle(); - } - LowIndicatorImage.CopyFrom(sliderAttributes.LowIndicatorImage); + LowIndicatorImage?.CopyFrom(sliderStyle.LowIndicatorImage); } - if (sliderAttributes.HighIndicatorImage != null) + if (sliderStyle.HighIndicatorImage != null) { - if (null == HighIndicatorImage) - { - HighIndicatorImage = new ImageViewStyle(); - } - HighIndicatorImage.CopyFrom(sliderAttributes.HighIndicatorImage); + HighIndicatorImage?.CopyFrom(sliderStyle.HighIndicatorImage); } - if (sliderAttributes.LowIndicator != null) + if (sliderStyle.LowIndicator != null) { - if (null == LowIndicator) - { - LowIndicator = new TextLabelStyle(); - } - LowIndicator.CopyFrom(sliderAttributes.LowIndicator); + LowIndicator?.CopyFrom(sliderStyle.LowIndicator); } - if (sliderAttributes.HighIndicator != null) + if (sliderStyle.HighIndicator != null) { - if (null == HighIndicator) - { - HighIndicator = new TextLabelStyle(); - } - HighIndicator.CopyFrom(sliderAttributes.HighIndicator); + HighIndicator?.CopyFrom(sliderStyle.HighIndicator); } - if (sliderAttributes.TrackThickness != null) + if (sliderStyle.TrackThickness != null) { - TrackThickness = sliderAttributes.TrackThickness; + TrackThickness = sliderStyle.TrackThickness; } - if (sliderAttributes.TrackPadding != null) + if (sliderStyle.TrackPadding != null) { - TrackPadding = sliderAttributes.TrackPadding; + TrackPadding = sliderStyle.TrackPadding; } } } diff --git a/src/Tizen.NUI.Components/Style/SwitchStyle.cs b/src/Tizen.NUI.Components/Style/SwitchStyle.cs index e16e6fa..dee1443 100755 --- a/src/Tizen.NUI.Components/Style/SwitchStyle.cs +++ b/src/Tizen.NUI.Components/Style/SwitchStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// SwitchStyle is a class which saves Switch's ux data. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class SwitchStyle : ButtonStyle { static SwitchStyle() { } @@ -33,9 +31,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a SwitchStyle. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public SwitchStyle() : base() { InitSubStyle(); @@ -45,9 +41,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a SwitchStyle with style. /// /// Create SwitchStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public SwitchStyle(SwitchStyle style) : base(style) { if(null == style) @@ -63,25 +57,20 @@ namespace Tizen.NUI.Components /// /// Thumb image's style. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Thumb { get; set; } /// /// Track image's style. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ImageViewStyle Track { get; set; } /// /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -92,12 +81,12 @@ namespace Tizen.NUI.Components { if (null != switchStyle.Track) { - Track.CopyFrom(switchStyle.Track); + Track?.CopyFrom(switchStyle.Track); } if (null != switchStyle.Thumb) { - Thumb.CopyFrom(switchStyle.Thumb); + Thumb?.CopyFrom(switchStyle.Thumb); } } } diff --git a/src/Tizen.NUI.Components/Style/TabStyle.cs b/src/Tizen.NUI.Components/Style/TabStyle.cs index d084e8e..f6dd759 100755 --- a/src/Tizen.NUI.Components/Style/TabStyle.cs +++ b/src/Tizen.NUI.Components/Style/TabStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// TabStyle is a class which saves Tab's ux data. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class TabStyle : ControlStyle { static TabStyle() { } @@ -33,9 +31,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a TabStyle. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TabStyle() : base() { ItemPadding = new Extents(0, 0, 0, 0); @@ -50,9 +46,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a TabStyle with style. /// /// Create TabStyle by style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TabStyle(TabStyle style) : base(style) { UnderLine = new ViewStyle(); @@ -65,12 +59,12 @@ namespace Tizen.NUI.Components if (style.UnderLine != null) { - UnderLine.CopyFrom(style.UnderLine); + UnderLine?.CopyFrom(style.UnderLine); } if (style.Text != null) { - Text.CopyFrom(style.Text); + Text?.CopyFrom(style.Text); } if (style.ItemPadding != null) @@ -86,61 +80,50 @@ namespace Tizen.NUI.Components if (null != style.UnderLine) { - UnderLine.CopyFrom(style.UnderLine); + UnderLine?.CopyFrom(style.UnderLine); } if (null != style.Text) { - Text.CopyFrom(style.Text); + Text?.CopyFrom(style.Text); } } /// - /// UnderLine's attributes. + /// UnderLine's style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ViewStyle UnderLine { get; set; } /// - /// Text's attributes. + /// Text's style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TextLabelStyle Text { get; set; } /// /// Flag to decide if item is fill with item text's natural width. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public bool UseTextNaturalSize { get; set; } /// /// Gap between items. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public int ItemSpace { get; set; } /// /// Space in Tab. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public Extents ItemPadding { get; set; } /// - /// Attributes's clone function. + /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 > public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -150,7 +133,7 @@ namespace Tizen.NUI.Components { if (null != tabStyle.ItemPadding) { - ItemPadding.CopyFrom(tabStyle.ItemPadding); + ItemPadding?.CopyFrom(tabStyle.ItemPadding); } ItemSpace = tabStyle.ItemSpace; @@ -158,12 +141,12 @@ namespace Tizen.NUI.Components if (null != tabStyle.UnderLine) { - UnderLine.CopyFrom(tabStyle.UnderLine); + UnderLine?.CopyFrom(tabStyle.UnderLine); } if (null != tabStyle.Text) { - Text.CopyFrom(tabStyle.Text); + Text?.CopyFrom(tabStyle.Text); } } } diff --git a/src/Tizen.NUI.Components/Style/ToastStyle.cs b/src/Tizen.NUI.Components/Style/ToastStyle.cs index 00a3ae7..61f899b 100755 --- a/src/Tizen.NUI.Components/Style/ToastStyle.cs +++ b/src/Tizen.NUI.Components/Style/ToastStyle.cs @@ -23,9 +23,7 @@ namespace Tizen.NUI.Components /// /// ToastStyle is a class which saves Toast's ux data. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class ToastStyle : ControlStyle { static ToastStyle() { } @@ -33,9 +31,7 @@ namespace Tizen.NUI.Components /// /// Creates a new instance of a ToastStyle. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ToastStyle() : base() { InitSubStyle(); @@ -45,9 +41,7 @@ namespace Tizen.NUI.Components /// Creates a new instance of a ToastStyle with Style. /// /// Create ToastStyle by Style customized by user. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public ToastStyle(ToastStyle style) : base(style) { InitSubStyle(); @@ -57,25 +51,20 @@ namespace Tizen.NUI.Components /// /// Gets or sets toast show duration time. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public uint? Duration { get; set; } /// /// Text's Style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public TextLabelStyle Text { get; set; } /// /// Style's clone function. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style that need to copy. + /// 8 public override void CopyFrom(BindableObject bindableObject) { base.CopyFrom(bindableObject); @@ -84,7 +73,7 @@ namespace Tizen.NUI.Components { if (null != toastStyle.Text) { - Text.CopyFrom(toastStyle.Text); + Text?.CopyFrom(toastStyle.Text); } Duration = toastStyle.Duration; } diff --git a/src/Tizen.NUI.Components/Utils/StyleBase.cs b/src/Tizen.NUI.Components/Utils/StyleBase.cs index b012128..ee72866 100755 --- a/src/Tizen.NUI.Components/Utils/StyleBase.cs +++ b/src/Tizen.NUI.Components/Utils/StyleBase.cs @@ -14,7 +14,6 @@ * limitations under the License. * */ -using System.ComponentModel; using Tizen.NUI.BaseComponents; namespace Tizen.NUI.Components @@ -22,39 +21,33 @@ namespace Tizen.NUI.Components /// /// StyleBase class. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class StyleBase { /// /// StyleBase construct. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public StyleBase() { } + /// /// Content object. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 protected object Content { get; set; } + /// - /// Get attributes. + /// Get view style. /// - /// Attributes - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - protected internal virtual ViewStyle GetAttributes() + /// ViewStyle + /// 8 + protected internal virtual ViewStyle GetViewStyle() { return Content as ViewStyle; } diff --git a/src/Tizen.NUI.Components/Utils/StyleManager.cs b/src/Tizen.NUI.Components/Utils/StyleManager.cs index 908e1a5..e583b2c 100755 --- a/src/Tizen.NUI.Components/Utils/StyleManager.cs +++ b/src/Tizen.NUI.Components/Utils/StyleManager.cs @@ -16,7 +16,6 @@ */ using System; using System.Collections.Generic; -using System.ComponentModel; using Tizen.NUI.BaseComponents; namespace Tizen.NUI.Components @@ -24,9 +23,7 @@ namespace Tizen.NUI.Components /// /// StyleManager is a class to manager all style. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public sealed class StyleManager { private static readonly string defaultThemeName = "default"; @@ -39,7 +36,6 @@ namespace Tizen.NUI.Components /// /// StyleManager construct. /// - /// 6 private StyleManager() { } @@ -47,9 +43,7 @@ namespace Tizen.NUI.Components /// /// An event for the theme changed signal which can be used to subscribe or unsubscribe the event handler provided by the user.
/// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public event EventHandler ThemeChangedEvent { add @@ -65,17 +59,13 @@ namespace Tizen.NUI.Components /// /// StyleManager static instance. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public static StyleManager Instance { get; } = new StyleManager(); /// /// Style theme. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public string Theme { get @@ -100,9 +90,7 @@ namespace Tizen.NUI.Components /// Theme. /// Style type. /// Flag to decide if it is default style. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public void RegisterStyle(string style, string theme, Type styleType, bool bDefault = false) { if (style == null) @@ -137,12 +125,11 @@ namespace Tizen.NUI.Components } /// - /// Get attributes by style. + /// Get style. /// /// Style name. - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style corresponding to style name . + /// 8 public ViewStyle GetViewStyle(string style) { if (style == null) @@ -152,11 +139,11 @@ namespace Tizen.NUI.Components if (themeStyleSet.ContainsKey(style) && themeStyleSet[style].ContainsKey(Theme)) { - return (themeStyleSet[style][Theme])?.GetAttributes(); + return (themeStyleSet[style][Theme])?.GetViewStyle(); } else if (defaultStyleSet.ContainsKey(style)) { - return (defaultStyleSet[style])?.GetAttributes(); + return (defaultStyleSet[style])?.GetViewStyle(); } return null; @@ -168,9 +155,7 @@ namespace Tizen.NUI.Components /// Theme /// The type of ComponentStyle /// The type of style - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public void RegisterComponentStyle(string targetTheme, Type component, Type style) { if (targetTheme == null) @@ -203,7 +188,8 @@ namespace Tizen.NUI.Components /// Get components style in the current theme. /// /// The type of component - [EditorBrowsable(EditorBrowsableState.Never)] + /// The style of the component. + /// 8 public ViewStyle GetComponentStyle(Type component) { var currentTheme = theme; @@ -223,21 +209,19 @@ namespace Tizen.NUI.Components return null; } - return (componentStyleByTheme[currentTheme][component])?.GetAttributes(); + return (componentStyleByTheme[currentTheme][component])?.GetViewStyle(); } /// /// ThemeChangeEventArgs is a class to record theme change event arguments which will sent to user. /// - /// 6 - /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public class ThemeChangeEventArgs : EventArgs { /// /// CurrentTheme /// - [EditorBrowsable(EditorBrowsableState.Never)] + /// 8 public string CurrentTheme; } -- 2.7.4