[NUI] Rebase DevelNUI (#2507)
authorhuiyueun <35286162+huiyueun@users.noreply.github.com>
Mon, 11 Jan 2021 05:29:41 +0000 (14:29 +0900)
committerGitHub <noreply@github.com>
Mon, 11 Jan 2021 05:29:41 +0000 (14:29 +0900)
* [NUI] Fix a build warning CA1717 (#2422)

- Only FlagsAttribute enums should have plural names
 https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1717

- Some enums cannot be fixed because they're already public APIs,
 so added suppress messages for CA1717 build warning.
- Some enums are already used as hidden APIs,
 so added Obsolete tags and made a fixed version as singular name.
- Tizen.NUI.Components.ControlStates enum should be marked with the FlagsAttribute.

Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Co-authored-by: Jiyun Yang <ji.yang@samsung.com>
* [NUI] Fix CA2000 warning for Window

* Modify dispose issue for window

* [NUI] Fix CA2002

Do not lock on objects with weak identity
https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2002

* [NUI] Fix CA2000 issue in DefaultTheme(Dispose object before losing scope)

* [NUI] Add internal and hidden APIs which are currently used

- Add internal and hidden APIs which are currently used. otherwise removing them causes build errors.
- Let users to use proper APIs by deleting these deprecated APIs
- User can be informed that these are deprecated and should not be used by warning messeges during build time.

* [NUI] Fix the behavior as for View.BackgroundImage to be cleared when null set

- Change the behavior of View.BackgroundImage property from API9
- https://code.sec.samsung.net/jira/browse/GRE-2078

* [NUI] Adds StopBehavior and CurrentFrame properties to the AnimatedImageView

Signed-off-by: Seungho Baek <sbsh.baek@samsung.com>
* [NUI] Modify CA2000 warnings for Visual

* [NUI] Add Obsolete Attribute for ControlStates enum

`ControlStates` enum will be removed in API10.

We can use `ControlState` class instead.

* Revert "[NUI] Modify CA2000 warnings for Visual"

This reverts commit afa5fef90e7c8b370fc0e505d2420a7a87083344.

* [NUI] Override Dispose() in Navigator

Pages pushed into Navigator are disposed if Navigator is disposed.

To override Dispose() in Navigator, two dictionaries are required to
remove disposed navigator from dictionary.

TODO: Needs to consider how to remove disposed window from dictionary.

* [NUI] Modify CA2000 Warnings for VisualMap (#2460)

* Revert "[NUI] Fix CA2000 issue in DefaultTheme(Dispose object before losing scope)" (#2463)

This reverts commit cff3fd4d9fd6fd461263e742e296a5397e9563a0.

This causes segfault to dispose styles after passing them through `AddStyleWithoutClone` method.
Because the theme object holds the passed style objects.
Which means the responsibility to dispose the object is transferred to the theme object.

In this case, we can suppress this warning.
https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2000

Instead revert the patch, it suppressed CA2000 warning.

* [NUI] Fix crash issue in PaginationStyle. (#2448)

* [NUI] Add ImageList property (#2449)

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Co-authored-by: YeongJong Lee <cleanlyj@naver.com>
* [NUI] Modify CA2000 Warnings for TextVisual and VisualAnimator

* Use correct calling convention

Some callback and functions from DALi expected the calling convention to
be cdecl, this commit makes it right. The amd64 platforms this is rarely
a problem since arguments are passed through CPU registers, but in x86
this leads to stack corruption.

* [NUI] Fix CA2000 issues in Model3dView and RenderTask.

* [NUI] remove needless null validation in LayoutItem.SetFrame (#2469)

* [NUI] Fix CA1716 build warning

* [NUI] Fix CA2000 issues for Visuals (#2473)

Co-authored-by: Jiyun Yang <ji.yang@samsung.com>
* [NUI] Fix build error and large text size issue

* [NUI] Fix null exception in Loading and improve code (#2478)

This fixes null pointer exception in Loading when running following sample,

```C#
var loading1 = new Loading(new LoadingStyle
{
    Size = new Size(100, 100),
    Position = new Position(0, 100),
    Images  = imageArray
});
```

Plus, this patch removes redundant behaviors when applying a style to a Loading component.
All components copies a default style to the component properties when it is created.
When copying a style, all bindable properties defined in the style class that is not null value are copied to the component properties,
so it is important to keep null value for the property that is not set by user.
Hence this patch removes code that allocates empty list object in the getter of ImageList bindable property.

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Co-authored-by: Seoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com>
* [NUI] remove unnecessary using in Size2D.cs (#2487)

Co-authored-by: Yeongjong Lee <yj34.lee@samsung.com>
Co-authored-by: Jiyun Yang <ji.yang@samsung.com>
* [NUI] Add AppBar class (#2435)

AppBar shows title text and provides navigation and action functions on
Page.

Co-authored-by: Jaehyun Cho <jae_hyun.cho@samsung.com>
* [NUI] Fix CA2000 issues for Visual (#2491)

Co-authored-by: Jiyun Yang <ji.yang@samsung.com>
* [NUI] fixed memory leak

* [NUI] Update AccessibilitySample for readability (#2500)

- Updated the sample to fit the size and make it easier to read.

Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
* [NUI] Fix CA2000 warning issues of View and ViewImpl.

* [NUI] Fix the incorrect parameter for XamlBinding

 - Change to `SizeTypeConverter` for the correct compiledVersion

Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
* [NUI] Fix CA2000 issues for Render Shadow (#2493)

* [NUI] Fix CA2000 issues for Render Shadow

* [NUI] Fix CA2000 for Render

* [NUI] Fix CA2000 Warnings

* [NUI] Update description of Transition classes

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
* [NUI] Remove since_tizen tag for internal APIs

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
* [NUI] Fix build warning CA1712

CA1712: Do not prefix enum values with type name

The name can not be changed becuase this enum is publicly open.
Suppress warning messages.

* Revert "[NUI] Fix CA2000 Warnings"

This reverts commit 92f2d926ec881a0ccacd447401526dcd19cf01b0.

* Revert "[NUI] Fix CA2000 warning issues of View and ViewImpl."

This reverts commit 424bdae58a6f7d71ad3e531fd157a92d513255c4.

Co-authored-by: Seoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com>
Co-authored-by: Jiyun Yang <ji.yang@samsung.com>
Co-authored-by: zhouleonlei <zhouleon.lei@samsung.com>
Co-authored-by: Daekwang Ryu <dkdk.ryu@samsung.com>
Co-authored-by: guowei.wang <guowei.wang@samsung.com>
Co-authored-by: Dongsug Song <dongsug.song@samsung.com>
Co-authored-by: Seungho Baek <sbsh.baek@samsung.com>
Co-authored-by: Yeongjong Lee <cleanlyj@naver.com>
Co-authored-by: Jaehyun Cho <jae_hyun.cho@samsung.com>
Co-authored-by: zhouleonlei <56956725+zhouleonlei@users.noreply.github.com>
Co-authored-by: Wander Lairson Costa <wander.lairson@gmail.com>
Co-authored-by: Moonhee, Choi <mh0310.choi@samsung.com>
Co-authored-by: Yeongjong Lee <yj34.lee@samsung.com>
Co-authored-by: Jaehyun Cho <29364140+jaehyun0cho@users.noreply.github.com>
Co-authored-by: Joogab Yun <joogab.yun@samsung.com>
Co-authored-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Co-authored-by: Bowon Ryu <bowon.ryu@samsung.com>
93 files changed:
src/Tizen.NUI.Components/Controls/Loading.cs
src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs [new file with mode: 0755]
src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
src/Tizen.NUI.Components/Controls/Navigation/Page.cs
src/Tizen.NUI.Components/Controls/Pagination.cs
src/Tizen.NUI.Components/Style/LoadingStyle.cs
src/Tizen.NUI.Components/Theme/DefaultTheme.cs
src/Tizen.NUI.Components/Utils/Selector.cs
src/Tizen.NUI/src/internal/ActivatedSignalType.cs
src/Tizen.NUI/src/internal/Alignment.cs
src/Tizen.NUI/src/internal/Any.cs
src/Tizen.NUI/src/internal/Application.cs
src/Tizen.NUI/src/internal/Builder.cs
src/Tizen.NUI/src/internal/ComponentApplication.cs
src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
src/Tizen.NUI/src/internal/DaliEnumConstants.cs
src/Tizen.NUI/src/internal/DaliEventHandler.cs
src/Tizen.NUI/src/internal/EventThreadCallback.cs
src/Tizen.NUI/src/internal/Interop/Interop.ImageView.cs
src/Tizen.NUI/src/internal/Interop/Interop.View.cs
src/Tizen.NUI/src/internal/Interop/Interop.WidgetView.cs
src/Tizen.NUI/src/internal/Interop/Interop.WidgetViewManager.cs
src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs
src/Tizen.NUI/src/internal/KeyboardEventSignalType.cs
src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs
src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs
src/Tizen.NUI/src/internal/Model3dView.cs
src/Tizen.NUI/src/internal/NDalic.cs
src/Tizen.NUI/src/internal/NUIWindowInfo.cs
src/Tizen.NUI/src/internal/ObjectRegistry.cs
src/Tizen.NUI/src/internal/PageTurnView.cs
src/Tizen.NUI/src/internal/PropertyRangeManager.cs
src/Tizen.NUI/src/internal/RenderTask.cs
src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
src/Tizen.NUI/src/internal/SignalObserver.cs
src/Tizen.NUI/src/internal/SlotObserver.cs
src/Tizen.NUI/src/internal/StatusSignalType.cs
src/Tizen.NUI/src/internal/TouchPoint.cs
src/Tizen.NUI/src/internal/TouchPointContainer.cs
src/Tizen.NUI/src/internal/Uint16Pair.cs
src/Tizen.NUI/src/internal/ViewImpl.cs
src/Tizen.NUI/src/internal/WatchApplication.cs
src/Tizen.NUI/src/public/Accessibility/Accessibility.cs
src/Tizen.NUI/src/public/AlphaFunction.cs
src/Tizen.NUI/src/public/Animation.cs
src/Tizen.NUI/src/public/BaseComponents/AnimatedImageView.cs
src/Tizen.NUI/src/public/BaseComponents/AnimatedVectorImageView.cs
src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs
src/Tizen.NUI/src/public/BaseComponents/Style/Constants.cs
src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
src/Tizen.NUI/src/public/DirectionBias.cs
src/Tizen.NUI/src/public/Layouting/LayoutItem.cs
src/Tizen.NUI/src/public/Layouting/LayoutTransition.cs
src/Tizen.NUI/src/public/NUIConstants.cs
src/Tizen.NUI/src/public/Property.cs
src/Tizen.NUI/src/public/PropertyNotification.cs
src/Tizen.NUI/src/public/Renderer.cs
src/Tizen.NUI/src/public/Size2D.cs
src/Tizen.NUI/src/public/TransitionAnimations/TransitionAnimations.cs
src/Tizen.NUI/src/public/TransitionData.cs
src/Tizen.NUI/src/public/TransitionOptions/TransitionOptions.cs
src/Tizen.NUI/src/public/UIComponents/ScrollViewEvent.cs
src/Tizen.NUI/src/public/ViewProperty/ImageShadow.cs
src/Tizen.NUI/src/public/ViewProperty/Shadow.cs
src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs
src/Tizen.NUI/src/public/VisualConstants.cs
src/Tizen.NUI/src/public/VisualMaps.cs
src/Tizen.NUI/src/public/Visuals/AnimatedImageVisual.cs
src/Tizen.NUI/src/public/Visuals/ArcVisual.cs
src/Tizen.NUI/src/public/Visuals/BorderVisual.cs
src/Tizen.NUI/src/public/Visuals/ColorVisual.cs
src/Tizen.NUI/src/public/Visuals/GradientVisual.cs
src/Tizen.NUI/src/public/Visuals/ImageVisual.cs
src/Tizen.NUI/src/public/Visuals/MeshVisual.cs
src/Tizen.NUI/src/public/Visuals/NPatchVisual.cs
src/Tizen.NUI/src/public/Visuals/PrimitiveVisual.cs
src/Tizen.NUI/src/public/Visuals/SVGVisual.cs
src/Tizen.NUI/src/public/Visuals/TextVisual.cs
src/Tizen.NUI/src/public/Visuals/VisualAnimator.cs
src/Tizen.NUI/src/public/WidgetView.cs
src/Tizen.NUI/src/public/Window.cs
src/Tizen.NUI/src/public/WindowEvent.cs
src/Tizen.NUI/src/public/XamlBinding/Internals/IDynamicResourceHandler.cs
src/Tizen.NUI/src/public/XamlBinding/SizeTypeConverter.cs
test/Tizen.NUI.Samples/Tizen.NUI.Samples.sln
test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AccessibilityManagerSample.cs
test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AppBarSample.cs [new file with mode: 0755]
test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliTableView.cs
test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/NavigatorSample.cs
test/Tizen.NUI.Samples/Tizen.NUI.Samples/Tizen.NUI.Samples.csproj

index 0674415..2e192f8 100755 (executable)
@@ -29,7 +29,7 @@ namespace Tizen.NUI.Components
     /// <since_tizen> 6 </since_tizen>
     public class Loading : Control
     {
-        /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+        /// <summary>The ImageArray bindable property.</summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty ImageArrayProperty = BindableProperty.Create(nameof(ImageArray), typeof(string[]), typeof(Loading), null, propertyChanged: (bindable, oldValue, newValue) =>
         {
@@ -37,7 +37,7 @@ namespace Tizen.NUI.Components
             if (newValue != null)
             {
                 instance.loadingStyle.Images = (string[])newValue;
-                instance.imageVisual.URLS = new List<string>((string[])newValue);
+                instance.imageVisual.URLS = instance.loadingStyle.ImageList as List<string>;
             }
         },
         defaultValueCreator: (bindable) =>
@@ -45,7 +45,23 @@ namespace Tizen.NUI.Components
             var instance = (Loading)bindable;
             return instance.loadingStyle.Images;
         });
-        /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+        /// <summary>The ImageList bindable property.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty ImageListProperty = BindableProperty.Create(nameof(ImageList), typeof(IList<string>), typeof(Loading), null, propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var instance = (Loading)bindable;
+            if (newValue != null)
+            {
+                var newValueList = newValue as List<string>;
+                instance.loadingStyle.ImageList = newValueList;
+                if (instance.imageVisual != null) instance.imageVisual.URLS = newValueList;
+            }
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            return ((Loading)bindable).loadingStyle.ImageList;
+        });
+        /// <summary>The Size bindable property.</summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public new static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(Loading), new Size(0, 0), propertyChanged: (bindable, oldValue, newValue) =>
          {
@@ -62,7 +78,7 @@ namespace Tizen.NUI.Components
             var instance = (View)bindable;
             return instance.Size;
         });
-        /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+        /// <summary>The FrameRate bindable property.</summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty FrameRateProperty = BindableProperty.Create(nameof(FrameRate), typeof(int), typeof(Loading), (int)(1000 / 16.6f), propertyChanged: (bindable, oldValue, newValue) =>
           {
@@ -160,6 +176,18 @@ namespace Tizen.NUI.Components
         }
 
         /// <summary>
+        /// Gets loading image resource array.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IList<string> ImageList
+        {
+            get
+            {
+                return GetValue(ImageListProperty) as List<string>;
+            }
+        }
+
+        /// <summary>
         /// Gets or sets loading size.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
@@ -250,7 +278,8 @@ namespace Tizen.NUI.Components
         {
             if (null != loadingStyle.Images)
             {
-                imageVisual.URLS = new List<string>(loadingStyle.Images);
+                loadingStyle.ImageList = new List<string>(loadingStyle.Images);
+                imageVisual.URLS = loadingStyle.ImageList as List<string>;
             }
             if (null != loadingStyle.FrameRate?.All && 0 != loadingStyle.FrameRate.All.Value)
             {
diff --git a/src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs b/src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs
new file mode 100755 (executable)
index 0000000..5014dbb
--- /dev/null
@@ -0,0 +1,433 @@
+/*
+ * Copyright(c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Binding;
+using System.Windows.Input;
+
+namespace Tizen.NUI.Components
+{
+    /// <summary>
+    /// The AppBar class is a class which shows title text and provides navigation
+    /// and action functions on Page.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class AppBar : Control
+    {
+        //TODO: This app bar height should be implemented in AppBar style.
+        private float appBarHeight = 72.0f;
+
+        private bool autoNavigationContent = true;
+        private View defaultNavigationContent = null;
+
+        private View appBarNavigation = null;
+        private View appBarTitle = null;
+        private View appBarAction = null;
+
+        /// <summary>
+        /// Creates a new instance of a AppBar.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public AppBar() : base()
+        {
+            defaultNavigationContent = CreateDefaultNavigationContent();
+
+            //Navigation, Title and Action are located horizontally.
+            var linearLayout = new LinearLayout();
+            linearLayout.LinearOrientation = LinearLayout.Orientation.Horizontal;
+            Layout = linearLayout;
+
+            WidthSpecification = LayoutParamPolicies.MatchParent;
+
+            //TODO: This app bar height should be implemented in AppBar style.
+            SizeHeight = appBarHeight;
+
+            if ((AutoNavigationContent == true) && (DefaultNavigationContent != null))
+            {
+                Add(DefaultNavigationContent);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of a AppBar.
+        /// </summary>
+        /// <param name="navigationContent">The content to set to NavigationContent of AppBar.</param>
+        /// <param name="titleContent">The content to set to TitleContent of AppBar.</param>
+        /// <param name="actionContent">The content to set to ActionContent of AppBar.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public AppBar(View navigationContent, View titleContent, View actionContent) : base()
+        {
+            defaultNavigationContent = CreateDefaultNavigationContent();
+
+            //Navigation, Title and Action are located horizontally.
+            var linearLayout = new LinearLayout();
+            linearLayout.LinearOrientation = LinearLayout.Orientation.Horizontal;
+            Layout = linearLayout;
+
+            WidthSpecification = LayoutParamPolicies.MatchParent;
+
+            //TODO: This app bar height should be implemented in AppBar style.
+            SizeHeight = appBarHeight;
+
+            if (navigationContent != null)
+            {
+                NavigationContent = navigationContent;
+            }
+            else if ((AutoNavigationContent == true) && (DefaultNavigationContent != null))
+            {
+                Add(DefaultNavigationContent);
+            }
+
+            if (titleContent != null)
+            {
+                TitleContent = titleContent;
+            }
+
+            if (actionContent != null)
+            {
+                ActionContent = actionContent;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of a AppBar.
+        /// </summary>
+        /// <param name="title">The text string to set to TitleContent of AppBar.</param>
+        /// <param name="actionContents">The contents to add to ActionContent of AppBar.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public AppBar(string title, params View[] actionContents) : this(null, title, actionContents)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of a AppBar.
+        /// </summary>
+        /// <param name="navigationContent">The content to set to NavigationContent of AppBar.</param>
+        /// <param name="title">The text string to set to TitleContent of AppBar.</param>
+        /// <param name="actionContents">The contents to add to ActionContent of AppBar.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public AppBar(View navigationContent, string title, params View[] actionContents) : base()
+        {
+            defaultNavigationContent = CreateDefaultNavigationContent();
+
+            //Navigation, Title and Action are located horizontally.
+            var linearLayout = new LinearLayout();
+            linearLayout.LinearOrientation = LinearLayout.Orientation.Horizontal;
+            Layout = linearLayout;
+
+            WidthSpecification = LayoutParamPolicies.MatchParent;
+
+            //TODO: This app bar height should be implemented in AppBar style.
+            SizeHeight = appBarHeight;
+
+            if (navigationContent != null)
+            {
+                navigationContent.HeightSpecification = LayoutParamPolicies.MatchParent;
+                navigationContent.Weight = 0.0f;
+
+                NavigationContent = navigationContent;
+            }
+            else if ((AutoNavigationContent == true) && (DefaultNavigationContent != null))
+            {
+                Add(DefaultNavigationContent);
+            }
+
+            if (title != null)
+            {
+                var titleContent = new TextLabel()
+                {
+                    Text = title,
+                    HeightSpecification = LayoutParamPolicies.MatchParent,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Weight = 1.0f,
+                    BackgroundColor = new Color(0.88f, 0.88f, 0.88f, 1.0f)
+                };
+
+                TitleContent = titleContent;
+            }
+
+            if (actionContents != null)
+            {
+                var actionContent = new Control()
+                {
+                    Layout = new LinearLayout()
+                    {
+                        LinearOrientation = LinearLayout.Orientation.Horizontal
+                    },
+                    HeightSpecification = LayoutParamPolicies.MatchParent,
+                    Weight = 0.0f
+                };
+
+                foreach (var actionView in actionContents)
+                {
+                    actionView.HeightSpecification = LayoutParamPolicies.MatchParent;
+
+                    actionContent.Add(actionView);
+                }
+
+                ActionContent = actionContent;
+            }
+        }
+
+        /// <summary>
+        /// Disposes AppBar and all children on it.
+        /// </summary>
+        /// <param name="type">Dispose type.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                if (appBarNavigation != null)
+                {
+                    Utility.Dispose(appBarNavigation);
+                }
+
+                if (appBarTitle != null)
+                {
+                    Utility.Dispose(appBarTitle);
+                }
+
+                if (appBarAction != null)
+                {
+                    Utility.Dispose(appBarAction);
+                }
+            }
+
+            base.Dispose(type);
+        }
+
+        /// <summary>
+        /// Navigation content of AppBar. NavigationContent is added to Children automatically.
+        /// If AutoNavigationContent is set to be true and NavigationContent is not set,
+        /// then default navigation content is automatically displayed.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public View NavigationContent
+        {
+            get
+            {
+                return appBarNavigation;
+            }
+            set
+            {
+                if (appBarNavigation == value)
+                {
+                    return;
+                }
+
+                if (appBarNavigation != null)
+                {
+                    Remove(appBarNavigation);
+                }
+
+                appBarNavigation = value;
+                if (appBarNavigation == null)
+                {
+                    return;
+                }
+
+                ResetContent();
+            }
+        }
+
+        /// <summary>
+        /// Title content of AppBar. TitleContent is added to Children automatically.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public View TitleContent
+        {
+            get
+            {
+                return appBarTitle;
+            }
+            set
+            {
+                if (appBarTitle == value)
+                {
+                    return;
+                }
+
+                if (appBarTitle != null)
+                {
+                    Remove(appBarTitle);
+                }
+
+                appBarTitle = value;
+                if (appBarTitle == null)
+                {
+                    return;
+                }
+
+                ResetContent();
+            }
+        }
+
+        /// <summary>
+        /// Action content of AppBar. ActionContent is added to Children automatically.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public View ActionContent
+        {
+            get
+            {
+                return appBarAction;
+            }
+            set
+            {
+                if (appBarAction == value)
+                {
+                    return;
+                }
+
+                if (appBarAction != null)
+                {
+                    Remove(appBarAction);
+                }
+
+                appBarAction = value;
+                if (appBarAction == null)
+                {
+                    return;
+                }
+
+                ResetContent();
+            }
+        }
+
+        /// <summary>
+        /// Flag to indicate if default navigation content is automatically set or not.
+        /// The default value is true.
+        /// If AutoNavigationContent is set to be true and NavigationContent is not set,
+        /// then default navigation content is automatically displayed.
+        /// If default navigation content is clicked, it calls navigator pop operation.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool AutoNavigationContent
+        {
+            get
+            {
+                return autoNavigationContent;
+            }
+
+            set
+            {
+                if (autoNavigationContent == value)
+                {
+                    return;
+                }
+
+                autoNavigationContent = value;
+
+                ResetContent();
+            }
+        }
+
+        /// <summary>
+        /// Default navigation content of AppBar set automatically by default.
+        /// If AutoNavigationContent is set to be true and NavigationContent is not set,
+        /// then default navigation content is automatically displayed.
+        /// If default navigation content is clicked, it calls navigator pop operation.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected View DefaultNavigationContent
+        {
+            get
+            {
+                //TODO: Do not set default navigation content if there is no previous page.
+                return defaultNavigationContent;
+            }
+        }
+
+        private View CreateDefaultNavigationContent()
+        {
+            var backButton = new Button()
+            {
+                //FIXME: When back icon resource is added, replace this text to the icon resource.
+                Text = "<",
+                //TODO: This app bar height should be implemented in Appbar style.
+                Size = new Size(72.0f, 72.0f),
+            };
+
+            backButton.Clicked += (object sender, ClickedEventArgs args) =>
+            {
+                //The page of app bar is popped when default back button is clicked.
+                var page = GetParent() as Page;
+                if (page != null)
+                {
+                    var navigator = page.GetParent() as Navigator;
+                    if (navigator != null)
+                    {
+                        navigator.Pop();
+                    }
+                }
+            };
+
+            return backButton;
+        }
+
+        private void ResetContent()
+        {
+            //To keep the order of NavigationContent, TitleContent and ActionContent,
+            //the existing contents are removed and added again.
+            if ((appBarNavigation != null) && Children.Contains(appBarNavigation))
+            {
+                Remove(appBarNavigation);
+            }
+            else if ((DefaultNavigationContent != null) && Children.Contains(DefaultNavigationContent))
+            {
+                Remove(DefaultNavigationContent);
+            }
+
+            if ((appBarTitle != null) && Children.Contains(appBarTitle))
+            {
+                Remove(appBarTitle);
+            }
+
+            if ((appBarAction != null) && Children.Contains(appBarAction))
+            {
+                Remove(appBarAction);
+            }
+
+            if (appBarNavigation != null)
+            {
+                Add(appBarNavigation);
+            }
+            else if ((AutoNavigationContent == true) && (DefaultNavigationContent != null))
+            {
+                Add(DefaultNavigationContent);
+            }
+
+            if (appBarTitle != null)
+            {
+                Add(appBarTitle);
+            }
+
+            if (appBarAction != null)
+            {
+                Add(appBarAction);
+            }
+        }
+    }
+}
index acbcb1c..10f371c 100755 (executable)
@@ -37,7 +37,10 @@ namespace Tizen.NUI.Components
         //This will be replaced with view transition class instance.
         private Animation _newAnimation = null;
 
+        //TODO: Needs to consider how to remove disposed window from dictionary.
+        //Two dictionaries are required to remove disposed navigator from dictionary.
         private static Dictionary<Window, Navigator> windowNavigator = new Dictionary<Window, Navigator>();
+        private static Dictionary<Navigator, Window> navigatorWindow = new Dictionary<Navigator, Window>();
 
         /// <summary>
         /// Creates a new instance of a Navigator.
@@ -310,6 +313,38 @@ namespace Tizen.NUI.Components
         }
 
         /// <summary>
+        /// Disposes Navigator and all children on it.
+        /// </summary>
+        /// <param name="type">Dispose type.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                foreach (Page page in NavigationPages)
+                {
+                    Utility.Dispose(page);
+                }
+                NavigationPages.Clear();
+
+                Window window;
+
+                if (navigatorWindow.TryGetValue(this, out window) == true)
+                {
+                    navigatorWindow.Remove(this);
+                    windowNavigator.Remove(window);
+                }
+            }
+
+            base.Dispose(type);
+        }
+
+        /// <summary>
         /// Returns the default navigator of the given window.
         /// </summary>
         /// <returns>The default navigator of the given window.</returns>
@@ -332,6 +367,7 @@ namespace Tizen.NUI.Components
             defaultNavigator.HeightResizePolicy = ResizePolicyType.FillToParent;
             window.Add(defaultNavigator);
             windowNavigator.Add(window, defaultNavigator);
+            navigatorWindow.Add(defaultNavigator, window);
 
             return defaultNavigator;
         }
index 305a87c..298087e 100755 (executable)
@@ -45,6 +45,7 @@ namespace Tizen.NUI.Components
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class Page : Control
     {
+        private AppBar _appBar = null;
         private View _content = null;
 
         /// <summary>
@@ -52,12 +53,32 @@ namespace Tizen.NUI.Components
         /// </summary>
         /// <param name="content">The content to set to Content of Page.</param>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public Page(View content = null) : base()
+        public Page(View content = null) : this(null, content)
         {
+        }
+
+        /// <summary>
+        /// Creates a new instance of a Page.
+        /// </summary>
+        /// <param name="appBar">The content to set to AppBar of Page.</param>
+        /// <param name="content">The content to set to Content of Page.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Page(AppBar appBar, View content = null) : base()
+        {
+            //AppBar and Content are located verically.
+            var linearLayout = new LinearLayout();
+            linearLayout.LinearOrientation = LinearLayout.Orientation.Vertical;
+            Layout = linearLayout;
+
             //Page fills to parent by default.
             WidthResizePolicy = ResizePolicyType.FillToParent;
             HeightResizePolicy = ResizePolicyType.FillToParent;
 
+            if (appBar)
+            {
+                AppBar = appBar;
+            }
+
             if (content)
             {
                 Content = content;
@@ -65,6 +86,68 @@ namespace Tizen.NUI.Components
         }
 
         /// <summary>
+        /// Dispose Page and all children on it.
+        /// </summary>
+        /// <param name="type">Dispose type.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                if (_appBar != null)
+                {
+                    Utility.Dispose(_appBar);
+                }
+
+                if (_content != null)
+                {
+                    Utility.Dispose(_content);
+                }
+            }
+
+            base.Dispose(type);
+        }
+
+        /// <summary>
+        /// AppBar of Page. AppBar is added to Children automatically.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public AppBar AppBar
+        {
+            get
+            {
+                return _appBar;
+            }
+            set
+            {
+                if (_appBar == value)
+                {
+                    return;
+                }
+
+                if (_appBar != null)
+                {
+                    Remove(_appBar);
+                }
+
+                _appBar = value;
+                if (_appBar == null)
+                {
+                    return;
+                }
+
+                _appBar.Weight = 0.0f;
+
+                ResetContent();
+            }
+        }
+
+        /// <summary>
         /// Content of Page. Content is added to Children automatically.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -76,20 +159,50 @@ namespace Tizen.NUI.Components
             }
             set
             {
-                if (_content)
+                if (_content == value)
                 {
-                    if (_content != value)
-                    {
-                        Remove(_content);
-                        _content = value;
-                        Add(value);
-                    }
+                    return;
                 }
-                else
+
+                if (_content != null)
                 {
-                    _content = value;
-                    Add(value);
+                    Remove(_content);
                 }
+
+                _content = value;
+                if (_content == null)
+                {
+                    return;
+                }
+
+                _content.Weight = 1.0f;
+
+                ResetContent();
+            }
+        }
+
+        private void ResetContent()
+        {
+            //To keep the order of AppBar and Content, the existing contents are
+            //removed and added again.
+            if ((_appBar != null) && Children.Contains(_appBar))
+            {
+                Remove(_appBar);
+            }
+
+            if ((_content != null) && Children.Contains(_content))
+            {
+                Remove(_content);
+            }
+
+            if (_appBar != null)
+            {
+                Add(_appBar);
+            }
+
+            if (_content != null)
+            {
+                Add(_content);
             }
         }
 
index e6d57cb..f42a2f4 100755 (executable)
@@ -103,6 +103,7 @@ namespace Tizen.NUI.Components
                 }
                 paginationStyle.IndicatorSize = value;
                 UpdateVisual();
+                UpdateContainer();
             }
         }
 
@@ -471,6 +472,10 @@ namespace Tizen.NUI.Components
             {
                 return;
             }
+            if (paginationStyle.IndicatorSize == null)
+            {
+                paginationStyle.IndicatorSize = new Size(0, 0);
+            }
             ImageVisual indicator = new ImageVisual
             {
                 URL = paginationStyle.IndicatorImageUrl?.Normal,
index 9fd3e97..49e770c 100755 (executable)
@@ -14,6 +14,7 @@
  * limitations under the License.
  *
  */
+using System.Collections.Generic;
 using System.ComponentModel;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Binding;
@@ -52,15 +53,22 @@ namespace Tizen.NUI.Components
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty ImagesProperty = BindableProperty.Create(nameof(Images), typeof(string[]), typeof(LoadingStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
         {
-            ((LoadingStyle)bindable).images = (string[])((string[])newValue)?.Clone();
+            ((LoadingStyle)bindable).images = newValue == null ? null : new List<string>((string[])newValue);
         },
-        defaultValueCreator: (bindable) =>
+        defaultValueCreator: (bindable) => ((LoadingStyle)bindable).images?.ToArray()
+        );
+
+        /// <summary>The Images bindable property.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty ImageListProperty = BindableProperty.Create(nameof(ImageList), typeof(IList<string>), typeof(LoadingStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
         {
-            return ((LoadingStyle)bindable).images;
-        });
+            ((LoadingStyle)bindable).images = newValue as List<string>;
+        },
+        defaultValueCreator: (bindable) => ((LoadingStyle)bindable).images
+        );
 
         private Selector<int?> frameRate;
-        private string[] images;
+        private List<string> images;
 
         static LoadingStyle() { }
 
@@ -85,11 +93,28 @@ namespace Tizen.NUI.Components
         /// <since_tizen> 8 </since_tizen>
         public string[] Images
         {
-            get => (string[])GetValue(ImagesProperty);
+            get => (ImageList as List<string>)?.ToArray();
             set => SetValue(ImagesProperty, value);
         }
 
         /// <summary>
+        /// Gets loading image resources.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IList<string> ImageList
+        {
+            get
+            {
+                if (images == null)
+                {
+                    images = new List<string>();
+                }
+                return GetValue(ImageListProperty) as List<string>;
+            }
+            internal set => SetValue(ImageListProperty, value);
+        }
+
+        /// <summary>
         /// Gets or sets loading image size.
         /// </summary>
         /// <since_tizen> 8 </since_tizen>
index cf75992..6d91e30 100644 (file)
@@ -17,6 +17,7 @@
 #if !PROFILE_WEARABLE
 
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Binding;
 
@@ -94,6 +95,7 @@ namespace Tizen.NUI.Components
 
         public Theme Create() => Create(null);
 
+        [SuppressMessage("Microsoft.Reliability", "CA2000: Dispose objects before losing scope", Justification = "The responsibility to dispose the object is transferred to the theme object.")]
         public Theme Create(IEnumerable<KeyValuePair<string, string>> changedResources)
         {
             var theme = new Theme() { Id = "Tizen.NUI.Theme.Common" };
index 26b5e63..2fa132c 100755 (executable)
@@ -77,13 +77,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Bool selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class BoolSelector : Selector<bool?>
     {
         /// <summary>
         /// Bool selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new BoolSelector Clone()
@@ -166,13 +164,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Size2D selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class Size2DSelector : Selector<Size2D>
     {
         /// <summary>
         /// Size2D selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new Size2DSelector Clone()
@@ -183,13 +179,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Position2D selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class Position2DSelector : Selector<Position2D>
     {
         /// <summary>
         /// Position2D selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new Position2DSelector Clone()
@@ -201,13 +195,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Position selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class PositionSelector : Selector<Position>
     {
         /// <summary>
         /// Position selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new PositionSelector Clone()
@@ -239,13 +231,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Vector3 selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class Vector3Selector : Selector<Vector3>
     {
         /// <summary>
         /// Vector3 selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new Vector3Selector Clone()
@@ -277,13 +267,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Horizontal alignment selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class HorizontalAlignmentSelector : Selector<HorizontalAlignment?>
     {
         /// <summary>
         /// Horizontal alignment selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new HorizontalAlignmentSelector Clone()
@@ -294,13 +282,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Vertical alignment selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class VerticalAlignmentSelector : Selector<VerticalAlignment?>
     {
         /// <summary>
         /// Vertical alignment selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new VerticalAlignmentSelector Clone()
@@ -312,13 +298,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// AutoScrollStopMode selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class AutoScrollStopModeSelector : Selector<AutoScrollStopMode?>
     {
         /// <summary>
         /// AutoScrollStopMode selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new AutoScrollStopModeSelector Clone()
@@ -330,13 +314,11 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// ResizePolicyType selector.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
     internal class ResizePolicyTypeSelector : Selector<ResizePolicyType?>
     {
         /// <summary>
         /// ResizePolicyType selector clone function.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
         /// 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 new ResizePolicyTypeSelector Clone()
index 988e0f9..e7c4b19 100755 (executable)
@@ -30,7 +30,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Dispose
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
         {
             Interop.ActivatedSignalType.DeleteActivatedSignalType(swigCPtr);
@@ -40,7 +39,6 @@ namespace Tizen.NUI
         /// Queries whether there are any connected slots.
         /// </summary>
         /// <returns>True if there are any slots connected to the signal</returns>
-        /// <since_tizen> 3 </since_tizen>
         public bool Empty()
         {
             bool ret = Interop.ActivatedSignalType.Empty(SwigCPtr);
@@ -52,7 +50,6 @@ namespace Tizen.NUI
         /// Queries the number of slots.
         /// </summary>
         /// <returns>The number of slots connected to this signal</returns>
-        /// <since_tizen> 3 </since_tizen>
         public uint GetConnectionCount()
         {
             uint ret = Interop.ActivatedSignalType.GetConnectionCount(SwigCPtr);
@@ -64,7 +61,6 @@ namespace Tizen.NUI
         /// Connects a function.
         /// </summary>
         /// <param name="func">The function to connect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Connect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
@@ -78,7 +74,6 @@ namespace Tizen.NUI
         /// Disconnects a function.
         /// </summary>
         /// <param name="func">The function to disconnect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Disconnect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
@@ -92,7 +87,6 @@ namespace Tizen.NUI
         /// Emits the signal.
         /// </summary>
         /// <param name="arg">The first value to pass to callbacks</param>
-        /// <since_tizen> 5 </since_tizen>
         public void Emit(InputMethodContext arg)
         {
             Interop.ActivatedSignalType.Emit(SwigCPtr, InputMethodContext.getCPtr(arg));
@@ -102,7 +96,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The contructor.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         public ActivatedSignalType() : this(Interop.ActivatedSignalType.NewActivatedSignalType(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 500a9a4..e1809c8 100755 (executable)
@@ -37,7 +37,6 @@ namespace Tizen.NUI
             Interop.Alignment.DeleteAlignment(swigCPtr);
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public new class Padding : Disposable
         {
 
@@ -50,25 +49,21 @@ namespace Tizen.NUI
                 return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.SwigCPtr;
             }
 
-            /// <since_tizen> 3 </since_tizen>
             protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
             {
                 Interop.Alignment.DeleteAlignmentPadding(swigCPtr);
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public Padding() : this(Interop.Alignment.NewAlignmentPadding(), true)
             {
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public Padding(float l, float r, float t, float b) : this(Interop.Alignment.NewAlignmentPadding(l, r, t, b), true)
             {
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public float left
             {
                 set
@@ -84,7 +79,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public float right
             {
                 set
@@ -100,7 +94,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public float top
             {
                 set
@@ -116,7 +109,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public float bottom
             {
                 set
@@ -206,7 +198,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public enum Type
         {
             HorizontalLeft = 1,
@@ -217,7 +208,6 @@ namespace Tizen.NUI
             VerticalBottom = 32
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public enum Scaling
         {
             ScaleNone,
index 45d75a5..9d36313 100755 (executable)
@@ -72,7 +72,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class AnyContainerBase : Disposable
         {
 
@@ -85,19 +84,16 @@ namespace Tizen.NUI
                 return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.SwigCPtr;
             }
 
-            /// <since_tizen> 3 </since_tizen>
             protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
             {
                 Interop.Any.DeleteAnyAnyContainerBase(swigCPtr);
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public AnyContainerBase(SWIGTYPE_p_std__type_info type, SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase cloneFunc, SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void deleteFunc) : this(Interop.Any.NewAnyAnyContainerBase(SWIGTYPE_p_std__type_info.getCPtr(type), SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.getCPtr(cloneFunc), SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.getCPtr(deleteFunc)), true)
             {
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public new SWIGTYPE_p_std__type_info GetType()
             {
                 SWIGTYPE_p_std__type_info ret = new SWIGTYPE_p_std__type_info(Interop.Any.AnyContainerBaseGetType(SwigCPtr));
@@ -105,7 +101,6 @@ namespace Tizen.NUI
                 return ret;
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public SWIGTYPE_p_std__type_info mType
             {
                 get
@@ -116,7 +111,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase mCloneFunc
             {
                 set
@@ -133,7 +127,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void mDeleteFunc
             {
                 set
index 2d23bdd..8670d46 100755 (executable)
@@ -531,7 +531,6 @@ namespace Tizen.NUI
             Interop.Application.DeleteApplication(swigCPtr);
         }
 
-        /// <since_tizen> 4 </since_tizen>
         public enum BatteryStatus
         {
             Normal,
@@ -539,7 +538,6 @@ namespace Tizen.NUI
             PowerOff
         };
 
-        /// <since_tizen> 4 </since_tizen>
         public enum MemoryStatus
         {
             Normal,
@@ -547,64 +545,64 @@ namespace Tizen.NUI
             CriticallyLow
         };
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationInitEventArgs> _applicationInitEventHandler;
         private NUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate;
         private ApplicationSignal initSignal;
 
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationTerminatingEventArgs> _applicationTerminateEventHandler;
         private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;
         private ApplicationSignal terminateSignal;
 
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationPausedEventArgs> _applicationPauseEventHandler;
         private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;
         private ApplicationSignal pauseSignal;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationResumedEventArgs> _applicationResumeEventHandler;
         private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;
         private ApplicationSignal resumeSignal;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationResetEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationResetEventArgs> _applicationResetEventHandler;
         private NUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate;
         private ApplicationSignal resetSignal;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationLanguageChangedEventArgs> _applicationLanguageChangedEventHandler;
         private NUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate;
         private ApplicationSignal languageChangedSignal;
 
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationRegionChangedEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationRegionChangedEventArgs> _applicationRegionChangedEventHandler;
         private NUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate;
         private ApplicationSignal regionChangedSignal;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationBatteryLowEventCallbackDelegate(BatteryStatus status);
         private DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> _applicationBatteryLowEventHandler;
         private NUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate;
         private LowBatterySignalType batteryLowSignal;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationMemoryLowEventCallbackDelegate(MemoryStatus status);
         private DaliEventHandler<object, NUIApplicationMemoryLowEventArgs> _applicationMemoryLowEventHandler;
         private NUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate;
         private LowMemorySignalType memoryLowSignal;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void NUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp);
         private DaliEventHandler<object, NUIApplicationAppControlEventArgs> _applicationAppControlEventHandler;
         private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate;
@@ -620,32 +618,26 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationInitEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationInitEventHandler == null)
-                    {
-                        _applicationInitEventHandler += value;
-                        _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit);
-                        initSignal = this.InitSignal();
-                        initSignal?.Connect(_applicationInitEventCallbackDelegate);
-                    }
+                    _applicationInitEventHandler += value;
+                    _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit);
+                    initSignal = this.InitSignal();
+                    initSignal?.Connect(_applicationInitEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationInitEventHandler != null)
                 {
-                    if (_applicationInitEventHandler != null)
-                    {
-                        initSignal?.Disconnect(_applicationInitEventCallbackDelegate);
-                        initSignal?.Dispose();
-                        initSignal = null;
-                    }
-
-                    _applicationInitEventHandler -= value;
+                    initSignal?.Disconnect(_applicationInitEventCallbackDelegate);
+                    initSignal?.Dispose();
+                    initSignal = null;
                 }
+
+                _applicationInitEventHandler -= value;
             }
         }
 
@@ -678,33 +670,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationTerminateEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationTerminateEventHandler == null)
-                    {
-                        _applicationTerminateEventHandler += value;
-
-                        _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate);
-                        terminateSignal = this.TerminateSignal();
-                        terminateSignal?.Connect(_applicationTerminateEventCallbackDelegate);
-                    }
+                    _applicationTerminateEventHandler += value;
+
+                    _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate);
+                    terminateSignal = this.TerminateSignal();
+                    terminateSignal?.Connect(_applicationTerminateEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationTerminateEventHandler != null)
                 {
-                    if (_applicationTerminateEventHandler != null)
-                    {
-                        terminateSignal?.Disconnect(_applicationTerminateEventCallbackDelegate);
-                        terminateSignal?.Dispose();
-                        terminateSignal = null;
-                    }
-
-                    _applicationTerminateEventHandler -= value;
+                    terminateSignal?.Disconnect(_applicationTerminateEventCallbackDelegate);
+                    terminateSignal?.Dispose();
+                    terminateSignal = null;
                 }
+
+                _applicationTerminateEventHandler -= value;
             }
         }
 
@@ -733,33 +719,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationPauseEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationPauseEventHandler == null)
-                    {
-                        _applicationPauseEventHandler += value;
-
-                        _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause);
-                        pauseSignal = this.PauseSignal();
-                        pauseSignal?.Connect(_applicationPauseEventCallbackDelegate);
-                    }
+                    _applicationPauseEventHandler += value;
+
+                    _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause);
+                    pauseSignal = this.PauseSignal();
+                    pauseSignal?.Connect(_applicationPauseEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationPauseEventHandler != null)
                 {
-                    if (_applicationPauseEventHandler != null)
-                    {
-                        pauseSignal?.Disconnect(_applicationPauseEventCallbackDelegate);
-                        pauseSignal?.Dispose();
-                        pauseSignal = null;
-                    }
-
-                    _applicationPauseEventHandler -= value;
+                    pauseSignal?.Disconnect(_applicationPauseEventCallbackDelegate);
+                    pauseSignal?.Dispose();
+                    pauseSignal = null;
                 }
+
+                _applicationPauseEventHandler -= value;
             }
         }
 
@@ -782,33 +762,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationResumeEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationResumeEventHandler == null)
-                    {
-                        _applicationResumeEventHandler += value;
-
-                        _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume);
-                        resumeSignal = this.ResumeSignal();
-                        resumeSignal?.Connect(_applicationResumeEventCallbackDelegate);
-                    }
+                    _applicationResumeEventHandler += value;
+
+                    _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume);
+                    resumeSignal = this.ResumeSignal();
+                    resumeSignal?.Connect(_applicationResumeEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationResumeEventHandler != null)
                 {
-                    if (_applicationResumeEventHandler != null)
-                    {
-                        resumeSignal?.Disconnect(_applicationResumeEventCallbackDelegate);
-                        resumeSignal?.Dispose();
-                        resumeSignal = null;
-                    }
-
-                    _applicationResumeEventHandler -= value;
+                    resumeSignal?.Disconnect(_applicationResumeEventCallbackDelegate);
+                    resumeSignal?.Dispose();
+                    resumeSignal = null;
                 }
+
+                _applicationResumeEventHandler -= value;
             }
         }
 
@@ -831,33 +805,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationResetEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationResetEventHandler == null)
-                    {
-                        _applicationResetEventHandler += value;
-
-                        _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset);
-                        resetSignal = this.ResetSignal();
-                        resetSignal?.Connect(_applicationResetEventCallbackDelegate);
-                    }
+                    _applicationResetEventHandler += value;
+
+                    _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset);
+                    resetSignal = this.ResetSignal();
+                    resetSignal?.Connect(_applicationResetEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationResetEventHandler != null)
                 {
-                    if (_applicationResetEventHandler != null)
-                    {
-                        resetSignal?.Disconnect(_applicationResetEventCallbackDelegate);
-                        resetSignal?.Dispose();
-                        resetSignal = null;
-                    }
-
-                    _applicationResetEventHandler -= value;
+                    resetSignal?.Disconnect(_applicationResetEventCallbackDelegate);
+                    resetSignal?.Dispose();
+                    resetSignal = null;
                 }
+
+                _applicationResetEventHandler -= value;
             }
         }
 
@@ -880,33 +848,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationLanguageChangedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationLanguageChangedEventHandler == null)
-                    {
-                        _applicationLanguageChangedEventHandler += value;
-
-                        _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged);
-                        languageChangedSignal = this.LanguageChangedSignal();
-                        languageChangedSignal?.Connect(_applicationLanguageChangedEventCallbackDelegate);
-                    }
+                    _applicationLanguageChangedEventHandler += value;
+
+                    _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged);
+                    languageChangedSignal = this.LanguageChangedSignal();
+                    languageChangedSignal?.Connect(_applicationLanguageChangedEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationLanguageChangedEventHandler != null)
                 {
-                    if (_applicationLanguageChangedEventHandler != null)
-                    {
-                        languageChangedSignal?.Disconnect(_applicationLanguageChangedEventCallbackDelegate);
-                        languageChangedSignal?.Dispose();
-                        languageChangedSignal = null;
-                    }
-
-                    _applicationLanguageChangedEventHandler -= value;
+                    languageChangedSignal?.Disconnect(_applicationLanguageChangedEventCallbackDelegate);
+                    languageChangedSignal?.Dispose();
+                    languageChangedSignal = null;
                 }
+
+                _applicationLanguageChangedEventHandler -= value;
             }
         }
 
@@ -929,33 +891,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationRegionChangedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationRegionChangedEventHandler == null)
-                    {
-                        _applicationRegionChangedEventHandler += value;
-
-                        _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged);
-                        regionChangedSignal = this.RegionChangedSignal();
-                        regionChangedSignal?.Connect(_applicationRegionChangedEventCallbackDelegate);
-                    }
+                    _applicationRegionChangedEventHandler += value;
+
+                    _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged);
+                    regionChangedSignal = this.RegionChangedSignal();
+                    regionChangedSignal?.Connect(_applicationRegionChangedEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationRegionChangedEventHandler != null)
                 {
-                    if (_applicationRegionChangedEventHandler != null)
-                    {
-                        regionChangedSignal?.Disconnect(_applicationRegionChangedEventCallbackDelegate);
-                        regionChangedSignal?.Dispose();
-                        regionChangedSignal = null;
-                    }
-
-                    _applicationRegionChangedEventHandler -= value;
+                    regionChangedSignal?.Disconnect(_applicationRegionChangedEventCallbackDelegate);
+                    regionChangedSignal?.Dispose();
+                    regionChangedSignal = null;
                 }
+
+                _applicationRegionChangedEventHandler -= value;
             }
         }
 
@@ -978,47 +934,38 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationBatteryLowEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationBatteryLowEventHandler == null)
-                    {
-                        _applicationBatteryLowEventHandler += value;
-
-                        _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow);
-                        batteryLowSignal = this.BatteryLowSignal();
-                        batteryLowSignal?.Connect(_applicationBatteryLowEventCallbackDelegate);
-                    }
+                    _applicationBatteryLowEventHandler += value;
+
+                    _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow);
+                    batteryLowSignal = this.BatteryLowSignal();
+                    batteryLowSignal?.Connect(_applicationBatteryLowEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationBatteryLowEventHandler != null)
                 {
-                    if (_applicationBatteryLowEventHandler != null)
-                    {
-                        batteryLowSignal?.Disconnect(_applicationBatteryLowEventCallbackDelegate);
-                        batteryLowSignal?.Dispose();
-                        batteryLowSignal = null;
-                    }
-
-                    _applicationBatteryLowEventHandler -= value;
+                    batteryLowSignal?.Disconnect(_applicationBatteryLowEventCallbackDelegate);
+                    batteryLowSignal?.Dispose();
+                    batteryLowSignal = null;
                 }
+
+                _applicationBatteryLowEventHandler -= value;
             }
         }
 
         // Callback for Application BatteryLowSignal
         private void OnNUIApplicationBatteryLow(BatteryStatus status)
         {
-            lock (this)
-            {
-                NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
+            NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
 
-                // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
-                e.BatteryStatus = status;
-                _applicationBatteryLowEventHandler?.Invoke(this, e);
-            }
+            // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
+            e.BatteryStatus = status;
+            _applicationBatteryLowEventHandler?.Invoke(this, e);
         }
 
         /**
@@ -1029,47 +976,38 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationMemoryLowEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationMemoryLowEventHandler == null)
-                    {
-                        _applicationMemoryLowEventHandler += value;
-
-                        _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow);
-                        memoryLowSignal = this.MemoryLowSignal();
-                        memoryLowSignal?.Connect(_applicationMemoryLowEventCallbackDelegate);
-                    }
+                    _applicationMemoryLowEventHandler += value;
+
+                    _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow);
+                    memoryLowSignal = this.MemoryLowSignal();
+                    memoryLowSignal?.Connect(_applicationMemoryLowEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationMemoryLowEventHandler != null)
                 {
-                    if (_applicationMemoryLowEventHandler != null)
-                    {
-                        memoryLowSignal?.Disconnect(_applicationMemoryLowEventCallbackDelegate);
-                        memoryLowSignal?.Dispose();
-                        memoryLowSignal = null;
-                    }
-
-                    _applicationMemoryLowEventHandler -= value;
+                    memoryLowSignal?.Disconnect(_applicationMemoryLowEventCallbackDelegate);
+                    memoryLowSignal?.Dispose();
+                    memoryLowSignal = null;
                 }
+
+                _applicationMemoryLowEventHandler -= value;
             }
         }
 
         // Callback for Application MemoryLowSignal
         private void OnNUIApplicationMemoryLow(MemoryStatus status)
         {
-            lock (this)
-            {
-                NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
+            NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
 
-                // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
-                e.MemoryStatus = status;
-                _applicationMemoryLowEventHandler?.Invoke(this, e);
-            }
+            // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
+            e.MemoryStatus = status;
+            _applicationMemoryLowEventHandler?.Invoke(this, e);
         }
 
         /**
@@ -1080,33 +1018,27 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationAppControlEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationAppControlEventHandler == null)
-                    {
-                        _applicationAppControlEventHandler += value;
-
-                        _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl);
-                        appControlSignal = this.AppControlSignal();
-                        appControlSignal?.Connect(_applicationAppControlEventCallbackDelegate);
-                    }
+                    _applicationAppControlEventHandler += value;
+
+                    _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl);
+                    appControlSignal = this.AppControlSignal();
+                    appControlSignal?.Connect(_applicationAppControlEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationAppControlEventHandler != null)
                 {
-                    if (_applicationAppControlEventHandler != null)
-                    {
-                        appControlSignal?.Disconnect(_applicationAppControlEventCallbackDelegate);
-                        appControlSignal?.Dispose();
-                        appControlSignal = null;
-                    }
-
-                    _applicationAppControlEventHandler -= value;
+                    appControlSignal?.Disconnect(_applicationAppControlEventCallbackDelegate);
+                    appControlSignal?.Dispose();
+                    appControlSignal = null;
                 }
+
+                _applicationAppControlEventHandler -= value;
             }
         }
 
@@ -1480,7 +1412,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public enum WindowMode
         {
             Opaque = 0,
index f4d619c..6032936 100755 (executable)
@@ -34,7 +34,6 @@ namespace Tizen.NUI
             Interop.Builder.DeleteBuilder(swigCPtr);
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class QuitEventArgs : EventArgs
         {
         }
@@ -49,31 +48,25 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_builderQuitEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_builderQuitEventHandler == null)
-                    {
-                        _builderQuitEventHandler += value;
-
-                        _builderQuitEventCallbackDelegate = new QuitEventCallbackDelegate(OnQuit);
-                        quitSignal = this.QuitSignal();
-                        quitSignal?.Connect(_builderQuitEventCallbackDelegate);
-                    }
+                    _builderQuitEventHandler += value;
+
+                    _builderQuitEventCallbackDelegate = new QuitEventCallbackDelegate(OnQuit);
+                    quitSignal = this.QuitSignal();
+                    quitSignal?.Connect(_builderQuitEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_builderQuitEventHandler != null)
                 {
-                    if (_builderQuitEventHandler != null)
-                    {
-                        quitSignal?.Disconnect(_builderQuitEventCallbackDelegate);
-                    }
-
-                    _builderQuitEventHandler -= value;
+                    quitSignal?.Disconnect(_builderQuitEventCallbackDelegate);
                 }
+
+                _builderQuitEventHandler -= value;
             }
         }
 
@@ -264,7 +257,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public enum UIFormat
         {
             JSON
index c7cd493..c13ecb1 100755 (executable)
@@ -92,30 +92,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_applicationCreateNativeEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_applicationCreateNativeEventHandler == null)
-                    {
-                        _applicationCreateNativeEventHandler += value;
-
-                        _applicationCreateNativeEventCallbackDelegate = new NUIComponentApplicationCreatenativeEventCallbackDelegate(OnApplicationCreateNative);
-                        Connect(_applicationCreateNativeEventCallbackDelegate);
-                    }
+                    _applicationCreateNativeEventHandler += value;
+
+                    _applicationCreateNativeEventCallbackDelegate = new NUIComponentApplicationCreatenativeEventCallbackDelegate(OnApplicationCreateNative);
+                    Connect(_applicationCreateNativeEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_applicationCreateNativeEventHandler != null)
                 {
-                    if (_applicationCreateNativeEventHandler != null)
-                    {
-                        Disconnect(_applicationCreateNativeEventCallbackDelegate);
-                    }
-
-                    _applicationCreateNativeEventHandler -= value;
+                    Disconnect(_applicationCreateNativeEventCallbackDelegate);
                 }
+
+                _applicationCreateNativeEventHandler -= value;
             }
         }
 
index 0c464b1..de88ac4 100755 (executable)
@@ -35,7 +35,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Dispose
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
         {
             Interop.ConnectionTracker.DeleteConnectionTrackerInterface(swigCPtr);
@@ -46,7 +45,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="slotObserver">The slot observer i.e. a signal. Ownership is not passed</param>
         /// <param name="callback">The call back. Ownership is not passed</param>
-        /// <since_tizen> 4 </since_tizen>
         public virtual void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_CallbackBase callback)
         {
             Interop.ConnectionTracker.ConnectionTrackerInterfaceSignalConnected(SwigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_CallbackBase.getCPtr(callback));
index 9a45d7e..285437d 100755 (executable)
@@ -76,6 +76,7 @@ namespace Tizen.NUI
             /// The properties used for a Tooltip.
             /// </summary>
             /// <since_tizen> 3 </since_tizen>
+           [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716: Identifiers should not match keywords")]
             public struct Property
             {
                 /// <summary>
index 8adf76e..883a980 100755 (executable)
@@ -24,17 +24,17 @@ namespace Tizen.NUI
     /// [UnmanagedFunctionPointer(CallingConvention.StdCall)]
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate R DaliEventHandlerWithReturnType<T, U, R>(T source, U e);
 
     /// <summary>
     /// [UnmanagedFunctionPointer(CallingConvention.StdCall)]
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate void EventCallbackDelegateType0();
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate void EventCallbackDelegateType1(IntPtr arg1);
 
     /// <summary>
@@ -42,14 +42,14 @@ namespace Tizen.NUI
     /// this should be removed with EventHandler from .NET
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate void DaliEventHandler<T, U>(T source, U e);
 
     /// <summary>
     /// [UnmanagedFunctionPointer(CallingConvention.StdCall)]
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate R EventHandlerWithReturnType<T, U, R>(T source, U e);
 
     /// <summary>
index 56aa5a5..44cc775 100755 (executable)
@@ -20,7 +20,6 @@ namespace Tizen.NUI
 {
     internal class EventThreadCallback : Disposable
     {
-        /// <since_tizen> 3 </since_tizen>
         public delegate void CallbackDelegate();
 
         internal EventThreadCallback(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
index 0f502b4..e40c344 100755 (executable)
@@ -76,6 +76,63 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_ImageView_IMAGE_VISUAL_ACTION_STOP_get")]
             public static extern int ImageVisualActionStopGet();
+
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.New(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_New__SWIG_0")]
+            public static extern global::System.IntPtr ImageView_New__SWIG_0();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.New(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_New__SWIG_2")]
+            public static extern global::System.IntPtr ImageView_New__SWIG_2(string jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.New(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_New__SWIG_3")]
+            public static extern global::System.IntPtr ImageView_New__SWIG_3(string jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.Upcast(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_SWIGUpcast")]
+            public static extern global::System.IntPtr ImageView_SWIGUpcast(global::System.IntPtr jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.SetImage(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_SetImage__SWIG_1")]
+            public static extern void ImageView_SetImage__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.SetImage(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_SetImage__SWIG_2")]
+            public static extern void ImageView_SetImage__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.DeleteImageView(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_ImageView")]
+            public static extern void delete_ImageView(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.ImageGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_Property_IMAGE_get")]
+            public static extern int ImageView_Property_IMAGE_get();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.PreMultipliedAlphaGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_Property_PRE_MULTIPLIED_ALPHA_get")]
+            public static extern int ImageView_Property_PRE_MULTIPLIED_ALPHA_get();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.PixelAreaGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_Property_PIXEL_AREA_get")]
+            public static extern int ImageView_Property_PIXEL_AREA_get();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.ImageVisualActionReloadGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_ImageView_IMAGE_VISUAL_ACTION_RELOAD_get")]
+            public static extern int ImageView_IMAGE_VISUAL_ACTION_RELOAD_get();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.ImageVisualActionPlayGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_ImageView_IMAGE_VISUAL_ACTION_PLAY_get")]
+            public static extern int ImageView_IMAGE_VISUAL_ACTION_PLAY_get();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.ImageVisualActionPauseGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_ImageView_IMAGE_VISUAL_ACTION_PAUSE_get")]
+            public static extern int ImageView_IMAGE_VISUAL_ACTION_PAUSE_get();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageView.ImageVisualActionStopGet(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_ImageView_IMAGE_VISUAL_ACTION_STOP_get")]
+            public static extern int ImageView_IMAGE_VISUAL_ACTION_STOP_get();
         }
     }
 }
index 4d5e0f5..d204d01 100755 (executable)
@@ -58,6 +58,11 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ResourceReadySignal")]
             public static extern global::System.IntPtr ResourceReadySignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use View.GetVisualResourceStatus(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_GetVisualResourceStatus")]
+            public static extern int View_GetVisualResourceStatus(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
         }
     }
 }
index 48fbcb6..f93c8f4 100755 (executable)
@@ -122,6 +122,35 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_SWIGUpcast")]
             public static extern global::System.IntPtr Upcast(global::System.IntPtr jarg1);
+
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.PauseWidget(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_PauseWidget")]
+            public static extern bool WidgetView_PauseWidget(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.ResumeWidget(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_ResumeWidget")]
+            public static extern bool WidgetView_ResumeWidget(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.TerminateWidget(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_TerminateWidget")]
+            public static extern bool WidgetView_TerminateWidget(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.DeleteWidgetView(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_WidgetView")]
+            public static extern void delete_WidgetView(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.Upcast(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_SWIGUpcast")]
+            public static extern global::System.IntPtr WidgetView_SWIGUpcast(global::System.IntPtr jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.WidgetAddedSignal(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_WidgetAddedSignal")]
+            public static extern global::System.IntPtr WidgetView_WidgetAddedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetView.WidgetDeletedSignal(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetView_WidgetDeletedSignal")]
+            public static extern global::System.IntPtr WidgetView_WidgetDeletedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
         }
     }
 }
index 6ef2209..e29d84b 100755 (executable)
@@ -32,6 +32,15 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetViewManager_SWIGUpcast")]
             public static extern global::System.IntPtr Upcast(global::System.IntPtr jarg1);
+
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetViewManager.New(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetViewManager_New")]
+            public static extern global::System.IntPtr WidgetViewManager_New(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetViewManager.AddWidget(...) instead!")]
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetViewManager_AddWidget")]
+            public static extern global::System.IntPtr WidgetViewManager_AddWidget(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3, int jarg4, int jarg5, float jarg6);
         }
     }
 }
index a8d274f..e21ba06 100755 (executable)
@@ -15,6 +15,9 @@
  *
  */
 
+using System;
+using System.ComponentModel;
+
 namespace Tizen.NUI
 {
 
@@ -151,6 +154,7 @@ namespace Tizen.NUI
             [global::System.ThreadStatic]
             private static global::System.Exception pendingException = null;
             private static int numExceptionsPending = 0;
+            private static readonly object exceptionPendingLock = new object();
 
             /// <since_tizen> 3 </since_tizen>
             public static bool Pending
@@ -171,7 +175,7 @@ namespace Tizen.NUI
                 if (pendingException != null)
                     throw new global::System.ApplicationException("FATAL: An earlier pending exception from unmanaged code was missed and thus not thrown (" + pendingException.ToString() + ")", e);
                 pendingException = e;
-                lock (typeof(NDalicPINVOKE))
+                lock (exceptionPendingLock)
                 {
                     numExceptionsPending++;
                 }
@@ -187,7 +191,7 @@ namespace Tizen.NUI
                     {
                         e = pendingException;
                         pendingException = null;
-                        lock (typeof(NDalicPINVOKE))
+                        lock (exceptionPendingLock)
                         {
                             numExceptionsPending--;
                         }
@@ -216,6 +220,13 @@ namespace Tizen.NUI
             {
                 SWIGRegisterStringCallbackNDalic(stringDelegate);
             }
+
+            [Obsolete("Please do not use! Deprecated in API9, will be removed in API11! Please delete this if currently used!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            public static void RegistCallback()
+            {
+                //do nothing!
+            }
         }
         static protected SWIGStringHelper swigStringHelper = new SWIGStringHelper();
         static NDalicPINVOKE()
@@ -266,5 +277,10 @@ namespace Tizen.NUI
 
         [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Application_LowMemorySignal")]
         public static extern global::System.IntPtr ApplicationLowMemorySignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+
+        [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use NDalicPINVOKE.DeleteBaseHandle(...) instead!")]
+        [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_BaseHandle")]
+        public static extern void delete_BaseHandle(global::System.Runtime.InteropServices.HandleRef jarg1);
     }
 }
index 92305d5..76f49c4 100755 (executable)
@@ -37,7 +37,6 @@ namespace Tizen.NUI
         /// Queries whether there are any connected slots.
         /// </summary>
         /// <returns>True if there are any slots connected to the signal</returns>
-        /// <since_tizen> 3 </since_tizen>
         public bool Empty()
         {
             bool ret = Interop.KeyboardEventSignalType.Empty(SwigCPtr);
@@ -49,7 +48,6 @@ namespace Tizen.NUI
         /// Queries the number of slots.
         /// </summary>
         /// <returns>The number of slots connected to this signal</returns>
-        /// <since_tizen> 3 </since_tizen>
         public uint GetConnectionCount()
         {
             uint ret = Interop.KeyboardEventSignalType.GetConnectionCount(SwigCPtr);
@@ -61,7 +59,6 @@ namespace Tizen.NUI
         /// Connects a function.
         /// </summary>
         /// <param name="func">The function to connect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Connect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
@@ -75,7 +72,6 @@ namespace Tizen.NUI
         /// Disconnects a function.
         /// </summary>
         /// <param name="func">The function to disconnect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Disconnect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
@@ -91,7 +87,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value to pass to callbacks</param>
         /// <param name="arg2">The second value to pass to callbacks</param>
         /// <returns>The value returned by the last callback, or a default constructed value if no callbacks are connected</returns>
-        /// <since_tizen> 5 </since_tizen>
         public InputMethodContext.CallbackData Emit(InputMethodContext arg1, InputMethodContext.EventData arg2)
         {
             InputMethodContext.CallbackData ret = new InputMethodContext.CallbackData(Interop.KeyboardEventSignalType.Emit(SwigCPtr, InputMethodContext.getCPtr(arg1), InputMethodContext.EventData.getCPtr(arg2)), true);
@@ -102,7 +97,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The contructor.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         public KeyboardEventSignalType() : this(Interop.KeyboardEventSignalType.NewKeyboardEventSignalType(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 2a0c622..98ae41f 100755 (executable)
@@ -37,7 +37,6 @@ namespace Tizen.NUI
         /// Queries whether there are any connected slots.
         /// </summary>
         /// <returns>True if there are any slots connected to the signal</returns>
-        /// <since_tizen> 4 </since_tizen>
         public bool Empty()
         {
             bool ret = Interop.KeyboardResizedSignalType.Empty(SwigCPtr);
@@ -49,7 +48,6 @@ namespace Tizen.NUI
         /// Queries the number of slots.
         /// </summary>
         /// <returns>The number of slots connected to this signal</returns>
-        /// <since_tizen> 4 </since_tizen>
         public uint GetConnectionCount()
         {
             uint ret = Interop.KeyboardResizedSignalType.GetConnectionCount(SwigCPtr);
@@ -61,7 +59,6 @@ namespace Tizen.NUI
         /// Connects a function.
         /// </summary>
         /// <param name="func">The function to connect</param>
-        /// <since_tizen> 4 </since_tizen>
         public void Connect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -75,7 +72,6 @@ namespace Tizen.NUI
         /// Disconnects a function.
         /// </summary>
         /// <param name="func">The function to disconnect</param>
-        /// <since_tizen> 4 </since_tizen>
         public void Disconnect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -89,7 +85,6 @@ namespace Tizen.NUI
         /// Connects a member function.
         /// </summary>
         /// <param name="arg">The member function to connect</param>
-        /// <since_tizen> 4 </since_tizen>
         public void Emit(int arg)
         {
             Interop.KeyboardResizedSignalType.Emit(SwigCPtr, arg);
@@ -99,7 +94,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The contructor.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         public KeyboardResizedSignalType() : this(Interop.KeyboardResizedSignalType.NewKeyboardResizedSignalType(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 87d367e..34567ec 100755 (executable)
@@ -37,7 +37,6 @@ namespace Tizen.NUI
         /// Queries whether there are any connected slots.
         /// </summary>
         /// <returns>True if there are any slots connected to the signal</returns>
-        /// <since_tizen> 4 </since_tizen>
         public bool Empty()
         {
             bool ret = Interop.LanguageChangedSignalType.Empty(SwigCPtr);
@@ -49,7 +48,6 @@ namespace Tizen.NUI
         /// Queries the number of slots.
         /// </summary>
         /// <returns>The number of slots connected to this signal</returns>
-        /// <since_tizen> 4 </since_tizen>
         public uint GetConnectionCount()
         {
             uint ret = Interop.LanguageChangedSignalType.GetConnectionCount(SwigCPtr);
@@ -61,7 +59,6 @@ namespace Tizen.NUI
         /// Connects a member function.
         /// </summary>
         /// <param name="func">The member function to connect</param>
-        /// <since_tizen> 4 </since_tizen>
         public void Connect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -75,7 +72,6 @@ namespace Tizen.NUI
         /// Disconnects a function.
         /// </summary>
         /// <param name="func">The function to disconnect</param>
-        /// <since_tizen> 4 </since_tizen>
         public void Disconnect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -88,7 +84,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Emits the signal.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         public void Emit(int arg)
         {
             Interop.LanguageChangedSignalType.Emit(SwigCPtr, arg);
@@ -98,7 +93,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The contructor.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         public LanguageChangedSignalType() : this(Interop.LanguageChangedSignalType.NewLanguageChangedSignalType(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 442c1a7..ff91589 100755 (executable)
@@ -77,7 +77,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public enum IluminationTypeEnum
         {
             DIFFUSE,
@@ -89,104 +88,136 @@ namespace Tizen.NUI
         {
             get
             {
-                string temp;
-                GetProperty(Model3dView.Property.GeometryUrl).Get(out temp);
-                return temp;
+                string retVal = "";
+                PropertyValue geometry = GetProperty(Model3dView.Property.GeometryUrl);
+                geometry?.Get(out retVal);
+                geometry?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.GeometryUrl, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.GeometryUrl, setVal);
+                setVal?.Dispose();
             }
         }
         public string MaterialUrl
         {
             get
             {
-                string temp;
-                GetProperty(Model3dView.Property.MaterialUrl).Get(out temp);
-                return temp;
+                string retVal = "" ;
+                PropertyValue material = GetProperty(Model3dView.Property.MaterialUrl);
+                material?.Get(out retVal);
+                material?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.MaterialUrl, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.MaterialUrl, setVal);
+                setVal?.Dispose();
             }
         }
         public string ImagesUrl
         {
             get
             {
-                string temp;
-                GetProperty(Model3dView.Property.ImagesUrl).Get(out temp);
-                return temp;
+                string retVal = "";
+                PropertyValue images = GetProperty(Model3dView.Property.ImagesUrl);
+                images?.Get(out retVal);
+                images?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.ImagesUrl, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.ImagesUrl, setVal);
+                setVal?.Dispose();
             }
         }
         public int IlluminationType
         {
             get
             {
-                int temp = 0;
-                GetProperty(Model3dView.Property.IlluminationType).Get(out temp);
-                return temp;
+                int retVal = 0;
+                PropertyValue illumination = GetProperty(Model3dView.Property.IlluminationType);
+                illumination?.Get(out retVal);
+                illumination?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.IlluminationType, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.IlluminationType, setVal);
+                setVal?.Dispose();
             }
         }
         public string Texture0Url
         {
             get
             {
-                string temp;
-                GetProperty(Model3dView.Property.Texture0Url).Get(out temp);
-                return temp;
+                string retVal = "";
+                PropertyValue texture0 = GetProperty(Model3dView.Property.Texture0Url);
+                texture0?.Get(out retVal);
+                texture0?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.Texture0Url, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.Texture0Url, setVal);
+                setVal?.Dispose();
             }
         }
         public string Texture1Url
         {
             get
             {
-                string temp;
-                GetProperty(Model3dView.Property.Texture1Url).Get(out temp);
-                return temp;
+                string retVal = "";
+                PropertyValue texture1 = GetProperty(Model3dView.Property.Texture1Url);
+                texture1?.Get(out retVal);
+                texture1?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.Texture1Url, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.Texture1Url, setVal);
+                setVal?.Dispose();
             }
         }
         public string Texture2Url
         {
             get
             {
-                string temp;
-                GetProperty(Model3dView.Property.Texture2Url).Get(out temp);
-                return temp;
+                string retVal = "";
+                PropertyValue texture2 = GetProperty(Model3dView.Property.Texture2Url);
+                texture2?.Get(out retVal);
+                texture2?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.Texture2Url, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.Texture2Url, setVal);
+                setVal?.Dispose();
             }
         }
         public Vector3 LightPosition
         {
             get
             {
-                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
-                GetProperty(Model3dView.Property.LightPosition).Get(temp);
-                return temp;
+                Vector3 retVal = new Vector3(0.0f, 0.0f, 0.0f);
+                PropertyValue lightPos = GetProperty(Model3dView.Property.LightPosition);
+                lightPos?.Get(retVal);
+                lightPos?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(Model3dView.Property.LightPosition, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Model3dView.Property.LightPosition, setVal);
+                setVal?.Dispose();
             }
         }
     }
index 0e7159b..bb8e4d6 100755 (executable)
@@ -15,6 +15,7 @@
  *
  */
 
+using System;
 using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
@@ -640,5 +641,13 @@ namespace Tizen.NUI
         internal static readonly int TooltipTailVisibility = Interop.NDalicToolTip.TooltipTailVisibilityGet();
         internal static readonly int TooltipTailAboveVisual = Interop.NDalicToolTip.TooltipTailAboveVisualGet();
         internal static readonly int TooltipTailBelowVisual = Interop.NDalicToolTip.TooltipTailBelowVisualGet();
+
+
+        [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageVisualUrl instead!")]
+        internal static readonly int IMAGE_VISUAL_URL = Interop.NDalicImageVisual.ImageVisualUrlGet();
+        [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageVisualAlphaMaskUrl instead!")]
+        internal static readonly int IMAGE_VISUAL_ALPHA_MASK_URL = Interop.NDalicImageVisual.ImageVisualAlphaMaskUrlGet();
+        [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ImageVisualAuxiliaryImageUrl instead!")]
+        internal static readonly int IMAGE_VISUAL_AUXILIARY_IMAGE_URL = Interop.NDalicImageVisual.ImageVisualAuxiliaryImageUrlGet();
     }
 }
index cb282f5..0f4fbf0 100755 (executable)
@@ -18,7 +18,6 @@ namespace Tizen.NUI
         /// Initializes the NUI Window class.
         /// </summary>
         /// <param name="win">The window object of component.</param>
-        /// <since_tizen> 6 </since_tizen>
         internal NUIWindowInfo(Window win)
         {
             _win = win;
@@ -64,7 +63,6 @@ namespace Tizen.NUI
         /// Dispose the window resources
         /// </summary>
         /// <returns></returns>
-        /// <since_tizen> 6 </since_tizen>
         public void Dispose()
         {
             Dispose(true);
index 5d8f786..53f944f 100755 (executable)
@@ -36,12 +36,10 @@ namespace Tizen.NUI
             Interop.ObjectRegistry.DeleteObjectRegistry(swigCPtr);
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class ObjectCreatedEventArgs : EventArgs
         {
             private BaseHandle _baseHandle;
 
-            /// <since_tizen> 3 </since_tizen>
             public BaseHandle BaseHandle
             {
                 get
@@ -55,12 +53,10 @@ namespace Tizen.NUI
             }
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class ObjectDestroyedEventArgs : EventArgs
         {
             private RefObject _refObject;
 
-            /// <since_tizen> 3 </since_tizen>
             public RefObject RefObject
             {
                 get
@@ -88,30 +84,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_objectRegistryObjectCreatedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_objectRegistryObjectCreatedEventHandler == null)
-                    {
-                        _objectRegistryObjectCreatedEventHandler += value;
-
-                        _objectRegistryObjectCreatedEventCallbackDelegate = new ObjectCreatedEventCallbackDelegate(OnObjectCreated);
-                        this.ObjectCreatedSignal().Connect(_objectRegistryObjectCreatedEventCallbackDelegate);
-                    }
+                    _objectRegistryObjectCreatedEventHandler += value;
+
+                    _objectRegistryObjectCreatedEventCallbackDelegate = new ObjectCreatedEventCallbackDelegate(OnObjectCreated);
+                    this.ObjectCreatedSignal().Connect(_objectRegistryObjectCreatedEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_objectRegistryObjectCreatedEventHandler != null)
                 {
-                    if (_objectRegistryObjectCreatedEventHandler != null)
-                    {
-                        this.ObjectCreatedSignal().Disconnect(_objectRegistryObjectCreatedEventCallbackDelegate);
-                    }
-
-                    _objectRegistryObjectCreatedEventHandler -= value;
+                    this.ObjectCreatedSignal().Disconnect(_objectRegistryObjectCreatedEventCallbackDelegate);
                 }
+
+                _objectRegistryObjectCreatedEventHandler -= value;
             }
         }
 
@@ -134,30 +124,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_objectRegistryObjectDestroyedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_objectRegistryObjectDestroyedEventHandler == null)
-                    {
-                        _objectRegistryObjectDestroyedEventHandler += value;
-
-                        _objectRegistryObjectDestroyedEventCallbackDelegate = new ObjectDestroyedEventCallbackDelegate(OnObjectDestroyed);
-                        this.ObjectDestroyedSignal().Connect(_objectRegistryObjectDestroyedEventCallbackDelegate);
-                    }
+                    _objectRegistryObjectDestroyedEventHandler += value;
+
+                    _objectRegistryObjectDestroyedEventCallbackDelegate = new ObjectDestroyedEventCallbackDelegate(OnObjectDestroyed);
+                    this.ObjectDestroyedSignal().Connect(_objectRegistryObjectDestroyedEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_objectRegistryObjectDestroyedEventHandler != null)
                 {
-                    if (_objectRegistryObjectDestroyedEventHandler != null)
-                    {
-                        this.ObjectDestroyedSignal().Disconnect(_objectRegistryObjectDestroyedEventCallbackDelegate);
-                    }
-
-                    _objectRegistryObjectDestroyedEventHandler -= value;
+                    this.ObjectDestroyedSignal().Disconnect(_objectRegistryObjectDestroyedEventCallbackDelegate);
                 }
+
+                _objectRegistryObjectDestroyedEventHandler -= value;
             }
         }
 
index 465142a..9ff5d6f 100755 (executable)
@@ -37,12 +37,10 @@ namespace Tizen.NUI
             Interop.PageTurnView.DeletePageTurnView(swigCPtr);
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class PagePanStartedEventArgs : EventArgs
         {
             private PageTurnView _pageTurnView;
 
-            /// <since_tizen> 3 </since_tizen>
             public PageTurnView PageTurnView
             {
                 get
@@ -56,12 +54,10 @@ namespace Tizen.NUI
             }
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class PagePanFinishedEventArgs : EventArgs
         {
             private PageTurnView _pageTurnView;
 
-            /// <since_tizen> 3 </since_tizen>
             public PageTurnView PageTurnView
             {
                 get
@@ -75,14 +71,12 @@ namespace Tizen.NUI
             }
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class PageTurnStartedEventArgs : EventArgs
         {
             private PageTurnView _pageTurnView;
             private uint _pageIndex;
             private bool _isTurningForward;
 
-            /// <since_tizen> 3 </since_tizen>
             public PageTurnView PageTurnView
             {
                 get
@@ -95,7 +89,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public uint PageIndex
             {
                 get
@@ -108,7 +101,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public bool IsTurningForward
             {
                 get
@@ -123,14 +115,12 @@ namespace Tizen.NUI
 
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public class PageTurnFinishedEventArgs : EventArgs
         {
             private PageTurnView _pageTurnView;
             private uint _pageIndex;
             private bool _isTurningForward;
 
-            /// <since_tizen> 3 </since_tizen>
             public PageTurnView PageTurnView
             {
                 get
@@ -143,7 +133,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public uint PageIndex
             {
                 get
@@ -156,7 +145,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public bool IsTurningForward
             {
                 get
@@ -195,30 +183,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_pageTurnViewPagePanStartedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_pageTurnViewPagePanStartedEventHandler == null)
-                    {
-                        _pageTurnViewPagePanStartedEventHandler += value;
-
-                        _pageTurnViewPagePanStartedCallbackDelegate = new PagePanStartedCallbackDelegate(OnPagePanStarted);
-                        this.PagePanStartedSignal().Connect(_pageTurnViewPagePanStartedCallbackDelegate);
-                    }
+                    _pageTurnViewPagePanStartedEventHandler += value;
+
+                    _pageTurnViewPagePanStartedCallbackDelegate = new PagePanStartedCallbackDelegate(OnPagePanStarted);
+                    this.PagePanStartedSignal().Connect(_pageTurnViewPagePanStartedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_pageTurnViewPagePanStartedEventHandler != null)
                 {
-                    if (_pageTurnViewPagePanStartedEventHandler != null)
-                    {
-                        this.PagePanStartedSignal().Disconnect(_pageTurnViewPagePanStartedCallbackDelegate);
-                    }
-
-                    _pageTurnViewPagePanStartedEventHandler -= value;
+                    this.PagePanStartedSignal().Disconnect(_pageTurnViewPagePanStartedCallbackDelegate);
                 }
+
+                _pageTurnViewPagePanStartedEventHandler -= value;
             }
         }
 
@@ -241,30 +223,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_pageTurnViewPagePanFinishedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_pageTurnViewPagePanFinishedEventHandler == null)
-                    {
-                        _pageTurnViewPagePanFinishedEventHandler += value;
-
-                        _pageTurnViewPagePanFinishedCallbackDelegate = new PagePanFinishedCallbackDelegate(OnPagePanFinished);
-                        this.PagePanFinishedSignal().Connect(_pageTurnViewPagePanFinishedCallbackDelegate);
-                    }
+                    _pageTurnViewPagePanFinishedEventHandler += value;
+
+                    _pageTurnViewPagePanFinishedCallbackDelegate = new PagePanFinishedCallbackDelegate(OnPagePanFinished);
+                    this.PagePanFinishedSignal().Connect(_pageTurnViewPagePanFinishedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_pageTurnViewPagePanFinishedEventHandler != null)
                 {
-                    if (_pageTurnViewPagePanFinishedEventHandler != null)
-                    {
-                        this.PagePanFinishedSignal().Disconnect(_pageTurnViewPagePanFinishedCallbackDelegate);
-                    }
-
-                    _pageTurnViewPagePanFinishedEventHandler -= value;
+                    this.PagePanFinishedSignal().Disconnect(_pageTurnViewPagePanFinishedCallbackDelegate);
                 }
+
+                _pageTurnViewPagePanFinishedEventHandler -= value;
             }
         }
 
@@ -288,30 +264,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_pageTurnViewPageTurnStartedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_pageTurnViewPageTurnStartedEventHandler == null)
-                    {
-                        _pageTurnViewPageTurnStartedEventHandler += value;
-
-                        _pageTurnViewPageTurnStartedCallbackDelegate = new PageTurnStartedCallbackDelegate(OnPageTurnStarted);
-                        this.PageTurnStartedSignal().Connect(_pageTurnViewPageTurnStartedCallbackDelegate);
-                    }
+                    _pageTurnViewPageTurnStartedEventHandler += value;
+
+                    _pageTurnViewPageTurnStartedCallbackDelegate = new PageTurnStartedCallbackDelegate(OnPageTurnStarted);
+                    this.PageTurnStartedSignal().Connect(_pageTurnViewPageTurnStartedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_pageTurnViewPageTurnStartedEventHandler != null)
                 {
-                    if (_pageTurnViewPageTurnStartedEventHandler != null)
-                    {
-                        this.PageTurnStartedSignal().Disconnect(_pageTurnViewPageTurnStartedCallbackDelegate);
-                    }
-
-                    _pageTurnViewPageTurnStartedEventHandler -= value;
+                    this.PageTurnStartedSignal().Disconnect(_pageTurnViewPageTurnStartedCallbackDelegate);
                 }
+
+                _pageTurnViewPageTurnStartedEventHandler -= value;
             }
         }
 
@@ -338,30 +308,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_pageTurnViewPageTurnFinishedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_pageTurnViewPageTurnFinishedEventHandler == null)
-                    {
-                        _pageTurnViewPageTurnFinishedEventHandler += value;
-
-                        _pageTurnViewPageTurnFinishedCallbackDelegate = new PageTurnFinishedCallbackDelegate(OnPageTurnFinished);
-                        this.PageTurnFinishedSignal().Connect(_pageTurnViewPageTurnFinishedCallbackDelegate);
-                    }
+                    _pageTurnViewPageTurnFinishedEventHandler += value;
+
+                    _pageTurnViewPageTurnFinishedCallbackDelegate = new PageTurnFinishedCallbackDelegate(OnPageTurnFinished);
+                    this.PageTurnFinishedSignal().Connect(_pageTurnViewPageTurnFinishedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_pageTurnViewPageTurnFinishedEventHandler != null)
                 {
-                    if (_pageTurnViewPageTurnFinishedEventHandler != null)
-                    {
-                        this.PageTurnFinishedSignal().Disconnect(_pageTurnViewPageTurnFinishedCallbackDelegate);
-                    }
-
-                    _pageTurnViewPageTurnFinishedEventHandler -= value;
+                    this.PageTurnFinishedSignal().Disconnect(_pageTurnViewPageTurnFinishedCallbackDelegate);
                 }
+
+                _pageTurnViewPageTurnFinishedEventHandler -= value;
             }
         }
 
index a0168b4..d4cdd14 100755 (executable)
@@ -112,11 +112,9 @@ namespace Tizen.NUI
 
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public struct PropertyRange
         {
 
-            /// <since_tizen> 3 </since_tizen>
             public int GetNextFreePropertyIndex(ScriptableProperty.ScriptableType type)
             {
                 if (type == ScriptableProperty.ScriptableType.Default)
@@ -131,14 +129,10 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public int startEventIndex;        // start of the property range
-            /// <since_tizen> 3 </since_tizen>
             public int lastUsedEventIndex;     // last used of the property index
 
-            /// <since_tizen> 3 </since_tizen>
             public int startAnimationIndex;    // start of the property range
-            /// <since_tizen> 3 </since_tizen>
             public int lastUsedAnimationIndex; // last used of the property index
         };
     }
index e54fb42..2732266 100755 (executable)
@@ -381,52 +381,68 @@ namespace Tizen.NUI
         {
             get
             {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(RenderTask.Property.ViewportPosition).Get(temp);
-                return temp;
+                Vector2 retVal = new Vector2(0.0f, 0.0f);
+                PropertyValue viewportPos = GetProperty(RenderTask.Property.ViewportPosition);
+                viewportPos?.Get(retVal);
+                viewportPos?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(RenderTask.Property.ViewportPosition, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(RenderTask.Property.ViewportPosition, setVal);
+                setVal?.Dispose();
             }
         }
         public Vector2 ViewportSize
         {
             get
             {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(RenderTask.Property.ViewportSize).Get(temp);
-                return temp;
+                Vector2 retVal = new Vector2(0.0f, 0.0f);
+                PropertyValue viewportSize = GetProperty(RenderTask.Property.ViewportSize);
+                viewportSize?.Get(retVal);
+                viewportSize?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(RenderTask.Property.ViewportSize, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(RenderTask.Property.ViewportSize, setVal);
+                setVal?.Dispose();
             }
         }
         public Vector4 ClearColor
         {
             get
             {
-                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-                GetProperty(RenderTask.Property.ClearColor).Get(temp);
-                return temp;
+                Vector4 retVal = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                PropertyValue clearColor = GetProperty(RenderTask.Property.ClearColor);
+                clearColor?.Get(retVal);
+                clearColor?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(RenderTask.Property.ClearColor, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(RenderTask.Property.ClearColor, setVal);
+                setVal?.Dispose();
             }
         }
         public bool RequiresSync
         {
             get
             {
-                bool temp = false;
-                GetProperty(RenderTask.Property.RequiresSync).Get(out temp);
-                return temp;
+                bool retVal = false;
+                PropertyValue reqSync = GetProperty(RenderTask.Property.RequiresSync);
+                reqSync?.Get(out retVal);
+                reqSync?.Dispose();
+                return retVal;
             }
             set
             {
-                SetProperty(RenderTask.Property.RequiresSync, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setVal = new Tizen.NUI.PropertyValue(value);
+                SetProperty(RenderTask.Property.RequiresSync, setVal);
+                setVal?.Dispose();
             }
         }
     }
index 4a4417a..71b9ef5 100755 (executable)
@@ -25,7 +25,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The Constructor.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         protected SWIGTYPE_p_CallbackBase()
         {
             swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
index 01e3744..31dfa4b 100755 (executable)
@@ -25,7 +25,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The Constructor.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         protected SWIGTYPE_p_Dali__CallbackBase()
         {
             swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
index 0a10218..18d99c2 100755 (executable)
@@ -25,7 +25,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The Constructor.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         protected SWIGTYPE_p_Dali__FunctorDelegate()
         {
             swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
index 4ad549a..a1f3411 100755 (executable)
@@ -38,7 +38,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="slotObserver">The signal that has disconnected</param>
         /// <param name="callback">The callback attached to the signal disconnected</param>
-        /// <since_tizen> 4 </since_tizen>
         public virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
         {
             Interop.SignalObserver.SignalDisconnected(SwigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
index f444ab0..9de7ab7 100755 (executable)
@@ -41,7 +41,6 @@ namespace Tizen.NUI
         /// This method is called when the slot is disconnecting.
         /// </summary>
         /// <param name="callback">The callback attached to the signal disconnected.</param>
-        /// <since_tizen> 4 </since_tizen>
         public virtual void SlotDisconnected(SWIGTYPE_p_Dali__CallbackBase callback)
         {
             SlotObserver_SlotDisconnected(SwigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
index 5bfa88b..efbcd04 100755 (executable)
@@ -37,7 +37,6 @@ namespace Tizen.NUI
         /// Queries whether there are any connected slots.
         /// </summary>
         /// <returns>True if there are any slots connected to the signal</returns>
-        /// <since_tizen> 3 </since_tizen>
         public bool Empty()
         {
             bool ret = Interop.StatusSignalType.Empty(SwigCPtr);
@@ -49,7 +48,6 @@ namespace Tizen.NUI
         /// Queries the number of slots.
         /// </summary>
         /// <returns>The number of slots connected to this signal</returns>
-        /// <since_tizen> 3 </since_tizen>
         public uint GetConnectionCount()
         {
             uint ret = Interop.StatusSignalType.GetConnectionCount(SwigCPtr);
@@ -61,7 +59,6 @@ namespace Tizen.NUI
         /// Connects a function.
         /// </summary>
         /// <param name="func">The function to connect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Connect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
@@ -75,7 +72,6 @@ namespace Tizen.NUI
         /// Disconnects a function.
         /// </summary>
         /// <param name="func">The function to disconnect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Disconnect(System.Delegate func)
         {
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
@@ -89,7 +85,6 @@ namespace Tizen.NUI
         /// Connects a member function.
         /// </summary>
         /// <param name="arg">The member function to connect</param>
-        /// <since_tizen> 3 </since_tizen>
         public void Emit(bool arg)
         {
             Interop.StatusSignalType.Emit(SwigCPtr, arg);
@@ -99,7 +94,6 @@ namespace Tizen.NUI
         /// <summary>
         /// The constructor.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         public StatusSignalType() : this(Interop.StatusSignalType.NewStatusSignalType(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 2a287aa..a00b40a 100755 (executable)
@@ -124,7 +124,6 @@ namespace Tizen.NUI
             }
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public enum StateType
         {
             Started,
index f1aa407..5c61a3b 100755 (executable)
@@ -151,7 +151,6 @@ namespace Tizen.NUI
         /// whenever the collection is modified. This has been done for changes in the size of the
         /// collection, but not when one of the elements of the collection is modified as it is a bit
         /// tricky to detect unmanaged code that modifies the collection under our feet.
-        /// <since_tizen> 3 </since_tizen>
         public sealed class TouchPointContainerEnumerator : global::System.Collections.IEnumerator
           , global::System.Collections.Generic.IEnumerator<TouchPoint>
         {
@@ -160,7 +159,6 @@ namespace Tizen.NUI
             private object currentObject;
             private int currentSize;
 
-            /// <since_tizen> 3 </since_tizen>
             public TouchPointContainerEnumerator(TouchPointContainer collection)
             {
                 collectionRef = collection;
@@ -170,7 +168,6 @@ namespace Tizen.NUI
             }
 
             // Type-safe iterator Current
-            /// <since_tizen> 3 </since_tizen>
             public TouchPoint Current
             {
                 get
@@ -194,7 +191,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public bool MoveNext()
             {
                 int size = collectionRef.Count;
@@ -211,7 +207,6 @@ namespace Tizen.NUI
                 return moveOkay;
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public void Reset()
             {
                 currentIndex = -1;
@@ -222,7 +217,6 @@ namespace Tizen.NUI
                 }
             }
 
-            /// <since_tizen> 3 </since_tizen>
             public void Dispose()
             {
                 currentIndex = -1;
index 757c417..3b5b1e0 100755 (executable)
@@ -30,7 +30,6 @@ namespace Tizen.NUI
     /// One of these can be passed in a single 32 bit integer register on
     /// common architectures.<br />
     /// </summary>
-    /// <since_tizen> 3 </since_tizen>
     internal class Uint16Pair : Disposable
     {
 
@@ -54,7 +53,6 @@ namespace Tizen.NUI
         /// <param name="arg1">A reference for comparison.</param>
         /// <param name="arg2">A reference for comparison</param>
         /// <return>True if arg1 less than arg2</return>
-        /// <since_tizen> 3 </since_tizen>
         public static bool operator <(Uint16Pair arg1, Uint16Pair arg2)
         {
             return arg1.LessThan(arg2);
@@ -66,7 +64,6 @@ namespace Tizen.NUI
         /// <param name="arg1">A reference for comparison.</param>
         /// <param name="arg2">A reference for comparison</param>
         /// <return>True if arg1 > arg2</return>
-        /// <since_tizen> 3 </since_tizen>
         public static bool operator >(Uint16Pair arg1, Uint16Pair arg2)
         {
             return arg1.GreaterThan(arg2);
@@ -75,7 +72,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Default constructor for the(0, 0) tuple.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         public Uint16Pair() : this(Interop.Uint16Pair.NewUint16Pair(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -86,7 +82,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="width">The width or X dimension of the tuple. Make sure it is less than 65536.</param>
         /// <param name="height">The height or Y dimension of the tuple.Make sure it is less than 65536.</param>
-        /// <since_tizen> 3 </since_tizen>
         public Uint16Pair(uint width, uint height) : this(Interop.Uint16Pair.NewUint16Pair(width, height), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -96,7 +91,6 @@ namespace Tizen.NUI
         /// Constructor taking separate x and y (width and height) parameters.
         /// </summary>
         /// <param name="rhs">A reference to assign.</param>
-        /// <since_tizen> 3 </since_tizen>
         public Uint16Pair(Uint16Pair rhs) : this(Interop.Uint16Pair.NewUint16Pair(Uint16Pair.getCPtr(rhs)), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -106,7 +100,6 @@ namespace Tizen.NUI
         /// Sets the width.
         /// </summary>
         /// <param name="width">The x dimension to be stored in this 2-tuple.</param>
-        /// <since_tizen> 3 </since_tizen>
         public void SetWidth(ushort width)
         {
             Interop.Uint16Pair.SetWidth(SwigCPtr, width);
@@ -119,7 +112,6 @@ namespace Tizen.NUI
         /// <return>
         /// The x dimension stored in this 2-tuple.
         /// </return>
-        /// <since_tizen> 3 </since_tizen>
         public ushort GetWidth()
         {
             ushort ret = Interop.Uint16Pair.GetWidth(SwigCPtr);
@@ -131,7 +123,6 @@ namespace Tizen.NUI
         /// Sets the height.
         /// </summary>
         /// <param name="height">The y dimension to be stored in this 2-tuple.</param>
-        /// <since_tizen> 3 </since_tizen>
         public void SetHeight(ushort height)
         {
             Interop.Uint16Pair.SetHeight(SwigCPtr, height);
@@ -144,7 +135,6 @@ namespace Tizen.NUI
         /// <return>
         /// The y dimension stored in this 2-tuple.
         /// </return>
-        /// <since_tizen> 3 </since_tizen>
         public ushort GetHeight()
         {
             ushort ret = Interop.Uint16Pair.GetHeight(SwigCPtr);
@@ -156,7 +146,6 @@ namespace Tizen.NUI
         /// Sets the x dimension.
         /// </summary>
         /// <param name="x">The x dimension to be stored in this 2-tuple.</param>
-        /// <since_tizen> 3 </since_tizen>
         public void SetX(ushort x)
         {
             Interop.Uint16Pair.SetX(SwigCPtr, x);
@@ -169,7 +158,6 @@ namespace Tizen.NUI
         /// <return>
         /// The x dimension stored in this 2-tuple.
         /// </return>
-        /// <since_tizen> 3 </since_tizen>
         public ushort GetX()
         {
             ushort ret = Interop.Uint16Pair.GetX(SwigCPtr);
@@ -181,7 +169,6 @@ namespace Tizen.NUI
         /// Sets the y dimension.
         /// </summary>
         /// <param name="y">The y dimension to be stored in this 2-tuple.</param>
-        /// <since_tizen> 3 </since_tizen>
         public void SetY(ushort y)
         {
             Interop.Uint16Pair.SetY(SwigCPtr, y);
@@ -194,7 +181,6 @@ namespace Tizen.NUI
         /// <return>
         /// The y dimension stored in this 2-tuple.
         /// </return>
-        /// <since_tizen> 3 </since_tizen>
         public ushort GetY()
         {
             ushort ret = Interop.Uint16Pair.GetY(SwigCPtr);
@@ -207,7 +193,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="rhs">A reference to assign.</param>
         /// <return>The created object.</return>
-        /// <since_tizen> 3 </since_tizen>
         public Uint16Pair Assign(Uint16Pair rhs)
         {
             Uint16Pair ret = new Uint16Pair(Interop.Uint16Pair.Assign(SwigCPtr, Uint16Pair.getCPtr(rhs)), false);
index 62c5416..445f98c 100755 (executable)
@@ -172,7 +172,6 @@ namespace Tizen.NUI
         /// [Obsolete("Please do not use! this will be deprecated")]
         /// </summary>
         /// Please do not use! this will be deprecated!
-        /// <since_tizen> 5 </since_tizen>
         [Obsolete("Please do not use! this will be deprecated.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void AccessibilityActivate()
@@ -185,7 +184,6 @@ namespace Tizen.NUI
         /// [Obsolete("Please do not use! this will be deprecated")]
         /// </summary>
         /// Please do not use! this will be deprecated!
-        /// <since_tizen> 5 </since_tizen>
         [Obsolete("Please do not use! this will be deprecated.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void KeyboardEnter()
@@ -219,7 +217,6 @@ namespace Tizen.NUI
         /// [Obsolete("Please do not use! this will be deprecated")]
         /// </summary>
         /// Please do not use! this will be deprecated!
-        /// <since_tizen> 5 </since_tizen>
         [Obsolete("Please do not use! this will be deprecated.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public bool EmitKeyEventSignal(Key arg0)
@@ -732,79 +729,42 @@ namespace Tizen.NUI
             SignalDisconnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback));
         }
 
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_0(int depth);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_1();
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_2(global::System.IntPtr child);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_3(global::System.IntPtr child);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_4(int index, global::System.IntPtr propertyValue);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_5(global::System.IntPtr targetSize);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_6(global::System.IntPtr animation, global::System.IntPtr targetSize);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_9(global::System.IntPtr arg0);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_11(global::System.IntPtr size, global::System.IntPtr container);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_12(int policy, int dimension);
-        /// <since_tizen> 3 </since_tizen>
         public delegate global::System.IntPtr SwigDelegateViewImpl_13();
-        /// <since_tizen> 3 </since_tizen>
         public delegate float SwigDelegateViewImpl_14(global::System.IntPtr child, int dimension);
-        /// <since_tizen> 3 </since_tizen>
         public delegate float SwigDelegateViewImpl_15(float width);
-        /// <since_tizen> 3 </since_tizen>
         public delegate float SwigDelegateViewImpl_16(float height);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_17(int dimension);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_18();
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_19(int dimension);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_20(float size, int dimension);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_21();
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_22(global::System.IntPtr child);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_23(global::System.IntPtr child);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_24(global::System.IntPtr styleManager, int change);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_25();
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_26(global::System.IntPtr gesture);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_28(bool isIncrease);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_29();
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_30();
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_31();
-        /// <since_tizen> 3 </since_tizen>
         public delegate global::System.IntPtr SwigDelegateViewImpl_32(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_33(global::System.IntPtr commitedFocusableActor);
-        /// <since_tizen> 3 </since_tizen>
         public delegate bool SwigDelegateViewImpl_34();
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_35(global::System.IntPtr pinch);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_36(global::System.IntPtr pan);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_37(global::System.IntPtr tap);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_38(global::System.IntPtr longPress);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_39(global::System.IntPtr slotObserver, global::System.IntPtr callback);
-        /// <since_tizen> 3 </since_tizen>
         public delegate void SwigDelegateViewImpl_40(global::System.IntPtr slotObserver, global::System.IntPtr callback);
 
         private SwigDelegateViewImpl_0 swigDelegate0;
index bde908f..aaf893d 100755 (executable)
@@ -113,13 +113,11 @@ namespace Tizen.NUI
         /// <summary>
         /// Event arguments that passed via time tick event signal.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         public class TimeTickEventArgs : EventArgs
         {
             /// <summary>
             /// Application.
             /// </summary>
-            /// <since_tizen> 4 </since_tizen>
             public Application Application
             {
                 get;
@@ -129,7 +127,6 @@ namespace Tizen.NUI
             /// <summary>
             /// WatchTime.
             /// </summary>
-            /// <since_tizen> 4 </since_tizen>
             public WatchTime WatchTime
             {
                 get;
@@ -189,13 +186,11 @@ namespace Tizen.NUI
         /// <summary>
         /// Event arguments that passed via ambient tick event signal.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         public class AmbientTickEventArgs : EventArgs
         {
             /// <summary>
             /// Application.
             /// </summary>
-            /// <since_tizen> 4 </since_tizen>
             public Application Application
             {
                 get;
@@ -205,7 +200,6 @@ namespace Tizen.NUI
             /// <summary>
             /// WatchTime.
             /// </summary>
-            /// <since_tizen> 4 </since_tizen>
             public WatchTime WatchTime
             {
                 get;
@@ -264,13 +258,11 @@ namespace Tizen.NUI
         /// <summary>
         /// Event arguments that passed via ambient tick event signal.
         /// </summary>
-        /// <since_tizen> 4 </since_tizen>
         public class AmbientChangedEventArgs : EventArgs
         {
             /// <summary>
             /// Application.
             /// </summary>
-            /// <since_tizen> 4 </since_tizen>
             public Application Application
             {
                 get;
@@ -280,7 +272,6 @@ namespace Tizen.NUI
             /// <summary>
             /// Changed.
             /// </summary>
-            /// <since_tizen> 4 </since_tizen>
             public bool Changed
             {
                 get;
index 99a9d22..888512b 100755 (executable)
@@ -124,7 +124,7 @@ namespace Tizen.NUI.Accessibility
             /// </summary>
             // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
             [EditorBrowsable(EditorBrowsableState.Never)]
-            public SayFinishedStates State
+            public SayFinishedState State
             {
                 private set;
                 get;
@@ -132,7 +132,7 @@ namespace Tizen.NUI.Accessibility
 
             internal SayFinishedEventArgs(int result)
             {
-                State = (SayFinishedStates)(result);
+                State = (SayFinishedState)(result);
                 tlog.Fatal(tag, $"SayFinishedEventArgs Constructor! State={State}");
             }
         }
@@ -140,13 +140,46 @@ namespace Tizen.NUI.Accessibility
         /// <summary>
         /// Enum of Say finished event argument status
         /// </summary>
-        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [Obsolete("Please do not use! This will be removed. Please use Accessibility.SayFinishedState instead!")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public enum SayFinishedStates
         {
             /// <summary>
             /// Invalid
             /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Accessibility.SayFinishedState.Invalid instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Invalid = -1,
+            /// <summary>
+            /// Cancelled
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Accessibility.SayFinishedState.Invalid instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Cancelled = 1,
+            /// <summary>
+            /// Stopped
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Accessibility.SayFinishedState.Invalid instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Stopped = 2,
+            /// <summary>
+            /// Skipped
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Accessibility.SayFinishedState.Invalid instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Skipped = 3
+        }
+
+        /// <summary>
+        /// Enum of Say finished event argument status
+        /// </summary>
+        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum SayFinishedState
+        {
+            /// <summary>
+            /// Invalid
+            /// </summary>
             // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
             [EditorBrowsable(EditorBrowsableState.Never)]
             Invalid = -1,
index 928f2c7..2867f72 100755 (executable)
@@ -87,6 +87,7 @@ namespace Tizen.NUI
         /// This specifies the various types of BuiltinFunctions.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
         public enum BuiltinFunctions
         {
             /// <summary>
@@ -169,6 +170,7 @@ namespace Tizen.NUI
         /// This specifies which mode is set for AlphaFunction.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
         public enum Modes
         {
             /// <summary>
index 51281d0..914d6a5 100755 (executable)
@@ -152,6 +152,7 @@ namespace Tizen.NUI
         /// Enumeration for what to do when the animation ends, stopped, or destroyed.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
         public enum EndActions
         {
             /// <summary>
@@ -189,6 +190,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <remarks>Calling Reset() on this class will not reset the animation. It will call the BaseHandle.Reset() which drops the object handle.</remarks>
         /// <since_tizen> 3 </since_tizen>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
         public enum States
         {
             /// <summary>
index db53ca4..b495413 100755 (executable)
@@ -39,7 +39,7 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AnimatedImageView() : base()
         {
-            mDirtyFlag = true;
+            dirtyFlag = true;
         }
 
         /// <summary>
@@ -72,12 +72,12 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return mUrl;
+                return url;
             }
             set
             {
-                mDirtyFlag = true;
-                mUrl = value;
+                dirtyFlag = true;
+                url = value;
             }
         }
 
@@ -90,7 +90,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return mResourceURLs;
+                return resourceURLs;
             }
         }
 
@@ -104,12 +104,12 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return mBatchSize;
+                return batchSize;
             }
             set
             {
-                mDirtyFlag = true;
-                mBatchSize = value;
+                dirtyFlag = true;
+                batchSize = value;
             }
         }
 
@@ -127,12 +127,12 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return mCacheSize;
+                return cacheSize;
             }
             set
             {
-                mDirtyFlag = true;
-                mCacheSize = value;
+                dirtyFlag = true;
+                cacheSize = value;
             }
         }
 
@@ -149,12 +149,12 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return mFrameDelay;
+                return frameDelay;
             }
             set
             {
-                mDirtyFlag = true;
-                mFrameDelay = value;
+                dirtyFlag = true;
+                frameDelay = value;
             }
         }
 
@@ -167,12 +167,86 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return mLoopCount;
+                return loopCount;
             }
             set
             {
-                mDirtyFlag = true;
-                mLoopCount = value;
+                dirtyFlag = true;
+                loopCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Sets or gets the stop behavior.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public StopBehaviorType StopBehavior
+        {
+            set
+            {
+                stopBehavior = (StopBehaviorType)value;
+                dirtyFlag = true;
+            }
+            get
+            {
+                return stopBehavior;
+            }
+        }
+
+        /// <summary>
+        /// Get the number of total frames
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public int TotalFrame
+        {
+            get
+            {
+                int ret = -1;
+                PropertyMap map = Image;
+                if (map != null)
+                {
+                    PropertyValue val = map.Find(ImageVisualProperty.TotalFrameNumber);
+                    if (val != null)
+                    {
+                        if (val.Get(out ret))
+                        {
+                            return ret;
+                        }
+                    }
+                }
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Set or get the current frame. When setting a specific frame, it is displayed as a still image.
+        /// </summary>
+        /// <remarks>
+        /// Gets the value set by a user. If the setting value is out-ranged, it is reset as a minimum frame or a maximum frame.
+        /// </remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public int CurrentFrame
+        {
+            set
+            {
+                DoAction(ImageView.Property.IMAGE, (int)ActionType.jumpTo, new PropertyValue(value));
+            }
+            get
+            {
+                int ret = -1;
+                PropertyMap map = Image;
+                if (map != null)
+                {
+                    PropertyValue val = map.Find(ImageVisualProperty.CurrentFrameNumber);
+                    if (val != null)
+                    {
+                        if (val.Get(out ret))
+                        {
+                            return ret;
+                        }
+                    }
+                }
+                return ret;
             }
         }
         #endregion Property
@@ -185,56 +259,61 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void SetValues()
         {
-            if (mDirtyFlag == false)
+            if (dirtyFlag == false)
             {
                 return;
             }
-            mDirtyFlag = false;
+            dirtyFlag = false;
 
             PropertyMap tMap = new PropertyMap();
             PropertyValue animatiedImage = new PropertyValue((int)Visual.Type.AnimatedImage);
             tMap.Insert(Visual.Property.Type, animatiedImage);
-            if (mResourceURLs?.Count != 0)
+            if (resourceURLs?.Count != 0)
             {
-                PropertyArray mArray = new PropertyArray();
+                PropertyArray indexPropertyArray = new PropertyArray();
                 PropertyArray returnedArr = new PropertyArray();
                 PropertyValue index = new PropertyValue();
-                foreach (var iter in mResourceURLs)
+                foreach (var iter in resourceURLs)
                 {
                     index = new PropertyValue(iter);
-                    returnedArr = mArray.Add(index);
+                    returnedArr = indexPropertyArray.Add(index);
                 }
                 index.Dispose();
                 returnedArr.Dispose();
-                PropertyValue array = new PropertyValue(mArray);
-                tMap.Insert(ImageVisualProperty.URL, array);
-                PropertyValue batchSize = new PropertyValue(mBatchSize);
-                tMap.Insert(ImageVisualProperty.BatchSize, batchSize);
-                PropertyValue cacheSize = new PropertyValue(mCacheSize);
-                tMap.Insert(ImageVisualProperty.CacheSize, cacheSize);
-                PropertyValue frameDelay = new PropertyValue(mFrameDelay);
-                tMap.Insert(ImageVisualProperty.FrameDelay, frameDelay);
-                PropertyValue loopCount = new PropertyValue(mLoopCount);
-                tMap.Insert(ImageVisualProperty.LoopCount, loopCount);
-
-                loopCount.Dispose();
-                frameDelay.Dispose();
-                cacheSize.Dispose();
-                batchSize.Dispose();
-                mArray.Dispose();
-                array.Dispose();
+                PropertyValue arrayProperty = new PropertyValue(indexPropertyArray);
+                tMap.Insert(ImageVisualProperty.URL, arrayProperty);
+                PropertyValue frameDelayProperty = new PropertyValue(frameDelay);
+                tMap.Insert(ImageVisualProperty.FrameDelay, frameDelayProperty);
+
+                arrayProperty.Dispose();
+                indexPropertyArray.Dispose();
+                frameDelayProperty.Dispose();
             }
             else
             {
-                PropertyValue url = new PropertyValue(mUrl);
-                tMap.Insert(ImageVisualProperty.URL, url);
-                url.Dispose();
+                PropertyValue urlProperty = new PropertyValue(url);
+                tMap.Insert(ImageVisualProperty.URL, urlProperty);
+                urlProperty.Dispose();
             }
 
-            mMap = tMap;
-            PropertyValue map = new PropertyValue(mMap);
-            SetProperty(ImageView.Property.IMAGE, map);
-            map.Dispose();
+            PropertyValue batchSizeProperty = new PropertyValue(batchSize);
+            tMap.Insert(ImageVisualProperty.BatchSize, batchSizeProperty);
+            PropertyValue cacheSizeProperty = new PropertyValue(cacheSize);
+            tMap.Insert(ImageVisualProperty.CacheSize, cacheSizeProperty);
+            PropertyValue loopCountProperty = new PropertyValue(loopCount);
+            tMap.Insert(ImageVisualProperty.LoopCount, loopCountProperty);
+            PropertyValue stopBehaviorProperty = new PropertyValue((int)stopBehavior);
+            tMap.Insert(ImageVisualProperty.StopBehavior, stopBehaviorProperty);
+
+            loopCountProperty.Dispose();
+            cacheSizeProperty.Dispose();
+            batchSizeProperty.Dispose();
+            stopBehaviorProperty.Dispose();
+
+            propertyMap = tMap;
+            PropertyValue mapProperty = new PropertyValue(propertyMap);
+            SetProperty(ImageView.Property.IMAGE, mapProperty);
+            mapProperty.Dispose();
 
             tMap.Dispose();
             animatiedImage.Dispose();
@@ -276,6 +355,37 @@ namespace Tizen.NUI.BaseComponents
 
 
         #region Event, Enum, Struct, ETC
+
+        /// <summary>
+        /// Enumeration for what to do when the animation is stopped.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum StopBehaviorType
+        {
+            /// <summary>
+            /// When the animation is stopped, the current frame is shown.
+            /// </summary>
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            CurrentFrame,
+            /// <summary>
+            /// When the animation is stopped, the min frame (first frame) is shown.
+            /// </summary>
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            MinimumFrame,
+            /// <summary>
+            /// When the animation is stopped, the max frame (last frame) is shown.
+            /// </summary>
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            MaximumFrame
+        }
+
+        private enum ActionType
+        {
+            play,
+            pause,
+            stop,
+            jumpTo,
+        };
         #endregion Event, Enum, Struct, ETC
 
 
@@ -284,14 +394,15 @@ namespace Tizen.NUI.BaseComponents
 
 
         #region Private
-        string mUrl = "";
-        List<string> mResourceURLs = new List<string>();
-        int mBatchSize = 1;
-        int mCacheSize = 1;
-        int mFrameDelay = 0;
-        int mLoopCount = -1;
-        bool mDirtyFlag = false;
-        PropertyMap mMap;
+        private string url = "";
+        private List<string> resourceURLs = new List<string>();
+        private int batchSize = 1;
+        private int cacheSize = 1;
+        private int frameDelay = 0;
+        private int loopCount = -1;
+        private bool dirtyFlag = false;
+        private StopBehaviorType stopBehavior;
+        private PropertyMap propertyMap;
         #endregion Private
     }
 }
index 07117ca..b269c51 100755 (executable)
@@ -185,7 +185,7 @@ namespace Tizen.NUI.BaseComponents
                 }
 
                 mCurrentFrame = value;
-                AnimationState = AnimationStates.Paused;
+                AnimationState = State.Paused;
 
                 base.SetMinMaxFrame(0, mTotalFrameNum - 1);
                 base.CurrentFrame = mCurrentFrame;
@@ -200,7 +200,7 @@ namespace Tizen.NUI.BaseComponents
         /// </summary>
         // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public RepeatModes RepeatMode
+        public RepeatModeType RepeatMode
         {
             set
             {
@@ -209,10 +209,10 @@ namespace Tizen.NUI.BaseComponents
 
                 switch (mRepeatMode)
                 {
-                    case RepeatModes.Restart:
+                    case RepeatModeType.Restart:
                         LoopingMode = LoopingModeType.Restart;
                         break;
-                    case RepeatModes.Reverse:
+                    case RepeatModeType.Reverse:
                         LoopingMode = LoopingModeType.AutoReverse;
                         break;
                     default:
@@ -230,7 +230,7 @@ namespace Tizen.NUI.BaseComponents
         /// </summary>
         // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public AnimationStates AnimationState
+        public State AnimationState
         {
             private set
             {
@@ -238,11 +238,11 @@ namespace Tizen.NUI.BaseComponents
             }
             get
             {
-                if (CurrentAnimationState == AnimationStates.Playing)
+                if (CurrentAnimationState == State.Playing)
                 {
                     if (PlayState == PlayStateType.Stopped)
                     {
-                        CurrentAnimationState = AnimationStates.Stopped;
+                        CurrentAnimationState = State.Stopped;
                     }
                 }
                 return CurrentAnimationState;
@@ -314,7 +314,7 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// A marker has its start frame and end frame. 
+        /// A marker has its start frame and end frame.
         /// Animation will play between the start frame and the end frame of the marker if one marker is specified.
         /// Or animation will play between the start frame of the first marker and the end frame of the second marker if two markers are specified.   *
         /// </summary>
@@ -367,7 +367,7 @@ namespace Tizen.NUI.BaseComponents
             base.Margin = tmp;
 
             base.Play();
-            AnimationState = AnimationStates.Playing;
+            AnimationState = State.Playing;
 
             tlog.Fatal(tag, $" [{GetId()}] mIsMinMaxSet={mIsMinMaxSet}) ]VAV END]");
         }
@@ -387,7 +387,7 @@ namespace Tizen.NUI.BaseComponents
             }
 
             base.Pause();
-            AnimationState = AnimationStates.Paused;
+            AnimationState = State.Paused;
 
             tlog.Fatal(tag, $" [{GetId()}] ]VAV END]");
         }
@@ -402,7 +402,7 @@ namespace Tizen.NUI.BaseComponents
         /// </param>
         // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public void Stop(EndActions endAction = EndActions.Cancel)
+        public void Stop(EndAction endAction = EndAction.Cancel)
         {
             tlog.Fatal(tag, $"[VAV START[ [{GetId()}] endAction:({endAction}), PlayState={PlayState}");
 
@@ -411,7 +411,7 @@ namespace Tizen.NUI.BaseComponents
                 throw new InvalidOperationException("Resource Url not yet Set");
             }
 
-            if (AnimationState == AnimationStates.Stopped)
+            if (AnimationState == State.Stopped)
             {
                 return;
             }
@@ -421,13 +421,13 @@ namespace Tizen.NUI.BaseComponents
                 mEndAction = endAction;
                 switch (endAction)
                 {
-                    case EndActions.Cancel:
+                    case EndAction.Cancel:
                         StopBehavior = StopBehaviorType.CurrentFrame;
                         break;
-                    case EndActions.Discard:
+                    case EndAction.Discard:
                         StopBehavior = StopBehaviorType.MinimumFrame;
                         break;
-                    case EndActions.StopFinal:
+                    case EndAction.StopFinal:
                         StopBehavior = StopBehaviorType.MaximumFrame;
                         break;
                     default:
@@ -435,11 +435,11 @@ namespace Tizen.NUI.BaseComponents
                         break;
                 }
             }
-            AnimationState = AnimationStates.Stopped;
+            AnimationState = State.Stopped;
 
             base.Stop();
 
-            if (endAction == EndActions.StopFinal)
+            if (endAction == EndAction.StopFinal)
             {
                 switch (mIsMinMaxSet)
                 {
@@ -476,18 +476,39 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// RepeatMode of animation.
         /// </summary>
-        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.RepeatModeType instead!")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public enum RepeatModes
         {
             /// <summary>
-            /// When the animation reaches the end and RepeatCount is nonZero, the animation restarts from the beginning. 
+            /// When the animation reaches the end and RepeatCount is nonZero, the animation restarts from the beginning.
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.RepeatModeType.Restart instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Restart = LoopingModeType.Restart,
+            /// <summary>
+            /// When the animation reaches the end and RepeatCount nonZero, the animation reverses direction on every animation cycle.
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.RepeatModeType.Reverse instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Reverse = LoopingModeType.AutoReverse
+        }
+
+        /// <summary>
+        /// RepeatMode type of animation.
+        /// </summary>
+        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum RepeatModeType
+        {
+            /// <summary>
+            /// When the animation reaches the end and RepeatCount is nonZero, the animation restarts from the beginning.
             /// </summary>
             // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
             [EditorBrowsable(EditorBrowsableState.Never)]
             Restart = LoopingModeType.Restart,
             /// <summary>
-            /// When the animation reaches the end and RepeatCount nonZero, the animation reverses direction on every animation cycle. 
+            /// When the animation reaches the end and RepeatCount nonZero, the animation reverses direction on every animation cycle.
             /// </summary>
             // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
             [EditorBrowsable(EditorBrowsableState.Never)]
@@ -497,11 +518,32 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// EndActions of animation.
         /// </summary>
-        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.EndAction instead!")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public enum EndActions
         {
             /// <summary> End action is Cancel, Animation Stops at the Current Frame.</summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.EndAction.Cancel instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Cancel = 0,
+            /// <summary>  End action is Discard, Animation Stops at the Min Frame</summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.EndAction.Discard instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Discard = 1,
+            /// <summary> End action is StopFinal, Animation Stops at the Max Frame</summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.EndAction.StopFinal instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            StopFinal = 2
+        }
+
+        /// <summary>
+        /// EndAction of animation.
+        /// </summary>
+        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum EndAction
+        {
+            /// <summary> End action is Cancel, Animation Stops at the Current Frame.</summary>
             // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
             [EditorBrowsable(EditorBrowsableState.Never)]
             Cancel = 0,
@@ -516,13 +558,34 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// AnimationStates of animation.
+        /// AnimationState of animation.
         /// </summary>
-        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.State instead!")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public enum AnimationStates
         {
             /// <summary> The animation has stopped.</summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.State.Stopped instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Stopped = PlayStateType.Stopped,
+            /// <summary> The animation is playing.</summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.State.Playing instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Playing = PlayStateType.Playing,
+            /// <summary> The animation is paused.</summary>
+            [Obsolete("Please do not use! This will be removed. Please use AnimatedVectorImageView.State.Paused instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Paused = PlayStateType.Paused
+        }
+
+        /// <summary>
+        /// Animation State of animation.
+        /// </summary>
+        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum State
+        {
+            /// <summary> The animation has stopped.</summary>
             // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
             [EditorBrowsable(EditorBrowsableState.Never)]
             Stopped = PlayStateType.Stopped,
@@ -546,11 +609,11 @@ namespace Tizen.NUI.BaseComponents
         private string mResourceURL = null;
         private int mRepeatCount = 0;
         private int mTotalFrameNum = 0;
-        private RepeatModes mRepeatMode = RepeatModes.Restart;
+        private RepeatModeType mRepeatMode = RepeatModeType.Restart;
         private int mMinFrame = -1, mMaxFrame = -1;
         private minMaxSetTypes mIsMinMaxSet = minMaxSetTypes.NotSetByUser;
         private int mCurrentFrame = -1;
-        private EndActions mEndAction = EndActions.Cancel;
+        private EndAction mEndAction = EndAction.Cancel;
         private enum minMaxSetTypes
         {
             NotSetByUser,
@@ -560,7 +623,7 @@ namespace Tizen.NUI.BaseComponents
         }
 
         private string tag = "NUITEST";
-        private AnimationStates CurrentAnimationState = AnimationStates.Stopped;
+        private State CurrentAnimationState = State.Stopped;
         #endregion Private
     }
 }
index 6d245a6..bce42a6 100755 (executable)
@@ -237,30 +237,24 @@ namespace Tizen.NUI.BaseComponents
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_scrollableStartedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_scrollableStartedEventHandler == null)
-                    {
-                        _scrollableStartedEventHandler += value;
-
-                        _scrollableStartedCallbackDelegate = new StartedCallbackDelegate(OnStarted);
-                        this.ScrollStartedSignal().Connect(_scrollableStartedCallbackDelegate);
-                    }
+                    _scrollableStartedEventHandler += value;
+
+                    _scrollableStartedCallbackDelegate = new StartedCallbackDelegate(OnStarted);
+                    this.ScrollStartedSignal().Connect(_scrollableStartedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_scrollableStartedEventHandler != null)
                 {
-                    if (_scrollableStartedEventHandler != null)
-                    {
-                        this.ScrollStartedSignal().Disconnect(_scrollableStartedCallbackDelegate);
-                    }
-
-                    _scrollableStartedEventHandler -= value;
+                    this.ScrollStartedSignal().Disconnect(_scrollableStartedCallbackDelegate);
                 }
+
+                _scrollableStartedEventHandler -= value;
             }
         }
 
@@ -272,30 +266,24 @@ namespace Tizen.NUI.BaseComponents
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_scrollableUpdatedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_scrollableUpdatedEventHandler == null)
-                    {
-                        _scrollableUpdatedEventHandler += value;
-
-                        _scrollableUpdatedCallbackDelegate = new UpdatedCallbackDelegate(OnUpdated);
-                        this.ScrollUpdatedSignal().Connect(_scrollableUpdatedCallbackDelegate);
-                    }
+                    _scrollableUpdatedEventHandler += value;
+
+                    _scrollableUpdatedCallbackDelegate = new UpdatedCallbackDelegate(OnUpdated);
+                    this.ScrollUpdatedSignal().Connect(_scrollableUpdatedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_scrollableUpdatedEventHandler != null)
                 {
-                    if (_scrollableUpdatedEventHandler != null)
-                    {
-                        this.ScrollUpdatedSignal().Disconnect(_scrollableUpdatedCallbackDelegate);
-                    }
-
-                    _scrollableUpdatedEventHandler -= value;
+                    this.ScrollUpdatedSignal().Disconnect(_scrollableUpdatedCallbackDelegate);
                 }
+
+                _scrollableUpdatedEventHandler -= value;
             }
         }
 
@@ -308,30 +296,24 @@ namespace Tizen.NUI.BaseComponents
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_scrollableCompletedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_scrollableCompletedEventHandler == null)
-                    {
-                        _scrollableCompletedEventHandler += value;
-
-                        _scrollableCompletedCallbackDelegate = new CompletedCallbackDelegate(OnCompleted);
-                        this.ScrollCompletedSignal().Connect(_scrollableCompletedCallbackDelegate);
-                    }
+                    _scrollableCompletedEventHandler += value;
+
+                    _scrollableCompletedCallbackDelegate = new CompletedCallbackDelegate(OnCompleted);
+                    this.ScrollCompletedSignal().Connect(_scrollableCompletedCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_scrollableCompletedEventHandler != null)
                 {
-                    if (_scrollableCompletedEventHandler != null)
-                    {
-                        this.ScrollCompletedSignal().Disconnect(_scrollableCompletedCallbackDelegate);
-                    }
-
-                    _scrollableCompletedEventHandler -= value;
+                    this.ScrollCompletedSignal().Disconnect(_scrollableCompletedCallbackDelegate);
                 }
+
+                _scrollableCompletedEventHandler -= value;
             }
         }
 
index 068967a..b91d0b8 100755 (executable)
@@ -15,6 +15,7 @@
  *
  */
 
+using System;
 using System.ComponentModel;
 using Tizen.NUI.BaseComponents;
 
@@ -23,65 +24,50 @@ namespace Tizen.NUI.Components
     /// <summary>
     /// Enumeration for describing the states of the view.
     /// </summary>
-    /// <since_tizen> 6 </since_tizen>
-    /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
+    [FlagsAttribute]
+    // Please remove this enum when 'Tizen.NUI.BaseComponents.Button.StateChangedEventArgs' and 'Tizen.NUI.BaseComponents.Slider.StateChangedArgs' are removed.
+    [Obsolete("This will be removed in API10. Please use Tizen.NUI.BaseComponents.ControlState instead!")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public enum ControlStates
     {
         /// <summary>
         /// The normal state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Normal = 0,
         /// <summary>
         /// The focused state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Focused = 1,
         /// <summary>
         /// The disabled state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Disabled = 2,
         /// <summary>
         /// The Selected state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Selected = 4,
         /// <summary>
         /// The Pressed state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Pressed = 8,
         /// <summary>
         /// The DisabledFocused state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         DisabledFocused = Disabled | Focused,
         /// <summary>
         /// The SelectedFocused state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         SelectedFocused = Focused | Selected,
         /// <summary>
         /// The DisabledSelected state.
         /// </summary>
-        /// <since_tizen> 6 </since_tizen>
-        /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         DisabledSelected = Disabled | Selected,
     }
index 2a372b1..01fbc36 100755 (executable)
@@ -139,43 +139,40 @@ namespace Tizen.NUI.BaseComponents
         public static readonly BindableProperty BackgroundImageProperty = BindableProperty.Create(nameof(BackgroundImage), typeof(string), typeof(View), default(string), propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) =>
         {
             var view = (View)bindable;
-            if (newValue != null)
-            {
-                string url = (string)newValue;
-
-                if (string.IsNullOrEmpty(url))
-                {
-                    // Clear background
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue());
-                    return;
-                }
+            string url = (string)newValue;
 
-                if (view.backgroundExtraData == null)
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue(url));
-                    view.BackgroundImageSynchronosLoading = view.backgroundImageSynchronosLoading;
+            if (string.IsNullOrEmpty(url))
+            {
+                // Clear background
+                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue());
+                return;
+            }
 
-                    return;
-                }
+            if (view.backgroundExtraData == null)
+            {
+                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue(url));
+                view.BackgroundImageSynchronosLoading = view.backgroundImageSynchronosLoading;
 
-                PropertyMap map = new PropertyMap();
+                return;
+            }
 
-                map.Add(ImageVisualProperty.URL, new PropertyValue(url))
-                   .Add(Visual.Property.CornerRadius, new PropertyValue(view.backgroundExtraData.CornerRadius))
-                   .Add(ImageVisualProperty.SynchronousLoading, new PropertyValue(view.backgroundImageSynchronosLoading));
+            PropertyMap map = new PropertyMap();
 
-                if (view.backgroundExtraData.BackgroundImageBorder != null)
-                {
-                    map.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.NPatch))
-                       .Add(NpatchImageVisualProperty.Border, new PropertyValue(view.backgroundExtraData.BackgroundImageBorder));
-                }
-                else
-                {
-                    map.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
-                }
+            map.Add(ImageVisualProperty.URL, new PropertyValue(url))
+               .Add(Visual.Property.CornerRadius, new PropertyValue(view.backgroundExtraData.CornerRadius))
+               .Add(ImageVisualProperty.SynchronousLoading, new PropertyValue(view.backgroundImageSynchronosLoading));
 
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue(map));
+            if (view.backgroundExtraData.BackgroundImageBorder != null)
+            {
+                map.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.NPatch))
+                   .Add(NpatchImageVisualProperty.Border, new PropertyValue(view.backgroundExtraData.BackgroundImageBorder));
             }
+            else
+            {
+                map.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
+            }
+
+            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue(map));
         }),
         defaultValueCreator: (bindable) =>
         {
index d88ae96..2668007 100755 (executable)
@@ -76,6 +76,7 @@ namespace Tizen.NUI.BaseComponents
         /// Enumeration for describing the states of the view.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
         public enum States
         {
             /// <summary>
index 337ec8b..13a5915 100755 (executable)
@@ -21,6 +21,7 @@ namespace Tizen.NUI
     /// The Direction Bias type.
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1712: Do not prefix enum values with type name")]
     public enum DirectionBias
     {
         /// <summary>
index 4a83d70..fc2cb64 100755 (executable)
@@ -600,23 +600,20 @@ namespace Tizen.NUI
                 }
                 else
                 {
-                    if (Owner.Position != null)
+                    if (independent)
                     {
-                        if(independent)
-                        {
-                            // If height or width specification is not explicitly defined,
-                            // the size of the owner view must be reset even the ExcludeLayouting is true.
-                            if (Owner.HeightSpecification < 0 || Owner.WidthSpecification < 0)
-                            {
-                                Owner.SetSize(right - left, bottom - top);
-                            }
-                        }
-                        else
+                        // If height or width specification is not explicitly defined,
+                        // the size of the owner view must be reset even the ExcludeLayouting is true.
+                        if (Owner.HeightSpecification < 0 || Owner.WidthSpecification < 0)
                         {
                             Owner.SetSize(right - left, bottom - top);
-                            Owner.SetPosition(left, top);
                         }
                     }
+                    else
+                    {
+                        Owner.SetSize(right - left, bottom - top);
+                        Owner.SetPosition(left, top);
+                    }
                 }
 
                 // Reset condition for animation ready for next transition when required.
index e43d141..f865848 100755 (executable)
@@ -75,6 +75,7 @@ namespace Tizen.NUI
     /// The properties that can be animated.
     /// </summary>
     /// <since_tizen> 6 </since_tizen>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
     public enum AnimatableProperties
     {
         /// <summary>
index 4d20b1a..5a0c2a8 100755 (executable)
@@ -755,6 +755,7 @@ namespace Tizen.NUI
     }
 
     /// <since_tizen> 3 </since_tizen>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names")]
     public enum DisposeTypes
     {
         /// <summary>
index 153814a..a32336e 100755 (executable)
@@ -25,7 +25,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="arg0">A valid handle to the target object.</param>
         /// <param name="propertyIndex">The index of a property.</param>
-        /// <since_tizen> 3 </since_tizen>
         public Property(Animatable arg0, int propertyIndex) : this(Interop.Property.NewProperty(Animatable.getCPtr(arg0), propertyIndex), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -37,7 +36,6 @@ namespace Tizen.NUI
         /// <param name="arg0">A valid handle to the target object.</param>
         /// <param name="propertyIndex">The index of a property.</param>
         /// <param name="componentIndex">Index to a sub component of a property, for use with Vector2, Vector3 and Vector4. -1 for the main property (default is -1).</param>
-        /// <since_tizen> 3 </since_tizen>
         public Property(Animatable arg0, int propertyIndex, int componentIndex) : this(Interop.Property.NewProperty(Animatable.getCPtr(arg0), propertyIndex, componentIndex), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -49,7 +47,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="arg0">A valid handle to the target object.</param>
         /// <param name="propertyName">The property name.</param>
-        /// <since_tizen> 3 </since_tizen>
         public Property(Animatable arg0, string propertyName) : this(Interop.Property.NewProperty(Animatable.getCPtr(arg0), propertyName), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -62,7 +59,6 @@ namespace Tizen.NUI
         /// <param name="arg0">A valid handle to the target object.</param>
         /// <param name="propertyName">The property name.</param>
         /// <param name="componentIndex">Index to a sub component of a property, for use with Vector2, Vector3 and Vector4. -1 for main property (default is -1).</param>
-        /// <since_tizen> 3 </since_tizen>
         public Property(Animatable arg0, string propertyName, int componentIndex) : this(Interop.Property.NewProperty(Animatable.getCPtr(arg0), propertyName, componentIndex), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -75,7 +71,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Gets or sets the index of the property.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         public int propertyIndex
         {
             set
@@ -94,7 +89,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Gets or sets the component index of the property.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         public int componentIndex
         {
             set
index 4853ae2..48eea3e 100755 (executable)
@@ -66,30 +66,24 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_propertyNotificationNotifyEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_propertyNotificationNotifyEventHandler == null)
-                    {
-                        _propertyNotificationNotifyEventHandler += value;
+                    _propertyNotificationNotifyEventHandler += value;
 
-                        _propertyNotificationNotifyEventCallbackDelegate = new NotifyEventCallbackDelegate(OnPropertyNotificationNotify);
-                        this.NotifySignal().Connect(_propertyNotificationNotifyEventCallbackDelegate);
-                    }
+                    _propertyNotificationNotifyEventCallbackDelegate = new NotifyEventCallbackDelegate(OnPropertyNotificationNotify);
+                    this.NotifySignal().Connect(_propertyNotificationNotifyEventCallbackDelegate);
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_propertyNotificationNotifyEventHandler != null)
                 {
-                    if (_propertyNotificationNotifyEventHandler != null)
-                    {
-                        this.NotifySignal().Disconnect(_propertyNotificationNotifyEventCallbackDelegate);
-                    }
-
-                    _propertyNotificationNotifyEventHandler -= value;
+                    this.NotifySignal().Disconnect(_propertyNotificationNotifyEventCallbackDelegate);
                 }
+
+                _propertyNotificationNotifyEventHandler -= value;
             }
         }
 
index f4ce2ad..8c5446d 100755 (executable)
@@ -47,12 +47,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthIndex).Get(out temp);
+                Tizen.NUI.PropertyValue pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthIndex);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthIndex, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthIndex, temp);
+                temp.Dispose();
             }
         }
 
@@ -65,12 +69,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.FaceCullingMode).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.FaceCullingMode);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.FaceCullingMode, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.FaceCullingMode, temp);
+                temp.Dispose();
             }
         }
 
@@ -83,12 +91,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendMode).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendMode);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendMode, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendMode, temp);
+                temp.Dispose();
             }
         }
 
@@ -101,12 +113,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb, temp);
+                temp.Dispose();
             }
         }
 
@@ -119,12 +135,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha, temp);
+                temp.Dispose();
             }
         }
 
@@ -137,12 +157,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb, temp);
+                temp.Dispose();
             }
         }
 
@@ -155,12 +179,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb, temp);
+                temp.Dispose();
             }
         }
 
@@ -173,12 +201,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha, temp);
+                temp.Dispose();
             }
         }
 
@@ -191,12 +223,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha, temp);
+                temp.Dispose();
             }
         }
 
@@ -209,12 +245,16 @@ namespace Tizen.NUI
             get
             {
                 Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendColor).Get(temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendColor);
+                pValue.Get(temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendColor, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendColor, temp);
+                temp.Dispose();
             }
         }
 
@@ -227,12 +267,16 @@ namespace Tizen.NUI
             get
             {
                 bool temp = false;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha, temp);
+                temp.Dispose();
             }
         }
 
@@ -245,12 +289,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst, temp);
+                temp.Dispose();
             }
         }
 
@@ -263,12 +311,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeCount).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeCount);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeCount, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeCount, temp);
+                temp.Dispose();
             }
         }
 
@@ -281,12 +333,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthWriteMode).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthWriteMode);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthWriteMode, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthWriteMode, temp);
+                temp.Dispose();
             }
         }
 
@@ -299,12 +355,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthFunction).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthFunction);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthFunction, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthFunction, temp);
+                temp.Dispose();
             }
         }
 
@@ -317,12 +377,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthTestMode).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthTestMode);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthTestMode, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthTestMode, temp);
+                temp.Dispose();
             }
         }
 
@@ -335,12 +399,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.RenderMode).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.RenderMode);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.RenderMode, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.RenderMode, temp);
+                temp.Dispose();
             }
         }
 
@@ -353,12 +421,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunction).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunction);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunction, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunction, temp);
+                temp.Dispose();
             }
         }
 
@@ -371,12 +443,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask, temp);
+                temp.Dispose();
             }
         }
 
@@ -389,12 +465,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference, temp);
+                temp.Dispose();
             }
         }
 
@@ -407,12 +487,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilMask).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilMask);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilMask, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilMask, temp);
+                temp.Dispose();
             }
         }
 
@@ -425,12 +509,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail, temp);
+                temp.Dispose();
             }
         }
 
@@ -443,12 +531,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail, temp);
+                temp.Dispose();
             }
         }
 
@@ -461,12 +553,16 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass).Get(out temp);
+                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass);
+                pValue.Get(out temp);
+                pValue.Dispose();
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass, new Tizen.NUI.PropertyValue(value));
+                var temp = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass, temp);
+                temp.Dispose();
             }
         }
 
@@ -612,6 +708,18 @@ namespace Tizen.NUI
             /// This will be changed internal API after ACR done. Before ACR, need to be hidden as inhouse API.
             [EditorBrowsable(EditorBrowsableState.Never)]
             public static readonly int ForegroundEffect = Interop.Renderer.RangesForegroundEffectGet();
+
+
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ForegroundEffect instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            [SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "<Pending>")]
+            public static readonly int FOREGROUND_EFFECT = Interop.Renderer.RangesForegroundEffectGet();
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use BackgroundEffect instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            [SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "<Pending>")]
+            public static readonly int BACKGROUND_EFFECT = Interop.Renderer.RangesBackgroundEffectGet();
         }
 
         /// <summary>
index f0855a5..0eb9a7c 100755 (executable)
@@ -17,7 +17,6 @@
 using System;
 using System.ComponentModel;
 using Tizen.NUI.Binding;
-using System;
 
 namespace Tizen.NUI
 {
index dbd016c..8c01fb4 100755 (executable)
@@ -39,8 +39,12 @@ namespace Tizen.NUI
     }
 
     /// <summary>
-    /// Transition animation effect
+    /// Transition animation effect.
+    /// This is normally used to specify transitions for a NUIApplication.
     /// </summary>
+    /// <seealso cref="TransitionOptions.ForwardAnimation" />
+    /// <seealso cref="TransitionOptions.BackwardAnimation" />
+    /// <seealso cref="NUIApplication.TransitionOptions" />
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class TransitionAnimation : IDisposable
     {
index 8a8f069..6c30075 100755 (executable)
@@ -20,6 +20,7 @@ namespace Tizen.NUI
 {
     /// <summary>
     /// This object translates data from a property array of maps into an array of animators.
+    /// This is normally used when animating visuals.
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
     public class TransitionData : BaseHandle
index 9cdedbc..97e5c0f 100755 (executable)
@@ -25,7 +25,9 @@ namespace Tizen.NUI
 {
     /// <summary>
     /// Setting screen transition options.
+    /// This is used to describe the transition of NUIApplication.
     /// </summary>
+    /// <seealso cref="NUIApplication.TransitionOptions" />
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class TransitionOptions : IDisposable
     {
index 304bad3..0aacaa3 100755 (executable)
@@ -46,34 +46,28 @@ namespace Tizen.NUI
         {
             add
             {
-                lock (this)
+                // Restricted to only one listener
+                if (_scrollViewSnapStartedEventHandler == null)
                 {
-                    // Restricted to only one listener
-                    if (_scrollViewSnapStartedEventHandler == null)
-                    {
-                        _scrollViewSnapStartedEventHandler += value;
+                    _scrollViewSnapStartedEventHandler += value;
 
-                        _scrollViewSnapStartedCallbackDelegate = new SnapStartedCallbackDelegate(OnSnapStarted);
-                        ScrollViewSnapStartedSignal snapStarted = this.SnapStartedSignal();
-                        snapStarted?.Connect(_scrollViewSnapStartedCallbackDelegate);
-                        snapStarted?.Dispose();
-                    }
+                    _scrollViewSnapStartedCallbackDelegate = new SnapStartedCallbackDelegate(OnSnapStarted);
+                    ScrollViewSnapStartedSignal snapStarted = this.SnapStartedSignal();
+                    snapStarted?.Connect(_scrollViewSnapStartedCallbackDelegate);
+                    snapStarted?.Dispose();
                 }
             }
 
             remove
             {
-                lock (this)
+                if (_scrollViewSnapStartedEventHandler != null)
                 {
-                    if (_scrollViewSnapStartedEventHandler != null)
-                    {
-                        ScrollViewSnapStartedSignal snapStarted = this.SnapStartedSignal();
-                        snapStarted?.Disconnect(_scrollViewSnapStartedCallbackDelegate);
-                        snapStarted?.Dispose();
-                    }
-
-                    _scrollViewSnapStartedEventHandler -= value;
+                    ScrollViewSnapStartedSignal snapStarted = this.SnapStartedSignal();
+                    snapStarted?.Disconnect(_scrollViewSnapStartedCallbackDelegate);
+                    snapStarted?.Dispose();
                 }
+
+                _scrollViewSnapStartedEventHandler -= value;
             }
         }
 
index c031862..4168c58 100755 (executable)
@@ -83,10 +83,14 @@ namespace Tizen.NUI
         internal ImageShadow(PropertyMap propertyMap) : base(propertyMap)
         {
             Border = noBorder;
-            propertyMap.Find(ImageVisualProperty.Border)?.Get(Border);
+            PropertyValue pValue = propertyMap.Find(ImageVisualProperty.Border);
+            pValue?.Get(Border);
+            pValue?.Dispose();
 
             string url = null;
-            propertyMap.Find(ImageVisualProperty.URL)?.Get(out url);
+            pValue = propertyMap.Find(ImageVisualProperty.URL);
+            pValue?.Get(out url);
+            pValue?.Dispose();
             Url = url;
         }
 
index be4c30e..0ef8581 100755 (executable)
@@ -65,10 +65,14 @@ namespace Tizen.NUI
         internal Shadow(PropertyMap propertyMap) : base(propertyMap)
         {
             Color = noColor;
-            propertyMap.Find(ColorVisualProperty.MixColor)?.Get(Color);
+            PropertyValue pValue = propertyMap.Find(ColorVisualProperty.MixColor);
+            pValue?.Get(Color);
+            pValue?.Dispose();
 
             float blurRadius = 0;
-            propertyMap.Find(ColorVisualProperty.BlurRadius)?.Get(out blurRadius);
+            pValue = propertyMap.Find(ColorVisualProperty.BlurRadius);
+            pValue?.Get(out blurRadius);
+            pValue?.Dispose();
             BlurRadius = blurRadius;
         }
 
index 2af8dae..80b85fb 100755 (executable)
@@ -74,6 +74,8 @@ namespace Tizen.NUI
             {
                 SetTransformMap(transformMap);
             }
+            transformProperty.Dispose();
+            transformMap.Dispose();
         }
 
         /// <summary>
@@ -187,8 +189,10 @@ namespace Tizen.NUI
 
             if (!noOffset.Equals(Offset))
             {
-                transformMap[(int)VisualTransformPropertyType.OffsetPolicy] = new PropertyValue(new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute));
+                var temp = new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute);
+                transformMap[(int)VisualTransformPropertyType.OffsetPolicy] = new PropertyValue(temp);
                 transformMap[(int)VisualTransformPropertyType.Offset] = PropertyValue.CreateWithGuard(Offset);
+                temp.Dispose();
             }
 
             if (!noExtents.Equals(Extents))
@@ -199,7 +203,9 @@ namespace Tizen.NUI
             transformMap[(int)VisualTransformPropertyType.Origin] = new PropertyValue((int)Visual.AlignType.Center);
             transformMap[(int)VisualTransformPropertyType.AnchorPoint] = new PropertyValue((int)Visual.AlignType.Center);
 
-            return new PropertyValue(transformMap);
+            var ret = new PropertyValue(transformMap);
+            transformMap.Dispose();
+            return ret;
         }
 
         private void SetTransformMap(PropertyMap transformMap)
@@ -209,8 +215,12 @@ namespace Tizen.NUI
                 return;
             }
 
-            transformMap.Find((int)VisualTransformPropertyType.Offset)?.Get(Offset);
-            transformMap.Find((int)VisualTransformPropertyType.ExtraSize)?.Get(Extents);
+            PropertyValue temp = transformMap.Find((int)VisualTransformPropertyType.Offset);
+            temp?.Get(Offset);
+            temp?.Dispose();
+            temp = transformMap.Find((int)VisualTransformPropertyType.ExtraSize);
+            temp?.Get(Extents);
+            temp?.Dispose();
         }
     }
 }
index ec18807..82d65c9 100755 (executable)
@@ -451,6 +451,7 @@ namespace Tizen.NUI
         /// This specifies visual properties.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
+       [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716: Identifiers should not match keywords")]
         public struct Property
         {
             /// <summary>
index 7c2f82b..bccc9f5 100755 (executable)
@@ -76,16 +76,16 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected PropertyMap _commonlyUsedMap = null;
 
-        private Vector2 _visualSize = null;
-        private Vector2 _visualOffset = null;
-        private Vector2 _visualOffsetPolicy = null;
-        private Vector2 _visualSizePolicy = null;
-        private Visual.AlignType? _visualOrigin = null;
-        private Visual.AlignType? _visualAnchorPoint = null;
+        private Vector2 visualSize = null;
+        private Vector2 visualOffset = null;
+        private Vector2 visualOffsetPolicy = null;
+        private Vector2 visualSizePolicy = null;
+        private Visual.AlignType? visualOrigin = null;
+        private Visual.AlignType? visualAnchorPoint = null;
 
-        private PropertyMap _visualTransformMap = null;
+        private PropertyMap visualTransformMap = null;
 
-        private int? _depthIndex = null;
+        private int? depthIndex = null;
 
         /// <summary>
         /// Constructor.
@@ -106,14 +106,14 @@ namespace Tizen.NUI
         {
             get
             {
-                return _visualSize ?? (new Size2D(1, 1));
+                return visualSize ?? (new Size2D(1, 1));
             }
             set
             {
-                _visualSize = value;
-                if (_visualSizePolicy == null)
+                visualSize = value;
+                if (visualSizePolicy == null)
                 {
-                    _visualSizePolicy = new Vector2(1.0f, 1.0f);
+                    visualSizePolicy = new Vector2(1.0f, 1.0f);
                 }
                 UpdateVisual();
             }
@@ -130,14 +130,14 @@ namespace Tizen.NUI
         {
             get
             {
-                return _visualOffset ?? (new Vector2(0.0f, 0.0f));
+                return visualOffset ?? (new Vector2(0.0f, 0.0f));
             }
             set
             {
-                _visualOffset = value;
-                if (_visualOffsetPolicy == null)
+                visualOffset = value;
+                if (visualOffsetPolicy == null)
                 {
-                    _visualOffsetPolicy = new Vector2(1.0f, 1.0f);
+                    visualOffsetPolicy = new Vector2(1.0f, 1.0f);
                 }
                 UpdateVisual();
             }
@@ -153,12 +153,12 @@ namespace Tizen.NUI
         {
             get
             {
-                return _visualSize ?? (new RelativeVector2(1.0f, 1.0f));
+                return visualSize ?? (new RelativeVector2(1.0f, 1.0f));
             }
             set
             {
-                _visualSize = value;
-                _visualSizePolicy = new Vector2(0.0f, 0.0f);
+                visualSize = value;
+                visualSizePolicy = new Vector2(0.0f, 0.0f);
                 UpdateVisual();
             }
         }
@@ -173,12 +173,12 @@ namespace Tizen.NUI
         {
             get
             {
-                return _visualOffset ?? (new RelativeVector2(0.0f, 0.0f));
+                return visualOffset ?? (new RelativeVector2(0.0f, 0.0f));
             }
             set
             {
-                _visualOffset = value;
-                _visualOffsetPolicy = new Vector2(0.0f, 0.0f);
+                visualOffset = value;
+                visualOffsetPolicy = new Vector2(0.0f, 0.0f);
                 UpdateVisual();
             }
         }
@@ -194,8 +194,8 @@ namespace Tizen.NUI
         {
             get
             {
-                if (_visualOffsetPolicy != null && _visualOffsetPolicy.X == 1.0f
-                    && _visualOffsetPolicy.Y == 1.0f)
+                if (visualOffsetPolicy != null && visualOffsetPolicy.X == 1.0f
+                    && visualOffsetPolicy.Y == 1.0f)
                 {
                     return VisualTransformPolicyType.Absolute;
                 }
@@ -206,13 +206,13 @@ namespace Tizen.NUI
                 switch (value)
                 {
                     case VisualTransformPolicyType.Relative:
-                        _visualOffsetPolicy = new Vector2(0.0f, 0.0f);
+                        visualOffsetPolicy = new Vector2(0.0f, 0.0f);
                         break;
                     case VisualTransformPolicyType.Absolute:
-                        _visualOffsetPolicy = new Vector2(1.0f, 1.0f);
+                        visualOffsetPolicy = new Vector2(1.0f, 1.0f);
                         break;
                     default:
-                        _visualOffsetPolicy = new Vector2(0.0f, 0.0f);
+                        visualOffsetPolicy = new Vector2(0.0f, 0.0f);
                         break;
                 }
                 UpdateVisual();
@@ -230,7 +230,7 @@ namespace Tizen.NUI
         {
             get
             {
-                if (_visualOffsetPolicy != null && _visualOffsetPolicy.X == 1.0f)
+                if (visualOffsetPolicy != null && visualOffsetPolicy.X == 1.0f)
                 {
                     return VisualTransformPolicyType.Absolute;
                 }
@@ -252,7 +252,7 @@ namespace Tizen.NUI
                         x = 0.0f;
                         break;
                 }
-                _visualOffsetPolicy = new Vector2(x, _visualOffsetPolicy?.Y ?? 0);
+                visualOffsetPolicy = new Vector2(x, visualOffsetPolicy?.Y ?? 0);
 
                 UpdateVisual();
             }
@@ -269,7 +269,7 @@ namespace Tizen.NUI
         {
             get
             {
-                if (_visualOffsetPolicy != null && _visualOffsetPolicy.Y == 1.0f)
+                if (visualOffsetPolicy != null && visualOffsetPolicy.Y == 1.0f)
                 {
                     return VisualTransformPolicyType.Absolute;
                 }
@@ -291,7 +291,7 @@ namespace Tizen.NUI
                         y = 0.0f;
                         break;
                 }
-                _visualOffsetPolicy = new Vector2(_visualOffsetPolicy?.X ?? 0, y);
+                visualOffsetPolicy = new Vector2(visualOffsetPolicy?.X ?? 0, y);
                 UpdateVisual();
             }
         }
@@ -307,8 +307,8 @@ namespace Tizen.NUI
         {
             get
             {
-                if (_visualSizePolicy != null && _visualSizePolicy.X == 1.0f
-                    && _visualSizePolicy.Y == 1.0f)
+                if (visualSizePolicy != null && visualSizePolicy.X == 1.0f
+                    && visualSizePolicy.Y == 1.0f)
                 {
                     return VisualTransformPolicyType.Absolute;
                 }
@@ -319,13 +319,13 @@ namespace Tizen.NUI
                 switch (value)
                 {
                     case VisualTransformPolicyType.Relative:
-                        _visualSizePolicy = new Vector2(0.0f, 0.0f);
+                        visualSizePolicy = new Vector2(0.0f, 0.0f);
                         break;
                     case VisualTransformPolicyType.Absolute:
-                        _visualSizePolicy = new Vector2(1.0f, 1.0f);
+                        visualSizePolicy = new Vector2(1.0f, 1.0f);
                         break;
                     default:
-                        _visualSizePolicy = new Vector2(0.0f, 0.0f);
+                        visualSizePolicy = new Vector2(0.0f, 0.0f);
                         break;
                 }
                 UpdateVisual();
@@ -343,7 +343,7 @@ namespace Tizen.NUI
         {
             get
             {
-                if (_visualSizePolicy != null && _visualSizePolicy.Width == 1.0f)
+                if (visualSizePolicy != null && visualSizePolicy.Width == 1.0f)
                 {
                     return VisualTransformPolicyType.Absolute;
                 }
@@ -365,7 +365,7 @@ namespace Tizen.NUI
                         break;
                 }
 
-                _visualSizePolicy = new Vector2(width, _visualSizePolicy?.Height ?? 0);
+                visualSizePolicy = new Vector2(width, visualSizePolicy?.Height ?? 0);
                 UpdateVisual();
             }
         }
@@ -381,7 +381,7 @@ namespace Tizen.NUI
         {
             get
             {
-                if (_visualSizePolicy != null && _visualSizePolicy.Height == 1.0f)
+                if (visualSizePolicy != null && visualSizePolicy.Height == 1.0f)
                 {
                     return VisualTransformPolicyType.Absolute;
                 }
@@ -403,7 +403,7 @@ namespace Tizen.NUI
                         height = 0.0f;
                         break;
                 }
-                _visualSizePolicy = new Vector2(_visualSizePolicy?.Width ?? 0, height);
+                visualSizePolicy = new Vector2(visualSizePolicy?.Width ?? 0, height);
                 UpdateVisual();
             }
         }
@@ -418,11 +418,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _visualOrigin ?? (Visual.AlignType.Center);
+                return visualOrigin ?? (Visual.AlignType.Center);
             }
             set
             {
-                _visualOrigin = value;
+                visualOrigin = value;
                 UpdateVisual();
             }
         }
@@ -437,11 +437,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _visualAnchorPoint ?? (Visual.AlignType.Center);
+                return visualAnchorPoint ?? (Visual.AlignType.Center);
             }
             set
             {
-                _visualAnchorPoint = value;
+                visualAnchorPoint = value;
                 UpdateVisual();
             }
         }
@@ -456,11 +456,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _depthIndex ?? (0);
+                return depthIndex ?? (0);
             }
             set
             {
-                _depthIndex = value;
+                depthIndex = value;
             }
         }
 
@@ -473,7 +473,7 @@ namespace Tizen.NUI
             get
             {
                 ComposingTransformMap();
-                return _visualTransformMap;
+                return visualTransformMap;
             }
         }
 
@@ -660,27 +660,85 @@ namespace Tizen.NUI
                 _outputVisualMap = new PropertyMap();
             }
 
-            if (_shader != null) { _outputVisualMap.Add(Visual.Property.Shader, new PropertyValue(_shader)); }
-            if (_premultipliedAlpha != null) { _outputVisualMap.Add(Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); }
-            if (_mixColor != null) { _outputVisualMap.Add(Visual.Property.MixColor, new PropertyValue(_mixColor)); }
-            if (_opacity != null) { _outputVisualMap.Add(Visual.Property.Opacity, new PropertyValue((float)_opacity)); }
-            if (_visualFittingMode != null) { _outputVisualMap.Add(Visual.Property.VisualFittingMode, new PropertyValue((int)_visualFittingMode)); }
-            if (cornerRadius != null) { _outputVisualMap.Add(Visual.Property.CornerRadius, new PropertyValue((int)cornerRadius)); }
+            if (_shader != null)
+            {
+                PropertyValue temp = new PropertyValue(_shader);
+                _outputVisualMap.Add(Visual.Property.Shader, temp);
+                temp.Dispose();
+            }
+            if (_premultipliedAlpha != null)
+            {
+                PropertyValue temp = new PropertyValue((bool)_premultipliedAlpha);
+                _outputVisualMap.Add(Visual.Property.PremultipliedAlpha, temp);
+                temp.Dispose();
+            }
+            if (_mixColor != null)
+            {
+                PropertyValue temp = new PropertyValue(_mixColor);
+                _outputVisualMap.Add(Visual.Property.MixColor, temp);
+                temp.Dispose();
+            }
+            if (_opacity != null)
+            {
+                PropertyValue temp = new PropertyValue((float)_opacity);
+                _outputVisualMap.Add(Visual.Property.Opacity, temp);
+                temp.Dispose();
+            }
+            if (_visualFittingMode != null)
+            {
+                PropertyValue temp = new PropertyValue((int)_visualFittingMode);
+                _outputVisualMap.Add(Visual.Property.VisualFittingMode, temp);
+                temp.Dispose();
+            }
+            if (cornerRadius != null)
+            {
+                PropertyValue temp = new PropertyValue((int)cornerRadius);
+                _outputVisualMap.Add(Visual.Property.CornerRadius, temp);
+                temp.Dispose();
+            }
         }
 
         private void ComposingTransformMap()
         {
-            _visualTransformMap = new PropertyMap();
-            if (_visualSize != null) { _visualTransformMap.Add((int)VisualTransformPropertyType.Size, new PropertyValue(_visualSize)); }
-            if (_visualOffset != null) { _visualTransformMap.Add((int)VisualTransformPropertyType.Offset, new PropertyValue(_visualOffset)); }
-            if (_visualOffsetPolicy != null) { _visualTransformMap.Add((int)VisualTransformPropertyType.OffsetPolicy, new PropertyValue(_visualOffsetPolicy)); }
-            if (_visualSizePolicy != null) { _visualTransformMap.Add((int)VisualTransformPropertyType.SizePolicy, new PropertyValue(_visualSizePolicy)); }
-            if (_visualOrigin != null) { _visualTransformMap.Add((int)VisualTransformPropertyType.Origin, new PropertyValue((int)_visualOrigin)); }
-            if (_visualAnchorPoint != null) { _visualTransformMap.Add((int)VisualTransformPropertyType.AnchorPoint, new PropertyValue((int)_visualAnchorPoint)); }
+            visualTransformMap = new PropertyMap();
+            if (visualSize != null)
+            {
+                PropertyValue temp = new PropertyValue(visualSize);
+                visualTransformMap.Add((int)VisualTransformPropertyType.Size, temp);
+                temp.Dispose();
+            }
+            if (visualOffset != null)
+            {
+                PropertyValue temp = new PropertyValue(visualOffset);
+                visualTransformMap.Add((int)VisualTransformPropertyType.Offset, temp);
+                temp.Dispose();
+            }
+            if (visualOffsetPolicy != null)
+            {
+                PropertyValue temp = new PropertyValue(visualOffsetPolicy);
+                visualTransformMap.Add((int)VisualTransformPropertyType.OffsetPolicy, temp);
+                temp.Dispose();
+            }
+            if (visualSizePolicy != null)
+            {
+                PropertyValue temp = new PropertyValue(visualSizePolicy);
+                visualTransformMap.Add((int)VisualTransformPropertyType.SizePolicy, temp);
+                temp.Dispose();
+            }
+            if (visualOrigin != null)
+            {
+                PropertyValue temp = new PropertyValue((int)visualOrigin);
+                visualTransformMap.Add((int)VisualTransformPropertyType.Origin, temp);
+                temp.Dispose();
+            }
+            if (visualAnchorPoint != null)
+            {
+                PropertyValue temp = new PropertyValue((int)visualAnchorPoint);
+                visualTransformMap.Add((int)VisualTransformPropertyType.AnchorPoint, temp);
+                temp.Dispose();
+            }
         }
 
-
-
         [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void Dispose(bool disposing)
         {
@@ -694,11 +752,11 @@ namespace Tizen.NUI
                 _mixColor?.Dispose();
                 _outputVisualMap?.Dispose();
                 _shader?.Dispose();
-                _visualOffset?.Dispose();
-                _visualOffsetPolicy?.Dispose();
-                _visualSize?.Dispose();
-                _visualSizePolicy?.Dispose();
-                _visualTransformMap?.Dispose();
+                visualOffset?.Dispose();
+                visualOffsetPolicy?.Dispose();
+                visualSize?.Dispose();
+                visualSizePolicy?.Dispose();
+                visualTransformMap?.Dispose();
             }
             disposed = true;
         }
index beb8907..f4d2957 100755 (executable)
@@ -165,10 +165,14 @@ namespace Tizen.NUI
             if (_urls != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.AnimatedImage));
+                PropertyValue temp = new PropertyValue((int)Visual.Type.AnimatedImage);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
                 if (_urls.Count == 1)
                 {
-                    _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_urls[0]));
+                    temp = new PropertyValue(_urls[0]);
+                    _outputVisualMap.Add(ImageVisualProperty.URL, temp);
+                    temp.Dispose();
                 }
                 else
                 {
@@ -177,12 +181,35 @@ namespace Tizen.NUI
                     {
                         urlArray.Add(new PropertyValue(url));
                     }
-                    _outputVisualMap.Add(ImageVisualProperty.URL, (new PropertyValue(urlArray)));
+                    temp = new PropertyValue(urlArray);
+                    _outputVisualMap.Add(ImageVisualProperty.URL, temp);
+                    temp.Dispose();
+                    urlArray.Dispose();
+                }
+                if (_batchSize != null)
+                {
+                    temp = new PropertyValue((int)_batchSize);
+                    _outputVisualMap.Add(ImageVisualProperty.BatchSize, temp);
+                    temp.Dispose();
+                }
+                if (_cacheSize != null)
+                {
+                    temp = new PropertyValue((int)_cacheSize);
+                    _outputVisualMap.Add(ImageVisualProperty.CacheSize, temp);
+                    temp.Dispose();
+                }
+                if (_frameDelay != null)
+                {
+                    temp = new PropertyValue((float)_frameDelay);
+                    _outputVisualMap.Add(ImageVisualProperty.FrameDelay, temp);
+                    temp.Dispose();
+                }
+                if (_loopCount != null)
+                {
+                    temp = new PropertyValue((int)_loopCount);
+                    _outputVisualMap.Add(ImageVisualProperty.LoopCount, temp);
+                    temp.Dispose();
                 }
-                if (_batchSize != null) { _outputVisualMap.Add(ImageVisualProperty.BatchSize, new PropertyValue((int)_batchSize)); }
-                if (_cacheSize != null) { _outputVisualMap.Add(ImageVisualProperty.CacheSize, new PropertyValue((int)_cacheSize)); }
-                if (_frameDelay != null) { _outputVisualMap.Add(ImageVisualProperty.FrameDelay, new PropertyValue((float)_frameDelay)); }
-                if (_loopCount != null) { _outputVisualMap.Add(ImageVisualProperty.LoopCount, new PropertyValue((int)_loopCount)); }
                 base.ComposingPropertyMap();
             }
         }
index 7506ae2..b7e3528 100755 (executable)
@@ -141,12 +141,25 @@ namespace Tizen.NUI
             _outputVisualMap = null;
 
             base.ComposingPropertyMap();
+            PropertyValue temp = new PropertyValue((int)Visual.Type.Arc);
+            _outputVisualMap.Add(Visual.Property.Type, temp);
+            temp.Dispose();
 
-            _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Arc));
-            _outputVisualMap.Add(ArcVisualProperty.Thickness, new PropertyValue(Thickness < 0.0f ? 0.0f : Thickness));
-            _outputVisualMap.Add(ArcVisualProperty.StartAngle, new PropertyValue(StartAngle));
-            _outputVisualMap.Add(ArcVisualProperty.SweepAngle, new PropertyValue(SweepAngle));
-            _outputVisualMap.Add(ArcVisualProperty.Cap, new PropertyValue((int)Cap));
+            temp = new PropertyValue(Thickness < 0.0f ? 0.0f : Thickness);
+            _outputVisualMap.Add(ArcVisualProperty.Thickness, temp);
+            temp.Dispose();
+
+            temp = new PropertyValue(StartAngle);
+            _outputVisualMap.Add(ArcVisualProperty.StartAngle, temp);
+            temp.Dispose();
+
+            temp = new PropertyValue(SweepAngle);
+            _outputVisualMap.Add(ArcVisualProperty.SweepAngle, temp);
+            temp.Dispose();
+
+            temp = new PropertyValue((int)Cap);
+            _outputVisualMap.Add(ArcVisualProperty.Cap, temp);
+            temp.Dispose();
         }
 
         #endregion Methods
index 5500f24..25eef6b 100755 (executable)
@@ -23,9 +23,9 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class BorderVisual : VisualMap
     {
-        private Color _color = null;
-        private float? _size = null;
-        private bool? _antiAliasing = null;
+        private Color color = null;
+        private float? size = null;
+        private bool? antiAliasing = null;
 
         /// <summary>
         /// Constructor.
@@ -44,11 +44,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _color;
+                return color;
             }
             set
             {
-                _color = value;
+                color = value;
                 UpdateVisual();
             }
         }
@@ -62,11 +62,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _size ?? (-1.0f);
+                return size ?? (-1.0f);
             }
             set
             {
-                _size = value;
+                size = value;
                 UpdateVisual();
             }
         }
@@ -81,11 +81,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _antiAliasing ?? (false);
+                return antiAliasing ?? (false);
             }
             set
             {
-                _antiAliasing = value;
+                antiAliasing = value;
                 UpdateVisual();
             }
         }
@@ -96,13 +96,27 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_color != null && _size != null)
+            if (color != null && size != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Border));
-                _outputVisualMap.Add(BorderVisualProperty.Size, new PropertyValue((float)_size));
-                _outputVisualMap.Add(BorderVisualProperty.Color, new PropertyValue(_color));
-                if (_antiAliasing != null) { _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, new PropertyValue((bool)_antiAliasing)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Border);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue((float)size);
+                _outputVisualMap.Add(BorderVisualProperty.Size, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(color);
+                _outputVisualMap.Add(BorderVisualProperty.Color, temp);
+                temp.Dispose();
+
+                if (antiAliasing != null)
+                {
+                    temp = new PropertyValue((bool)antiAliasing);
+                    _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }
index bacde98..d2b5883 100755 (executable)
@@ -23,8 +23,8 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class ColorVisual : VisualMap
     {
-        private Color _mixColorForColorVisual = null;
-        private bool? _renderIfTransparent = false;
+        private Color mixColorForColorVisual = null;
+        private bool? renderIfTransparent = false;
 
         /// <summary>
         /// Constructor.
@@ -43,11 +43,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _mixColorForColorVisual;
+                return mixColorForColorVisual;
             }
             set
             {
-                _mixColorForColorVisual = value;
+                mixColorForColorVisual = value;
                 UpdateVisual();
             }
         }
@@ -61,11 +61,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _renderIfTransparent ?? (false);
+                return renderIfTransparent ?? (false);
             }
             set
             {
-                _renderIfTransparent = value;
+                renderIfTransparent = value;
                 UpdateVisual();
             }
         }
@@ -76,7 +76,7 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            Color color = _mixColorForColorVisual ?? _mixColor;
+            Color color = mixColorForColorVisual ?? _mixColor;
 
             if (color != null)
             {
@@ -84,8 +84,13 @@ namespace Tizen.NUI
 
                 base.ComposingPropertyMap();
 
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Color));
-                _outputVisualMap.Add(ColorVisualProperty.MixColor, new PropertyValue(color));
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Color);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(color);
+                _outputVisualMap.Add(ColorVisualProperty.MixColor, temp);
+                temp.Dispose();
             }
             else
             {
index f4537c4..0970529 100755 (executable)
@@ -199,15 +199,62 @@ namespace Tizen.NUI
             if (((_startPosition != null && _endPosition != null) || (_center != null && _radius != null)) && _stopColor != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Gradient));
-                _outputVisualMap.Add(GradientVisualProperty.StopColor, new PropertyValue(_stopColor));
-                if (_startPosition != null) { _outputVisualMap.Add(GradientVisualProperty.StartPosition, new PropertyValue(_startPosition)); }
-                if (_endPosition != null) { _outputVisualMap.Add(GradientVisualProperty.EndPosition, new PropertyValue(_endPosition)); }
-                if (_center != null) { _outputVisualMap.Add(GradientVisualProperty.Center, new PropertyValue(_center)); }
-                if (_radius != null) { _outputVisualMap.Add(GradientVisualProperty.Radius, new PropertyValue((float)_radius)); }
-                if (_stopOffset != null) { _outputVisualMap.Add(GradientVisualProperty.StopOffset, new PropertyValue(_stopOffset)); }
-                if (_units != null) { _outputVisualMap.Add(GradientVisualProperty.Units, new PropertyValue((int)_units)); }
-                if (_spreadMethod != null) { _outputVisualMap.Add(GradientVisualProperty.SpreadMethod, new PropertyValue((int)_spreadMethod)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Gradient);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(_stopColor);
+                _outputVisualMap.Add(GradientVisualProperty.StopColor, temp);
+                temp.Dispose();
+
+                if (_startPosition != null)
+                {
+                    temp = new PropertyValue(_startPosition);
+                    _outputVisualMap.Add(GradientVisualProperty.StartPosition, temp);
+                    temp.Dispose();
+                }
+
+                if (_endPosition != null)
+                {
+                    temp = new PropertyValue(_endPosition);
+                    _outputVisualMap.Add(GradientVisualProperty.EndPosition, temp);
+                    temp.Dispose();
+                }
+
+                if (_center != null)
+                {
+                    temp = new PropertyValue(_center);
+                    _outputVisualMap.Add(GradientVisualProperty.Center, temp);
+                    temp.Dispose();
+                }
+
+                if (_radius != null)
+                {
+                    temp = new PropertyValue((float)_radius);
+                    _outputVisualMap.Add(GradientVisualProperty.Radius, temp);
+                    temp.Dispose();
+                }
+
+                if (_stopOffset != null)
+                {
+                    temp = new PropertyValue(_stopOffset);
+                    _outputVisualMap.Add(GradientVisualProperty.StopOffset, temp);
+                    temp.Dispose();
+                }
+
+                if (_units != null)
+                {
+                    temp = new PropertyValue((int)_units);
+                    _outputVisualMap.Add(GradientVisualProperty.Units, temp);
+                    temp.Dispose();
+                }
+
+                if (_spreadMethod != null)
+                {
+                    temp = new PropertyValue((int)_spreadMethod);
+                    _outputVisualMap.Add(GradientVisualProperty.SpreadMethod, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }
index 8b5043a..be1e741 100755 (executable)
@@ -23,25 +23,25 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class ImageVisual : VisualMap
     {
-        private string _url = null;
-        private string _alphaMaskUrl = null;
-        private string _auxiliaryImageUrl = null;
-        private FittingModeType? _fittingMode = null;
-        private SamplingModeType? _samplingMode = null;
-        private int? _desiredWidth = null;
-        private int? _desiredHeight = null;
-        private bool? _synchronousLoading = false;
-        private bool? _borderOnly = null;
-        private Vector4 _pixelArea = null;
-        private WrapModeType? _wrapModeU = null;
-        private WrapModeType? _wrapModeV = null;
-        private float? _auxiliaryImageAlpha = null;
-        private float? _maskContentScale = null;
-        private bool? _cropToMask = null;
-        private ReleasePolicyType? _releasePolicy = null;
-        private LoadPolicyType? _loadPolicy = null;
-        private bool? _orientationCorrection = true;
-        private bool? _atlasing = false;
+        private string url = null;
+        private string alphaMaskUrl = null;
+        private string auxiliaryImageUrl = null;
+        private FittingModeType? fittingMode = null;
+        private SamplingModeType? samplingMode = null;
+        private int? desiredWidth = null;
+        private int? desiredHeight = null;
+        private bool? synchronousLoading = false;
+        private bool? borderOnly = null;
+        private Vector4 pixelArea = null;
+        private WrapModeType? wrapModeU = null;
+        private WrapModeType? wrapModeV = null;
+        private float? auxiliaryImageAlpha = null;
+        private float? maskContentScale = null;
+        private bool? cropToMask = null;
+        private ReleasePolicyType? releasePolicy = null;
+        private LoadPolicyType? loadPolicy = null;
+        private bool? orientationCorrection = true;
+        private bool? atlasing = false;
 
         /// <summary>
         /// Constructor.
@@ -60,11 +60,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _url;
+                return url;
             }
             set
             {
-                _url = (value == null ? "" : value);
+                url = (value == null ? "" : value);
                 UpdateVisual();
             }
         }
@@ -79,11 +79,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _alphaMaskUrl;
+                return alphaMaskUrl;
             }
             set
             {
-                _alphaMaskUrl = value;
+                alphaMaskUrl = value;
                 UpdateVisual();
             }
         }
@@ -97,11 +97,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _auxiliaryImageUrl;
+                return auxiliaryImageUrl;
             }
             set
             {
-                _auxiliaryImageUrl = value;
+                auxiliaryImageUrl = value;
                 UpdateVisual();
             }
         }
@@ -117,11 +117,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _fittingMode ?? (FittingModeType.ShrinkToFit);
+                return fittingMode ?? (FittingModeType.ShrinkToFit);
             }
             set
             {
-                _fittingMode = value;
+                fittingMode = value;
                 UpdateVisual();
             }
         }
@@ -137,11 +137,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _samplingMode ?? (SamplingModeType.Box);
+                return samplingMode ?? (SamplingModeType.Box);
             }
             set
             {
-                _samplingMode = value;
+                samplingMode = value;
                 UpdateVisual();
             }
         }
@@ -157,11 +157,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _desiredWidth ?? (-1);
+                return desiredWidth ?? (-1);
             }
             set
             {
-                _desiredWidth = value;
+                desiredWidth = value;
                 UpdateVisual();
             }
         }
@@ -177,11 +177,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _desiredHeight ?? (-1);
+                return desiredHeight ?? (-1);
             }
             set
             {
-                _desiredHeight = value;
+                desiredHeight = value;
                 UpdateVisual();
             }
         }
@@ -197,11 +197,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _synchronousLoading ?? (false);
+                return synchronousLoading ?? (false);
             }
             set
             {
-                _synchronousLoading = value;
+                synchronousLoading = value;
                 UpdateVisual();
             }
         }
@@ -217,11 +217,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _borderOnly ?? (false);
+                return borderOnly ?? (false);
             }
             set
             {
-                _borderOnly = value;
+                borderOnly = value;
                 UpdateVisual();
             }
         }
@@ -239,11 +239,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _pixelArea ?? (new Vector4(0.0f, 0.0f, 1.0f, 1.0f));
+                return pixelArea ?? (new Vector4(0.0f, 0.0f, 1.0f, 1.0f));
             }
             set
             {
-                _pixelArea = value;
+                pixelArea = value;
                 UpdateVisual();
             }
         }
@@ -260,11 +260,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _wrapModeU ?? (WrapModeType.Default);
+                return wrapModeU ?? (WrapModeType.Default);
             }
             set
             {
-                _wrapModeU = value;
+                wrapModeU = value;
                 UpdateVisual();
             }
         }
@@ -282,11 +282,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _wrapModeV ?? (WrapModeType.Default);
+                return wrapModeV ?? (WrapModeType.Default);
             }
             set
             {
-                _wrapModeV = value;
+                wrapModeV = value;
                 UpdateVisual();
             }
         }
@@ -299,11 +299,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _maskContentScale ?? 1.0f;
+                return maskContentScale ?? 1.0f;
             }
             set
             {
-                _maskContentScale = value;
+                maskContentScale = value;
                 UpdateVisual();
             }
         }
@@ -316,11 +316,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _cropToMask ?? false;
+                return cropToMask ?? false;
             }
             set
             {
-                _cropToMask = value;
+                cropToMask = value;
                 UpdateVisual();
             }
         }
@@ -333,11 +333,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _auxiliaryImageAlpha ?? 1.0f;
+                return auxiliaryImageAlpha ?? 1.0f;
             }
             set
             {
-                _auxiliaryImageAlpha = value;
+                auxiliaryImageAlpha = value;
                 UpdateVisual();
             }
         }
@@ -351,11 +351,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _releasePolicy ?? (ReleasePolicyType.Destroyed);
+                return releasePolicy ?? (ReleasePolicyType.Destroyed);
             }
             set
             {
-                _releasePolicy = value;
+                releasePolicy = value;
                 UpdateVisual();
             }
         }
@@ -370,11 +370,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _loadPolicy ?? (LoadPolicyType.Attached);
+                return loadPolicy ?? (LoadPolicyType.Attached);
             }
             set
             {
-                _loadPolicy = value;
+                loadPolicy = value;
                 UpdateVisual();
             }
         }
@@ -390,11 +390,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _orientationCorrection ?? (true);
+                return orientationCorrection ?? (true);
             }
             set
             {
-                _orientationCorrection = value;
+                orientationCorrection = value;
                 UpdateVisual();
             }
         }
@@ -408,11 +408,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _atlasing ?? (false);
+                return atlasing ?? (false);
             }
             set
             {
-                _atlasing = value;
+                atlasing = value;
                 UpdateVisual();
             }
         }
@@ -423,29 +423,142 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_url != null)
+            if (url != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
-                _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url));
-                if (_alphaMaskUrl != null) { _outputVisualMap.Add(ImageVisualProperty.AlphaMaskURL, new PropertyValue(_alphaMaskUrl)); }
-                if (_auxiliaryImageUrl != null) { _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageURL, new PropertyValue(_auxiliaryImageUrl)); }
-                if (_fittingMode != null) { _outputVisualMap.Add(ImageVisualProperty.FittingMode, new PropertyValue((int)_fittingMode)); }
-                if (_samplingMode != null) { _outputVisualMap.Add(ImageVisualProperty.SamplingMode, new PropertyValue((int)_samplingMode)); }
-                if (_desiredWidth != null) { _outputVisualMap.Add(ImageVisualProperty.DesiredWidth, new PropertyValue((int)_desiredWidth)); }
-                if (_desiredHeight != null) { _outputVisualMap.Add(ImageVisualProperty.DesiredHeight, new PropertyValue((int)_desiredHeight)); }
-                if (_synchronousLoading != null) { _outputVisualMap.Add(ImageVisualProperty.SynchronousLoading, new PropertyValue((bool)_synchronousLoading)); }
-                if (_borderOnly != null) { _outputVisualMap.Add(ImageVisualProperty.BorderOnly, new PropertyValue((bool)_borderOnly)); }
-                if (_pixelArea != null) { _outputVisualMap.Add(ImageVisualProperty.PixelArea, new PropertyValue(_pixelArea)); }
-                if (_wrapModeU != null) { _outputVisualMap.Add(ImageVisualProperty.WrapModeU, new PropertyValue((int)_wrapModeU)); }
-                if (_wrapModeV != null) { _outputVisualMap.Add(ImageVisualProperty.WrapModeV, new PropertyValue((int)_wrapModeV)); }
-                if (_maskContentScale != null) { _outputVisualMap.Add(ImageVisualProperty.MaskContentScale, new PropertyValue((float)_maskContentScale)); }
-                if (_cropToMask != null) { _outputVisualMap.Add(ImageVisualProperty.CropToMask, new PropertyValue((bool)_cropToMask)); }
-                if (_auxiliaryImageAlpha != null) { _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageAlpha, new PropertyValue((float)_auxiliaryImageAlpha)); }
-                if (_releasePolicy != null) { _outputVisualMap.Add(ImageVisualProperty.ReleasePolicy, new PropertyValue((int)_releasePolicy)); }
-                if (_loadPolicy != null) { _outputVisualMap.Add(ImageVisualProperty.LoadPolicy, new PropertyValue((int)_loadPolicy)); }
-                if (_orientationCorrection != null) { _outputVisualMap.Add(ImageVisualProperty.OrientationCorrection, new PropertyValue((bool)_orientationCorrection)); }
-                if (_atlasing != null) { _outputVisualMap.Add(ImageVisualProperty.Atlasing, new PropertyValue((bool)_atlasing)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Image);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(url);
+                _outputVisualMap.Add(ImageVisualProperty.URL, temp);
+                temp.Dispose();
+
+                if (alphaMaskUrl != null)
+                {
+                    temp = new PropertyValue(alphaMaskUrl);
+                    _outputVisualMap.Add(ImageVisualProperty.AlphaMaskURL, temp);
+                    temp.Dispose();
+                }
+
+                if (auxiliaryImageUrl != null)
+                {
+                    temp = new PropertyValue(auxiliaryImageUrl);
+                    _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageURL, temp);
+                    temp.Dispose();
+                }
+
+                if (fittingMode != null)
+                {
+                    temp = new PropertyValue((int)fittingMode);
+                    _outputVisualMap.Add(ImageVisualProperty.FittingMode, temp);
+                    temp.Dispose();
+                }
+
+                if (samplingMode != null)
+                {
+                    temp = new PropertyValue((int)samplingMode);
+                    _outputVisualMap.Add(ImageVisualProperty.SamplingMode, temp);
+                    temp.Dispose();
+                }
+
+                if (desiredWidth != null)
+                {
+                    temp = new PropertyValue((int)desiredWidth);
+                    _outputVisualMap.Add(ImageVisualProperty.DesiredWidth, temp);
+                    temp.Dispose();
+                }
+
+                if (desiredHeight != null)
+                {
+                    temp = new PropertyValue((int)desiredHeight);
+                    _outputVisualMap.Add(ImageVisualProperty.DesiredHeight, temp);
+                    temp.Dispose();
+                }
+
+                if (synchronousLoading != null)
+                {
+                    temp = new PropertyValue((bool)synchronousLoading);
+                    _outputVisualMap.Add(ImageVisualProperty.SynchronousLoading, temp);
+                    temp.Dispose();
+                }
+
+                if (borderOnly != null)
+                {
+                    temp = new PropertyValue((bool)borderOnly);
+                    _outputVisualMap.Add(ImageVisualProperty.BorderOnly, temp);
+                    temp.Dispose();
+                }
+
+                if (pixelArea != null)
+                {
+                    temp = new PropertyValue(pixelArea);
+                    _outputVisualMap.Add(ImageVisualProperty.PixelArea, temp);
+                    temp.Dispose();
+                }
+
+                if (wrapModeU != null)
+                {
+                    temp = new PropertyValue((int)wrapModeU);
+                    _outputVisualMap.Add(ImageVisualProperty.WrapModeU, temp);
+                    temp.Dispose();
+                }
+
+                if (wrapModeV != null)
+                {
+                    temp = new PropertyValue((int)wrapModeV);
+                    _outputVisualMap.Add(ImageVisualProperty.WrapModeV, temp);
+                    temp.Dispose();
+                }
+
+                if (maskContentScale != null)
+                {
+                    temp = new PropertyValue((float)maskContentScale);
+                    _outputVisualMap.Add(ImageVisualProperty.MaskContentScale, temp);
+                    temp.Dispose();
+                }
+
+                if (cropToMask != null)
+                {
+                    temp = new PropertyValue((bool)cropToMask);
+                    _outputVisualMap.Add(ImageVisualProperty.CropToMask, temp);
+                    temp.Dispose();
+                }
+
+                if (auxiliaryImageAlpha != null)
+                {
+                    temp = new PropertyValue((float)auxiliaryImageAlpha);
+                    _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageAlpha, temp);
+                    temp.Dispose();
+                }
+
+                if (releasePolicy != null)
+                {
+                    temp = new PropertyValue((int)releasePolicy);
+                    _outputVisualMap.Add(ImageVisualProperty.ReleasePolicy, temp);
+                    temp.Dispose();
+                }
+
+                if (loadPolicy != null)
+                {
+                    temp = new PropertyValue((int)loadPolicy);
+                    _outputVisualMap.Add(ImageVisualProperty.LoadPolicy, temp);
+                    temp.Dispose();
+                }
+
+                if (orientationCorrection != null)
+                {
+                    temp = new PropertyValue((bool)orientationCorrection);
+                    _outputVisualMap.Add(ImageVisualProperty.OrientationCorrection, temp);
+                    temp.Dispose();
+                }
+
+                if (atlasing != null)
+                {
+                    temp = new PropertyValue((bool)atlasing);
+                    _outputVisualMap.Add(ImageVisualProperty.Atlasing, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }
index 51729fd..f19ead1 100755 (executable)
@@ -182,13 +182,44 @@ namespace Tizen.NUI
             if (_objectURL != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Mesh));
-                _outputVisualMap.Add(MeshVisualProperty.ObjectURL, new PropertyValue(_objectURL));
-                if (_materialtURL != null) { _outputVisualMap.Add(MeshVisualProperty.MaterialtURL, new PropertyValue(_materialtURL)); }
-                if (_texturesPath != null) { _outputVisualMap.Add(MeshVisualProperty.TexturesPath, new PropertyValue(_texturesPath)); }
-                if (_shadingMode != null) { _outputVisualMap.Add(MeshVisualProperty.ShadingMode, new PropertyValue((int)_shadingMode)); }
-                if (_useMipmapping != null) { _outputVisualMap.Add(MeshVisualProperty.UseMipmapping, new PropertyValue((bool)_useMipmapping)); }
-                if (_useSoftNormals != null) { _outputVisualMap.Add(MeshVisualProperty.UseSoftNormals, new PropertyValue((bool)_useSoftNormals)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Mesh);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(_objectURL);
+                _outputVisualMap.Add(MeshVisualProperty.ObjectURL, temp);
+                temp.Dispose();
+
+                if (_materialtURL != null)
+                {
+                    temp = new PropertyValue(_materialtURL);
+                    _outputVisualMap.Add(MeshVisualProperty.MaterialtURL, temp);
+                    temp.Dispose();
+                }
+                if (_texturesPath != null)
+                {
+                    temp = new PropertyValue(_texturesPath);
+                    _outputVisualMap.Add(MeshVisualProperty.TexturesPath, temp);
+                    temp.Dispose();
+                }
+                if (_shadingMode != null)
+                {
+                    temp = new PropertyValue((int)_shadingMode);
+                    _outputVisualMap.Add(MeshVisualProperty.ShadingMode, temp);
+                    temp.Dispose();
+                }
+                if (_useMipmapping != null)
+                {
+                    temp = new PropertyValue((bool)_useMipmapping);
+                    _outputVisualMap.Add(MeshVisualProperty.UseMipmapping, temp);
+                    temp.Dispose();
+                }
+                if (_useSoftNormals != null)
+                {
+                    temp = new PropertyValue((bool)_useSoftNormals);
+                    _outputVisualMap.Add(MeshVisualProperty.UseSoftNormals, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }
index f8df131..b06f9cf 100755 (executable)
@@ -23,9 +23,9 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class NPatchVisual : VisualMap
     {
-        private string _url = null;
-        private bool? _borderOnly = null;
-        private Rectangle _border = null;
+        private string url = null;
+        private bool? borderOnly = null;
+        private Rectangle border = null;
 
         /// <summary>
         /// Constructor.
@@ -44,11 +44,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _url;
+                return url;
             }
             set
             {
-                _url = value;
+                url = value;
                 UpdateVisual();
             }
         }
@@ -64,11 +64,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _borderOnly ?? false;
+                return borderOnly ?? false;
             }
             set
             {
-                _borderOnly = value;
+                borderOnly = value;
                 UpdateVisual();
             }
         }
@@ -83,11 +83,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _border;
+                return border;
             }
             set
             {
-                _border = value;
+                border = value;
                 UpdateVisual();
             }
         }
@@ -98,13 +98,30 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_url != null)
+            if (url != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.NPatch));
-                _outputVisualMap.Add(NpatchImageVisualProperty.URL, new PropertyValue(_url));
-                if (_borderOnly != null) { _outputVisualMap.Add(NpatchImageVisualProperty.BorderOnly, new PropertyValue((bool)_borderOnly)); }
-                if (_border != null) { _outputVisualMap.Add(NpatchImageVisualProperty.Border, new PropertyValue(_border)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.NPatch);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(url);
+                _outputVisualMap.Add(NpatchImageVisualProperty.URL, temp);
+                temp.Dispose();
+
+                if (borderOnly != null)
+                {
+                    temp = new PropertyValue((bool)borderOnly);
+                    _outputVisualMap.Add(NpatchImageVisualProperty.BorderOnly, temp);
+                    temp.Dispose();
+                }
+
+                if (border != null)
+                {
+                    temp = new PropertyValue(border);
+                    _outputVisualMap.Add(NpatchImageVisualProperty.Border, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }
index 959545d..48c08a5 100755 (executable)
@@ -311,20 +311,94 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            _outputVisualMap = new PropertyMap(); ;
-            _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Primitive));
-            if (_shape != null) { _outputVisualMap.Add(PrimitiveVisualProperty.Shape, new PropertyValue((int)_shape)); }
-            if (_mixColorForPrimitiveVisual != null) { _outputVisualMap.Add(PrimitiveVisualProperty.MixColor, new PropertyValue(_mixColorForPrimitiveVisual)); }
-            if (_slices != null) { _outputVisualMap.Add(PrimitiveVisualProperty.Slices, new PropertyValue((int)_slices)); }
-            if (_stacks != null) { _outputVisualMap.Add(PrimitiveVisualProperty.Stacks, new PropertyValue((int)_stacks)); }
-            if (_scaleTopRadius != null) { _outputVisualMap.Add(PrimitiveVisualProperty.ScaleTopRadius, new PropertyValue((float)_scaleTopRadius)); }
-            if (_scaleBottomRadius != null) { _outputVisualMap.Add(PrimitiveVisualProperty.ScaleBottomRadius, new PropertyValue((float)_scaleBottomRadius)); }
-            if (_scaleHeight != null) { _outputVisualMap.Add(PrimitiveVisualProperty.ScaleHeight, new PropertyValue((float)_scaleHeight)); }
-            if (_scaleRadius != null) { _outputVisualMap.Add(PrimitiveVisualProperty.ScaleRadius, new PropertyValue((float)_scaleRadius)); }
-            if (_scaleDimensions != null) { _outputVisualMap.Add(PrimitiveVisualProperty.ScaleDimensions, new PropertyValue(_scaleDimensions)); }
-            if (_bevelPercentage != null) { _outputVisualMap.Add(PrimitiveVisualProperty.BevelPercentage, new PropertyValue((float)_bevelPercentage)); }
-            if (_bevelSmoothness != null) { _outputVisualMap.Add(PrimitiveVisualProperty.BevelSmoothness, new PropertyValue((float)_bevelSmoothness)); }
-            if (_lightPosition != null) { _outputVisualMap.Add(PrimitiveVisualProperty.LightPosition, new PropertyValue(_lightPosition)); }
+            _outputVisualMap = new PropertyMap();
+            PropertyValue temp = new PropertyValue((int)Visual.Type.Primitive);
+            _outputVisualMap.Add(Visual.Property.Type, temp);
+            temp.Dispose();
+
+            if (_shape != null)
+            {
+                temp = new PropertyValue((int)_shape);
+                _outputVisualMap.Add(PrimitiveVisualProperty.Shape, temp);
+                temp.Dispose();
+            }
+
+            if (_mixColorForPrimitiveVisual != null)
+            {
+                temp = new PropertyValue(_mixColorForPrimitiveVisual);
+                _outputVisualMap.Add(PrimitiveVisualProperty.MixColor, temp);
+                temp.Dispose();
+            }
+
+            if (_slices != null)
+            {
+                temp = new PropertyValue((int)_slices);
+                _outputVisualMap.Add(PrimitiveVisualProperty.Slices, temp);
+                temp.Dispose();
+            }
+
+            if (_stacks != null)
+            {
+                temp = new PropertyValue((int)_stacks);
+                _outputVisualMap.Add(PrimitiveVisualProperty.Stacks, temp);
+                temp.Dispose();
+            }
+
+            if (_scaleTopRadius != null)
+            {
+                temp = new PropertyValue((float)_scaleTopRadius);
+                _outputVisualMap.Add(PrimitiveVisualProperty.ScaleTopRadius, temp);
+                temp.Dispose();
+            }
+
+            if (_scaleBottomRadius != null)
+            {
+                temp = new PropertyValue((float)_scaleBottomRadius);
+                _outputVisualMap.Add(PrimitiveVisualProperty.ScaleBottomRadius, temp);
+                temp.Dispose();
+            }
+
+            if (_scaleHeight != null)
+            {
+                temp = new PropertyValue((float)_scaleHeight);
+                _outputVisualMap.Add(PrimitiveVisualProperty.ScaleHeight, temp);
+                temp.Dispose();
+            }
+
+            if (_scaleRadius != null)
+            {
+                temp = new PropertyValue((float)_scaleRadius);
+                _outputVisualMap.Add(PrimitiveVisualProperty.ScaleRadius, temp);
+                temp.Dispose();
+            }
+
+            if (_scaleDimensions != null)
+            {
+                temp = new PropertyValue(_scaleDimensions);
+                _outputVisualMap.Add(PrimitiveVisualProperty.ScaleDimensions, temp);
+                temp.Dispose();
+            }
+
+            if (_bevelPercentage != null)
+            {
+                temp = new PropertyValue((float)_bevelPercentage);
+                _outputVisualMap.Add(PrimitiveVisualProperty.BevelPercentage, temp);
+                temp.Dispose();
+            }
+
+            if (_bevelSmoothness != null)
+            {
+                temp = new PropertyValue((float)_bevelSmoothness);
+                _outputVisualMap.Add(PrimitiveVisualProperty.BevelSmoothness, temp);
+                temp.Dispose();
+            }
+
+            if (_lightPosition != null)
+            {
+                temp = new PropertyValue(_lightPosition);
+                _outputVisualMap.Add(PrimitiveVisualProperty.LightPosition, temp);
+                temp.Dispose();
+            }
             base.ComposingPropertyMap();
         }
     }
index 4c071e0..c951cad 100755 (executable)
@@ -23,7 +23,7 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class SVGVisual : VisualMap
     {
-        private string _url = null;
+        private string url = null;
 
         /// <summary>
         /// Constructor.
@@ -41,11 +41,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _url;
+                return url;
             }
             set
             {
-                _url = value;
+                url = value;
                 UpdateVisual();
             }
         }
@@ -56,11 +56,15 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_url != null)
+            if (url != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.SVG));
-                _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url));
+                PropertyValue temp = new PropertyValue((int)Visual.Type.SVG);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+                temp = new PropertyValue(url);
+                _outputVisualMap.Add(ImageVisualProperty.URL, temp);
+                temp.Dispose();
                 base.ComposingPropertyMap();
             }
         }
index f5d26fd..b224299 100755 (executable)
@@ -24,19 +24,19 @@ namespace Tizen.NUI
     public class TextVisual : VisualMap
     {
         static private float defaultPointSize = 18;
-        private string _text = null;
-        private string _fontFamily = null;
-        private PropertyMap _fontStyle = null;
-        private float _pointSize = defaultPointSize;
-        private bool? _multiLine = null;
-        private string _horizontalAlignment = null;
-        private string _verticalAlignment = null;
-        private Color _textColor = null;
-        private bool? _enableMarkup = null;
-        private PropertyMap _shadow = null;
-        private PropertyMap _underline = null;
-        private PropertyMap _outline = null;
-        private PropertyMap _background = null;
+        private string text = null;
+        private string fontFamily = null;
+        private PropertyMap fontStyle = null;
+        private float pointSize = defaultPointSize;
+        private bool? multiLine = null;
+        private string horizontalAlignment = null;
+        private string verticalAlignment = null;
+        private Color textColor = null;
+        private bool? enableMarkup = null;
+        private PropertyMap shadow = null;
+        private PropertyMap underline = null;
+        private PropertyMap outline = null;
+        private PropertyMap background = null;
 
         /// <summary>
         /// Constructor.
@@ -55,11 +55,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _text;
+                return text;
             }
             set
             {
-                _text = value;
+                text = value;
                 UpdateVisual();
             }
         }
@@ -73,11 +73,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _fontFamily;
+                return fontFamily;
             }
             set
             {
-                _fontFamily = value;
+                fontFamily = value;
                 UpdateVisual();
             }
         }
@@ -91,11 +91,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _fontStyle;
+                return fontStyle;
             }
             set
             {
-                _fontStyle = value;
+                fontStyle = value;
                 UpdateVisual();
             }
         }
@@ -109,11 +109,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _pointSize;
+                return pointSize;
             }
             set
             {
-                _pointSize = value;
+                pointSize = value;
                 UpdateVisual();
             }
         }
@@ -128,11 +128,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _multiLine ?? (false);
+                return multiLine ?? (false);
             }
             set
             {
-                _multiLine = value;
+                multiLine = value;
                 UpdateVisual();
             }
         }
@@ -147,7 +147,7 @@ namespace Tizen.NUI
         {
             get
             {
-                switch (_horizontalAlignment)
+                switch (horizontalAlignment)
                 {
                     case "BEGIN":
                         return HorizontalAlignment.Begin;
@@ -165,22 +165,22 @@ namespace Tizen.NUI
                 {
                     case HorizontalAlignment.Begin:
                         {
-                            _horizontalAlignment = "BEGIN";
+                            horizontalAlignment = "BEGIN";
                             break;
                         }
                     case HorizontalAlignment.Center:
                         {
-                            _horizontalAlignment = "CENTER";
+                            horizontalAlignment = "CENTER";
                             break;
                         }
                     case HorizontalAlignment.End:
                         {
-                            _horizontalAlignment = "END";
+                            horizontalAlignment = "END";
                             break;
                         }
                     default:
                         {
-                            _horizontalAlignment = "BEGIN";
+                            horizontalAlignment = "BEGIN";
                             break;
                         }
                 }
@@ -198,7 +198,7 @@ namespace Tizen.NUI
         {
             get
             {
-                switch (_verticalAlignment)
+                switch (verticalAlignment)
                 {
                     case "TOP":
                         return VerticalAlignment.Top;
@@ -216,22 +216,22 @@ namespace Tizen.NUI
                 {
                     case VerticalAlignment.Top:
                         {
-                            _verticalAlignment = "TOP";
+                            verticalAlignment = "TOP";
                             break;
                         }
                     case VerticalAlignment.Center:
                         {
-                            _verticalAlignment = "CENTER";
+                            verticalAlignment = "CENTER";
                             break;
                         }
                     case VerticalAlignment.Bottom:
                         {
-                            _verticalAlignment = "BOTTOM";
+                            verticalAlignment = "BOTTOM";
                             break;
                         }
                     default:
                         {
-                            _verticalAlignment = "TOP";
+                            verticalAlignment = "TOP";
                             break;
                         }
                 }
@@ -248,11 +248,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _textColor;
+                return textColor;
             }
             set
             {
-                _textColor = value;
+                textColor = value;
                 UpdateVisual();
             }
         }
@@ -266,11 +266,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _enableMarkup ?? (false);
+                return enableMarkup ?? (false);
             }
             set
             {
-                _enableMarkup = value;
+                enableMarkup = value;
                 UpdateVisual();
             }
         }
@@ -283,11 +283,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _shadow;
+                return shadow;
             }
             set
             {
-                _shadow = value;
+                shadow = value;
                 UpdateVisual();
             }
         }
@@ -300,11 +300,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _underline;
+                return underline;
             }
             set
             {
-                _underline = value;
+                underline = value;
                 UpdateVisual();
             }
         }
@@ -317,11 +317,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _outline;
+                return outline;
             }
             set
             {
-                _outline = value;
+                outline = value;
                 UpdateVisual();
             }
         }
@@ -334,11 +334,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _background;
+                return background;
             }
             set
             {
-                _background = value;
+                background = value;
                 UpdateVisual();
             }
         }
@@ -351,22 +351,86 @@ namespace Tizen.NUI
         {
             _outputVisualMap = new PropertyMap();
 
-            if (_text != null)
+            if (text != null)
             {
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text));
-                _outputVisualMap.Add(TextVisualProperty.Text, new PropertyValue(_text));
-                _outputVisualMap.Add(TextVisualProperty.PointSize, new PropertyValue((float)_pointSize));
-                if (_fontFamily != null) { _outputVisualMap.Add(TextVisualProperty.FontFamily, new PropertyValue(_fontFamily)); }
-                if (_fontStyle != null) { _outputVisualMap.Add(TextVisualProperty.FontStyle, new PropertyValue(_fontStyle)); }
-                if (_multiLine != null) { _outputVisualMap.Add(TextVisualProperty.MultiLine, new PropertyValue((bool)_multiLine)); }
-                if (_horizontalAlignment != null) { _outputVisualMap.Add(TextVisualProperty.HorizontalAlignment, new PropertyValue(_horizontalAlignment)); }
-                if (_verticalAlignment != null) { _outputVisualMap.Add(TextVisualProperty.VerticalAlignment, new PropertyValue(_verticalAlignment)); }
-                if (_textColor != null) { _outputVisualMap.Add(TextVisualProperty.TextColor, new PropertyValue(_textColor)); }
-                if (_enableMarkup != null) { _outputVisualMap.Add(TextVisualProperty.EnableMarkup, new PropertyValue((bool)_enableMarkup)); }
-                if (_shadow != null) { _outputVisualMap.Add(TextVisualProperty.Shadow, new PropertyValue(_shadow)); }
-                if (_underline != null) { _outputVisualMap.Add(TextVisualProperty.Underline, new PropertyValue(_underline)); }
-                if (_outline != null) { _outputVisualMap.Add(TextVisualProperty.Outline, new PropertyValue(_outline)); }
-                if (_background != null) { _outputVisualMap.Add(TextVisualProperty.Background, new PropertyValue(_background)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Text);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(text);
+                _outputVisualMap.Add(TextVisualProperty.Text, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue((float)pointSize);
+                _outputVisualMap.Add(TextVisualProperty.PointSize, temp);
+                temp.Dispose();
+
+                if (fontFamily != null)
+                {
+                    temp = new PropertyValue(fontFamily);
+                    _outputVisualMap.Add(TextVisualProperty.FontFamily, temp);
+                    temp.Dispose();
+                }
+                if (fontStyle != null)
+                {
+                    temp = new PropertyValue(fontStyle);
+                    _outputVisualMap.Add(TextVisualProperty.FontStyle, temp);
+                    temp.Dispose();
+                }
+                if (multiLine != null)
+                {
+                    temp = new PropertyValue((bool)multiLine);
+                    _outputVisualMap.Add(TextVisualProperty.MultiLine, temp);
+                    temp.Dispose();
+                }
+                if (horizontalAlignment != null)
+                {
+                    temp = new PropertyValue(horizontalAlignment);
+                    _outputVisualMap.Add(TextVisualProperty.HorizontalAlignment, temp);
+                    temp.Dispose();
+                }
+                if (verticalAlignment != null)
+                {
+                    temp = new PropertyValue(verticalAlignment);
+                    _outputVisualMap.Add(TextVisualProperty.VerticalAlignment, temp);
+                    temp.Dispose();
+                }
+                if (textColor != null)
+                {
+                    temp = new PropertyValue(textColor);
+                    _outputVisualMap.Add(TextVisualProperty.TextColor, temp);
+                    temp.Dispose();
+                }
+                if (enableMarkup != null)
+                {
+                    temp = new PropertyValue((bool)enableMarkup);
+                    _outputVisualMap.Add(TextVisualProperty.EnableMarkup, temp);
+                    temp.Dispose();
+                }
+                if (shadow != null)
+                {
+                    temp = new PropertyValue(shadow);
+                    _outputVisualMap.Add(TextVisualProperty.Shadow, temp);
+                    temp.Dispose();
+                }
+                if (underline != null)
+                {
+                    temp = new PropertyValue(underline);
+                    _outputVisualMap.Add(TextVisualProperty.Underline, temp);
+                    temp.Dispose();
+                }
+                if (outline != null)
+                {
+                    temp = new PropertyValue(outline);
+                    _outputVisualMap.Add(TextVisualProperty.Outline, temp);
+                    temp.Dispose();
+                }
+                if (background != null)
+                {
+                    temp = new PropertyValue(background);
+                    _outputVisualMap.Add(TextVisualProperty.Background, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }
index 99e7834..23597e9 100755 (executable)
@@ -25,12 +25,12 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class VisualAnimator : VisualMap
     {
-        private string _alphaFunction = null;
-        private int _startTime = 0;
-        private int _endTime = 0;
-        private string _target = null;
-        private string _propertyIndex = null;
-        private object _destinationValue = null;
+        private string alphaFunction = null;
+        private int startTime = 0;
+        private int endTime = 0;
+        private string target = null;
+        private string propertyIndex = null;
+        private object destinationValue = null;
 
         /// <summary>
         /// Create VisualAnimator object.
@@ -48,11 +48,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _alphaFunction.GetValueByDescription<AlphaFunction.BuiltinFunctions>();
+                return alphaFunction.GetValueByDescription<AlphaFunction.BuiltinFunctions>();
             }
             set
             {
-                _alphaFunction = value.GetDescription();
+                alphaFunction = value.GetDescription();
             }
         }
 
@@ -64,11 +64,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _startTime;
+                return startTime;
             }
             set
             {
-                _startTime = value;
+                startTime = value;
             }
         }
 
@@ -80,11 +80,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _endTime;
+                return endTime;
             }
             set
             {
-                _endTime = value;
+                endTime = value;
             }
         }
 
@@ -96,11 +96,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _target;
+                return target;
             }
             set
             {
-                _target = value;
+                target = value;
             }
         }
 
@@ -112,11 +112,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _propertyIndex;
+                return propertyIndex;
             }
             set
             {
-                _propertyIndex = value;
+                propertyIndex = value;
             }
         }
 
@@ -128,11 +128,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _destinationValue;
+                return destinationValue;
             }
             set
             {
-                _destinationValue = value;
+                destinationValue = value;
             }
         }
 
@@ -142,28 +142,50 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            PropertyMap _animator = new PropertyMap();
-            _animator.Add("alphaFunction", new PropertyValue(_alphaFunction));
+            PropertyMap animator = new PropertyMap();
+            PropertyValue temp = new PropertyValue(alphaFunction);
+            animator.Add("alphaFunction", temp);
+            temp.Dispose();
 
-            PropertyMap _timePeriod = new PropertyMap();
-            _timePeriod.Add("duration", new PropertyValue((_endTime - _startTime) / 1000.0f));
-            _timePeriod.Add("delay", new PropertyValue(_startTime / 1000.0f));
-            _animator.Add("timePeriod", new PropertyValue(_timePeriod));
+            PropertyMap timePeriod = new PropertyMap();
+            temp = new PropertyValue((endTime - startTime) / 1000.0f);
+            timePeriod.Add("duration", temp);
+            temp.Dispose();
 
-            StringBuilder sb = new StringBuilder(_propertyIndex);
+            temp = new PropertyValue(startTime / 1000.0f);
+            timePeriod.Add("delay", temp);
+            temp.Dispose();
+
+            temp = new PropertyValue(timePeriod);
+            animator.Add("timePeriod", temp);
+            temp.Dispose();
+
+            StringBuilder sb = new StringBuilder(propertyIndex);
             sb[0] = (char)(sb[0] | 0x20);
-            string _str = sb.ToString();
+            string str = sb.ToString();
+
+            PropertyValue val = PropertyValue.CreateFromObject(destinationValue);
 
-            PropertyValue val = PropertyValue.CreateFromObject(_destinationValue);
+            PropertyMap transition = new PropertyMap();
+            temp = new PropertyValue(target);
+            transition.Add("target", temp);
+            temp.Dispose();
 
-            PropertyMap _transition = new PropertyMap();
-            _transition.Add("target", new PropertyValue(_target));
-            _transition.Add("property", new PropertyValue(_str));
-            _transition.Add("targetValue", val);
-            _transition.Add("animator", new PropertyValue(_animator));
+            temp = new PropertyValue(str);
+            transition.Add("property", temp);
+            temp.Dispose();
 
-            _outputVisualMap = _transition;
+            transition.Add("targetValue", val);
+            temp = new PropertyValue(animator);
+            transition.Add("animator", temp);
+            temp.Dispose();
+
+            _outputVisualMap = transition;
             base.ComposingPropertyMap();
+
+            animator.Dispose();
+            timePeriod.Dispose();
+            val.Dispose();
         }
     }
     //temporary fix for TCT
index 8d6681a..d881aa1 100755 (executable)
@@ -814,6 +814,16 @@ namespace Tizen.NUI
             internal static readonly int PermanentDelete = Interop.WidgetView.PermanentDeleteGet();
             internal static readonly int RetryText = Interop.WidgetView.RetryTextGet();
             internal static readonly int EFFECT = Interop.WidgetView.EffectGet();
+
+
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use WidgetId instead!")]
+            internal static readonly int WIDGET_ID = Interop.WidgetView.WidgetIdGet();
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use ContentInfo instead!")]
+            internal static readonly int CONTENT_INFO = Interop.WidgetView.ContentInfoGet();
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use UpdatePeriod instead!")]
+            internal static readonly int UPDATE_PERIOD = Interop.WidgetView.UpdatePeriodGet();
+            [Obsolete("Please do not use this! Deprecated in API9, will be removed in API11! Please use LoadingText instead!")]
+            internal static readonly int LOADING_TEXT = Interop.WidgetView.LoadingTextGet();
         }
     }
 
index 2ae07d3..34b2961 100755 (executable)
@@ -159,12 +159,39 @@ namespace Tizen.NUI
         /// <summary>
         /// Enumeration for transition effect's state.
         /// </summary>
+        [Obsolete("Please do not use! This will be removed. Please use Window.EffectState instead!")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public enum EffectStates
         {
             /// <summary>
             /// None state.
             /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Window.EffectState.None instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            None = 0,
+            /// <summary>
+            /// Transition effect is started.
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Window.EffectState.Start instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Start,
+            /// <summary>
+            /// Transition effect is ended.
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Window.EffectState.End instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            End,
+        }
+
+        /// <summary>
+        /// Enumeration for transition effect's state.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum EffectState
+        {
+            /// <summary>
+            /// None state.
+            /// </summary>
             [EditorBrowsable(EditorBrowsableState.Never)]
             None = 0,
             /// <summary>
@@ -182,12 +209,39 @@ namespace Tizen.NUI
         /// <summary>
         /// Enumeration for transition effect's type.
         /// </summary>
+        [Obsolete("Please do not use! This will be removed. Please use Window.EffectType instead!")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public enum EffectTypes
         {
             /// <summary>
             /// None type.
             /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Window.EffectType.None instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            None = 0,
+            /// <summary>
+            /// Window show effect.
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Window.EffectType.Show instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Show,
+            /// <summary>
+            /// Window hide effect.
+            /// </summary>
+            [Obsolete("Please do not use! This will be removed. Please use Window.EffectType.Hide instead!")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            Hide,
+        }
+
+        /// <summary>
+        /// Enumeration for transition effect's type.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public enum EffectType
+        {
+            /// <summary>
+            /// None type.
+            /// </summary>
             [EditorBrowsable(EditorBrowsableState.Never)]
             None = 0,
             /// <summary>
@@ -369,6 +423,7 @@ namespace Tizen.NUI
                 Position2D position = GetPosition();
                 Size2D size = GetSize();
                 Rectangle ret = new Rectangle(position.X, position.Y, size.Width, size.Height);
+                position.Dispose();
                 return ret;
             }
             set
@@ -1111,11 +1166,17 @@ namespace Tizen.NUI
             {
                 for (int i = 0; i < orientations.Count; i++)
                 {
-                    orientationArray.PushBack(new PropertyValue((int)orientations[i]));
+                    PropertyValue value = new PropertyValue((int)orientations[i]);
+                    orientationArray.PushBack(value);
                 }
             }
 
             Interop.Window.SetAvailableOrientations(SwigCPtr, PropertyArray.getCPtr(orientationArray));
+            for (uint i = 0; i < orientationArray.Count(); i++)
+            {
+                orientationArray[i].Dispose();
+            }
+            orientationArray.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
@@ -1166,8 +1227,9 @@ namespace Tizen.NUI
 
         internal Vector2 GetSize()
         {
-            var val = new Uint16Pair(Interop.Window.GetSize(SwigCPtr), false);
+            var val = new Uint16Pair(Interop.Window.GetSize(SwigCPtr), true);
             Vector2 ret = new Vector2(val.GetWidth(), val.GetHeight());
+            val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -1255,17 +1317,16 @@ namespace Tizen.NUI
             }
             var val = new Uint16Pair((uint)size.Width, (uint)size.Height);
             Interop.Window.SetSize(SwigCPtr, Uint16Pair.getCPtr(val));
-
+            val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
             // Resetting Window size should request a relayout of the tree.
         }
 
         internal Size2D GetWindowSize()
         {
-            var val = new Uint16Pair(Interop.Window.GetSize(SwigCPtr), false);
+            var val = new Uint16Pair(Interop.Window.GetSize(SwigCPtr), true);
             Size2D ret = new Size2D(val.GetWidth(), val.GetHeight());
-
+            val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -1278,7 +1339,7 @@ namespace Tizen.NUI
             }
             var val = new Uint16Pair((uint)position.X, (uint)position.Y);
             Interop.Window.SetPosition(SwigCPtr, Uint16Pair.getCPtr(val));
-
+            val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             // Setting Position of the window should request a relayout of the tree.
         }
@@ -1287,7 +1348,7 @@ namespace Tizen.NUI
         {
             var val = new Uint16Pair(Interop.Window.GetPosition(SwigCPtr), true);
             Position2D ret = new Position2D(val.GetX(), val.GetY());
-
+            val.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -1433,7 +1494,7 @@ namespace Tizen.NUI
         /// <code>
         /// void MyFunction( int frameId )
         /// </code>
-        /// This callback will be deleted once it is called. 
+        /// This callback will be deleted once it is called.
         /// <remarks>
         /// Ownership of the callback is passed onto this class
         /// </remarks>
@@ -1456,7 +1517,7 @@ namespace Tizen.NUI
         /// <code>
         /// void MyFunction( int frameId )
         /// </code>
-        /// This callback will be deleted once it is called. 
+        /// This callback will be deleted once it is called.
         /// <remarks>
         /// Ownership of the callback is passed onto this class
         /// </remarks>
index 8aa0a6a..43c5514 100755 (executable)
@@ -46,6 +46,18 @@ namespace Tizen.NUI
         private WindowTransitionEffectSignal transitionEffectSignal;
         private KeyboardRepeatSettingsChangedEventCallbackType keyboardRepeatSettingsChangedEventCallback;
         private KeyboardRepeatSettingsChangedSignal keyboardRepeatSettingsChangedSignal;
+        private WindowFocusSignalType windowFocusChangedSignal;
+        private WindowFocusSignalType windowFocusChangedSignal2;
+        private TouchDataSignal touchDataSignal;
+        private TouchSignal touchSignal;
+        private WheelSignal wheelSignal;
+        private StageWheelSignal stageWheelSignal;
+        private KeyEventSignal keyEventSignal;
+        private VoidSignal sceneCreatedSignal;
+        private ResizeSignal resizeSignal;
+        private VoidSignal eventProcessingFinishedSignal;
+        private VoidSignal contextLostSignal;
+        private VoidSignal contextRegainedSignal;
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void WindowFocusChangedEventCallbackType(IntPtr window, bool focusGained);
@@ -73,7 +85,8 @@ namespace Tizen.NUI
                 if (_windowFocusChangedEventHandler == null)
                 {
                     _windowFocusChangedEventCallback = OnWindowFocusedChanged;
-                    WindowFocusChangedSignal().Connect(_windowFocusChangedEventCallback);
+                    windowFocusChangedSignal = WindowFocusChangedSignal();
+                    windowFocusChangedSignal?.Connect(_windowFocusChangedEventCallback);
                 }
 
                 _windowFocusChangedEventHandler += value;
@@ -82,9 +95,9 @@ namespace Tizen.NUI
             {
                 _windowFocusChangedEventHandler -= value;
 
-                if (_windowFocusChangedEventHandler == null && WindowFocusChangedSignal().Empty() == false && _windowFocusChangedEventCallback != null)
+                if (_windowFocusChangedEventHandler == null && windowFocusChangedSignal?.Empty() == false && _windowFocusChangedEventCallback != null)
                 {
-                    WindowFocusChangedSignal().Disconnect(_windowFocusChangedEventCallback);
+                    windowFocusChangedSignal?.Disconnect(_windowFocusChangedEventCallback);
                 }
             }
         }
@@ -103,16 +116,18 @@ namespace Tizen.NUI
                 if (_rootLayerTouchDataEventHandler == null)
                 {
                     _rootLayerTouchDataCallback = OnWindowTouch;
-                    this.TouchDataSignal().Connect(_rootLayerTouchDataCallback);
+                    touchDataSignal = this.TouchDataSignal();
+                    touchDataSignal?.Connect(_rootLayerTouchDataCallback);
                 }
                 _rootLayerTouchDataEventHandler += value;
             }
             remove
             {
                 _rootLayerTouchDataEventHandler -= value;
-                if (_rootLayerTouchDataEventHandler == null && TouchSignal().Empty() == false && _rootLayerTouchDataCallback != null)
+                touchSignal = TouchSignal();
+                if (_rootLayerTouchDataEventHandler == null && touchSignal?.Empty() == false && _rootLayerTouchDataCallback != null)
                 {
-                    this.TouchDataSignal().Disconnect(_rootLayerTouchDataCallback);
+                    touchDataSignal?.Disconnect(_rootLayerTouchDataCallback);
                 }
             }
         }
@@ -128,29 +143,31 @@ namespace Tizen.NUI
                 if (_stageWheelHandler == null)
                 {
                     _wheelEventCallback = OnStageWheel;
-                    WheelEventSignal().Connect(_wheelEventCallback);
+                    wheelSignal = WheelEventSignal();
+                    wheelSignal?.Connect(_wheelEventCallback);
                 }
                 _stageWheelHandler += value;
 
                 if (DetentEventHandler == null)
                 {
                     DetentEventCallback = OnDetentEvent;
-                    StageWheelEventSignal().Connect(DetentEventCallback);
+                    stageWheelSignal = StageWheelEventSignal();
+                    stageWheelSignal?.Connect(DetentEventCallback);
                 }
                 DetentEventHandler += value;
             }
             remove
             {
                 _stageWheelHandler -= value;
-                if (_stageWheelHandler == null && WheelEventSignal().Empty() == false)
+                if (_stageWheelHandler == null && wheelSignal?.Empty() == false)
                 {
-                    WheelEventSignal().Disconnect(_wheelEventCallback);
+                    wheelSignal?.Disconnect(_wheelEventCallback);
                 }
 
                 DetentEventHandler -= value;
-                if (DetentEventHandler == null && StageWheelEventSignal().Empty() == false)
+                if (DetentEventHandler == null && stageWheelSignal?.Empty() == false)
                 {
-                    StageWheelEventSignal().Disconnect(DetentEventCallback);
+                    stageWheelSignal?.Disconnect(DetentEventCallback);
                 }
             }
         }
@@ -166,16 +183,17 @@ namespace Tizen.NUI
                 if (_stageKeyHandler == null)
                 {
                     _stageKeyCallbackDelegate = OnStageKey;
-                    KeyEventSignal().Connect(_stageKeyCallbackDelegate);
+                    keyEventSignal = KeyEventSignal();
+                    keyEventSignal?.Connect(_stageKeyCallbackDelegate);
                 }
                 _stageKeyHandler += value;
             }
             remove
             {
                 _stageKeyHandler -= value;
-                if (_stageKeyHandler == null && KeyEventSignal().Empty() == false)
+                if (_stageKeyHandler == null && keyEventSignal?.Empty() == false)
                 {
-                    KeyEventSignal().Disconnect(_stageKeyCallbackDelegate);
+                    keyEventSignal?.Disconnect(_stageKeyCallbackDelegate);
                 }
             }
         }
@@ -191,7 +209,8 @@ namespace Tizen.NUI
                 if (_windowResizeEventHandler == null)
                 {
                     _windowResizeEventCallback = OnResized;
-                    ResizeSignal().Connect(_windowResizeEventCallback);
+                    resizeSignal = ResizeSignal();
+                    resizeSignal?.Connect(_windowResizeEventCallback);
                 }
 
                 _windowResizeEventHandler += value;
@@ -200,9 +219,9 @@ namespace Tizen.NUI
             {
                 _windowResizeEventHandler -= value;
 
-                if (_windowResizeEventHandler == null && ResizeSignal().Empty() == false && _windowResizeEventCallback != null)
+                if (_windowResizeEventHandler == null && resizeSignal?.Empty() == false && _windowResizeEventCallback != null)
                 {
-                    ResizeSignal().Disconnect(_windowResizeEventCallback);
+                    resizeSignal?.Disconnect(_windowResizeEventCallback);
                 }
             }
         }
@@ -225,7 +244,8 @@ namespace Tizen.NUI
                 if (_windowFocusChangedEventHandler2 == null)
                 {
                     _windowFocusChangedEventCallback2 = OnWindowFocusedChanged2;
-                    WindowFocusChangedSignal().Connect(_windowFocusChangedEventCallback2);
+                    windowFocusChangedSignal2 = WindowFocusChangedSignal();
+                    windowFocusChangedSignal2?.Connect(_windowFocusChangedEventCallback2);
                 }
 
                 _windowFocusChangedEventHandler2 += value;
@@ -234,9 +254,9 @@ namespace Tizen.NUI
             {
                 _windowFocusChangedEventHandler2 -= value;
 
-                if (_windowFocusChangedEventHandler2 == null && WindowFocusChangedSignal().Empty() == false && _windowFocusChangedEventCallback2 != null)
+                if (_windowFocusChangedEventHandler2 == null && windowFocusChangedSignal2?.Empty() == false && _windowFocusChangedEventCallback2 != null)
                 {
-                    WindowFocusChangedSignal().Disconnect(_windowFocusChangedEventCallback2);
+                    windowFocusChangedSignal2?.Disconnect(_windowFocusChangedEventCallback2);
                 }
             }
         }
@@ -320,7 +340,8 @@ namespace Tizen.NUI
                 if (_stageEventProcessingFinishedEventHandler == null)
                 {
                     _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished;
-                    EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate);
+                    eventProcessingFinishedSignal = EventProcessingFinishedSignal();
+                    eventProcessingFinishedSignal?.Connect(_stageEventProcessingFinishedEventCallbackDelegate);
                 }
                 _stageEventProcessingFinishedEventHandler += value;
 
@@ -328,9 +349,9 @@ namespace Tizen.NUI
             remove
             {
                 _stageEventProcessingFinishedEventHandler -= value;
-                if (_stageEventProcessingFinishedEventHandler == null && EventProcessingFinishedSignal().Empty() == false)
+                if (_stageEventProcessingFinishedEventHandler == null && eventProcessingFinishedSignal?.Empty() == false)
                 {
-                    EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate);
+                    eventProcessingFinishedSignal?.Disconnect(_stageEventProcessingFinishedEventCallbackDelegate);
                 }
             }
         }
@@ -342,16 +363,17 @@ namespace Tizen.NUI
                 if (_stageContextLostEventHandler == null)
                 {
                     _stageContextLostEventCallbackDelegate = OnContextLost;
-                    ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate);
+                    contextLostSignal = ContextLostSignal();
+                    contextLostSignal?.Connect(_stageContextLostEventCallbackDelegate);
                 }
                 _stageContextLostEventHandler += value;
             }
             remove
             {
                 _stageContextLostEventHandler -= value;
-                if (_stageContextLostEventHandler == null && ContextLostSignal().Empty() == false)
+                if (_stageContextLostEventHandler == null && contextLostSignal?.Empty() == false)
                 {
-                    ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate);
+                    contextLostSignal?.Disconnect(_stageContextLostEventCallbackDelegate);
                 }
             }
         }
@@ -363,16 +385,17 @@ namespace Tizen.NUI
                 if (_stageContextRegainedEventHandler == null)
                 {
                     _stageContextRegainedEventCallbackDelegate = OnContextRegained;
-                    ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate);
+                    contextRegainedSignal = ContextRegainedSignal();
+                    contextRegainedSignal?.Connect(_stageContextRegainedEventCallbackDelegate);
                 }
                 _stageContextRegainedEventHandler += value;
             }
             remove
             {
                 _stageContextRegainedEventHandler -= value;
-                if (_stageContextRegainedEventHandler == null && ContextRegainedSignal().Empty() == false)
+                if (_stageContextRegainedEventHandler == null && contextRegainedSignal?.Empty() == false)
                 {
-                    this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate);
+                    contextRegainedSignal?.Disconnect(_stageContextRegainedEventCallbackDelegate);
                 }
             }
         }
@@ -384,16 +407,17 @@ namespace Tizen.NUI
                 if (_stageSceneCreatedEventHandler == null)
                 {
                     _stageSceneCreatedEventCallbackDelegate = OnSceneCreated;
-                    SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate);
+                    sceneCreatedSignal = SceneCreatedSignal();
+                    sceneCreatedSignal?.Connect(_stageSceneCreatedEventCallbackDelegate);
                 }
                 _stageSceneCreatedEventHandler += value;
             }
             remove
             {
                 _stageSceneCreatedEventHandler -= value;
-                if (_stageSceneCreatedEventHandler == null && SceneCreatedSignal().Empty() == false)
+                if (_stageSceneCreatedEventHandler == null && sceneCreatedSignal?.Empty() == false)
                 {
-                    SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate);
+                    sceneCreatedSignal?.Disconnect(_stageSceneCreatedEventCallbackDelegate);
                 }
             }
         }
@@ -484,57 +508,57 @@ namespace Tizen.NUI
         {
             if (_windowFocusChangedEventCallback != null)
             {
-                WindowFocusChangedSignal().Disconnect(_windowFocusChangedEventCallback);
+                windowFocusChangedSignal?.Disconnect(_windowFocusChangedEventCallback);
             }
 
             if (_rootLayerTouchDataCallback != null)
             {
-                TouchDataSignal().Disconnect(_rootLayerTouchDataCallback);
+                touchDataSignal?.Disconnect(_rootLayerTouchDataCallback);
             }
 
             if (_wheelEventCallback != null)
             {
-                WheelEventSignal().Disconnect(_wheelEventCallback);
+                wheelSignal?.Disconnect(_wheelEventCallback);
             }
 
             if (DetentEventCallback != null)
             {
-                StageWheelEventSignal().Disconnect(DetentEventCallback);
+                stageWheelSignal?.Disconnect(DetentEventCallback);
             }
 
             if (_stageKeyCallbackDelegate != null)
             {
-                KeyEventSignal().Disconnect(_stageKeyCallbackDelegate);
+                keyEventSignal?.Disconnect(_stageKeyCallbackDelegate);
             }
 
             if (_stageEventProcessingFinishedEventCallbackDelegate != null)
             {
-                EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate);
+                eventProcessingFinishedSignal?.Disconnect(_stageEventProcessingFinishedEventCallbackDelegate);
             }
 
             if (_stageContextLostEventCallbackDelegate != null)
             {
-                ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate);
+                contextLostSignal?.Disconnect(_stageContextLostEventCallbackDelegate);
             }
 
             if (_stageContextRegainedEventCallbackDelegate != null)
             {
-                ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate);
+                contextRegainedSignal?.Disconnect(_stageContextRegainedEventCallbackDelegate);
             }
 
             if (_stageSceneCreatedEventCallbackDelegate != null)
             {
-                SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate);
+                sceneCreatedSignal?.Disconnect(_stageSceneCreatedEventCallbackDelegate);
             }
 
             if (_windowResizeEventCallback != null)
             {
-                ResizeSignal().Disconnect(_windowResizeEventCallback);
+                resizeSignal?.Disconnect(_windowResizeEventCallback);
             }
 
             if (_windowFocusChangedEventCallback2 != null)
             {
-                WindowFocusChangedSignal().Disconnect(_windowFocusChangedEventCallback2);
+                windowFocusChangedSignal2?.Disconnect(_windowFocusChangedEventCallback2); 
             }
 
             if (transitionEffectSignal != null)
@@ -704,7 +728,7 @@ namespace Tizen.NUI
             // e.WindowSize = new Size2D(val.GetWidth(), val.GetHeight());
             // val.Dispose();
 
-            // Workaround : windowSize should be valid pointer from dali, 
+            // Workaround : windowSize should be valid pointer from dali,
             // but currenlty it is fixed and is not Uint16Pair class.
             // will be fixed later.
             e.WindowSize = this.WindowSize;
@@ -742,9 +766,9 @@ namespace Tizen.NUI
 
             TransitionEffectEventArgs e = new TransitionEffectEventArgs();
 
-            e.State = (EffectStates)state;
+            e.State = (EffectState)state;
 
-            e.Type = (EffectTypes)type;
+            e.Type = (EffectType)type;
 
             if (transitionEffectHandler != null)
             {
@@ -945,14 +969,14 @@ namespace Tizen.NUI
         [EditorBrowsable(EditorBrowsableState.Never)]
         public class TransitionEffectEventArgs : EventArgs
         {
-            private EffectStates state;
-            private EffectTypes type;
+            private EffectState state;
+            private EffectType type;
 
             /// <summary>
             /// State
             /// </summary>
             [EditorBrowsable(EditorBrowsableState.Never)]
-            public EffectStates State
+            public EffectState State
             {
                 get
                 {
@@ -967,7 +991,7 @@ namespace Tizen.NUI
             /// Type
             /// </summary>
             [EditorBrowsable(EditorBrowsableState.Never)]
-            public EffectTypes Type
+            public EffectType Type
             {
                 get
                 {
index 8916eae..955c706 100755 (executable)
@@ -9,6 +9,6 @@ namespace Tizen.NUI.Binding.Internals
     {
         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
-        void SetDynamicResource(BindableProperty property, string key);
+        void SetDynamicResource(BindableProperty targetProperty, string key);
     }
 }
index 5136a3c..afa8bdd 100755 (executable)
@@ -11,7 +11,7 @@ namespace Tizen.NUI.Binding
 {
     /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
     [EditorBrowsable(EditorBrowsableState.Never)]
-    [ProvideCompiledAttribute("Tizen.NUI.Xaml.Core.XamlC.Size2DTypeConverter")]
+    [ProvideCompiledAttribute("Tizen.NUI.Xaml.Core.XamlC.SizeTypeConverter")]
     public class SizeTypeConverter : TypeConverter
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index afbc150..c637c62 100755 (executable)
@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.System.Information",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI.Wearable", "..\..\src\Tizen.NUI.Wearable\Tizen.NUI.Wearable.csproj", "{A2B607F9-5B9B-43AC-A8CA-E0FDF2A6694E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.System.Feedback", "..\..\src\Tizen.System.Feedback\Tizen.System.Feedback.csproj", "{D422D03E-7E32-4230-8306-B16DFE27E95A}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -87,6 +89,10 @@ Global
                {A2B607F9-5B9B-43AC-A8CA-E0FDF2A6694E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {A2B607F9-5B9B-43AC-A8CA-E0FDF2A6694E}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {A2B607F9-5B9B-43AC-A8CA-E0FDF2A6694E}.Release|Any CPU.Build.0 = Release|Any CPU
+               {D422D03E-7E32-4230-8306-B16DFE27E95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {D422D03E-7E32-4230-8306-B16DFE27E95A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {D422D03E-7E32-4230-8306-B16DFE27E95A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {D422D03E-7E32-4230-8306-B16DFE27E95A}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 2be51ab..d319436 100755 (executable)
@@ -23,11 +23,13 @@ namespace Tizen.NUI.Samples
         const int mColumn = 3;
         const int mContents = mRow * mColumn;
 
+        Size2D windowSize;
+
         public void Activate()
         {
             Window window = NUIApplication.GetDefaultWindow();
             window.BackgroundColor = Color.White;
-            Size2D windowSize = window.WindowSize;
+            windowSize = window.Size;
 
             // Create Table
             TableView table = new TableView(mRow, mColumn)
@@ -50,7 +52,7 @@ namespace Tizen.NUI.Samples
                 {
                     TextLabel content = CreateText();
                     content.Name = "TextLabel" + exampleCount;
-                    content.Text = "Row" + row + " - Column" + column;
+                    content.Text = "R" + row + " - C" + column;
 
                     ///////////////////////////////////////////////////////////////////////////////////////////////
                     ///                 How to set Accessibility attribute to components                        ///
@@ -84,13 +86,9 @@ namespace Tizen.NUI.Samples
         TextLabel CreateText()
         {
             TextLabel label = new TextLabel();
-            label.PositionUsesPivotPoint = true;
-            label.PivotPoint = PivotPoint.Center;
-            label.ParentOrigin = ParentOrigin.Center;
             label.MultiLine = true;
             label.HorizontalAlignment = HorizontalAlignment.Center;
             label.VerticalAlignment = VerticalAlignment.Center;
-            label.HeightResizePolicy = ResizePolicyType.FillToParent;
             label.Focusable = true;
             return label;
         }
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AppBarSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/AppBarSample.cs
new file mode 100755 (executable)
index 0000000..7298042
--- /dev/null
@@ -0,0 +1,98 @@
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace Tizen.NUI.Samples
+{
+    public class AppBarSample : IExample
+    {
+        private Page firstPage, secondPage;
+        private AppBar firstAppBar, secondAppBar;
+        private Button firstActionButton, secondActionButton;
+        private Button firstButton, secondButton;
+
+        public void Activate()
+        {
+            CreateFirstPage();
+        }
+
+        private void CreateFirstPage()
+        {
+            firstActionButton = new Button()
+            {
+                Text = "2",
+                Size = new Size(72.0f, 72.0f)
+            };
+            firstActionButton.Clicked += (object sender, ClickedEventArgs e) =>
+            {
+                CreateSecondPage();
+            };
+
+            firstAppBar = new AppBar("First Page", firstActionButton)
+            {
+                AutoNavigationContent = false
+            };
+
+            firstButton = new Button()
+            {
+                Text = "Click to next",
+                WidthSpecification = LayoutParamPolicies.MatchParent,
+                HeightSpecification = LayoutParamPolicies.MatchParent,
+            };
+            firstButton.Clicked += (object sender, ClickedEventArgs e) =>
+            {
+                CreateSecondPage();
+            };
+
+            firstPage = new Page(firstAppBar, firstButton);
+
+            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Push(firstPage);
+        }
+
+        private void CreateSecondPage()
+        {
+            secondActionButton = new Button()
+            {
+                Text = "1",
+                Size = new Size(72.0f, 72.0f)
+            };
+            secondActionButton.Clicked += (object sender, ClickedEventArgs e) =>
+            {
+                NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
+            };
+
+            secondAppBar = new AppBar("Second Page", secondActionButton);
+
+            secondButton = new Button()
+            {
+                Text = "Click to prev",
+                WidthSpecification = LayoutParamPolicies.MatchParent,
+                HeightSpecification = LayoutParamPolicies.MatchParent,
+            };
+            secondButton.Clicked += (object sender, ClickedEventArgs e) =>
+            {
+                NUIApplication.GetDefaultWindow().GetDefaultNavigator().Pop();
+            };
+
+            secondPage = new Page(secondAppBar, secondButton);
+
+            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Push(secondPage);
+        }
+
+        public void Deactivate()
+        {
+            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Remove(secondPage);
+
+            secondPage = null;
+            secondAppBar = null;
+            secondActionButton = null;
+            secondButton = null;
+
+            NUIApplication.GetDefaultWindow().GetDefaultNavigator().Remove(firstPage);
+
+            firstPage = null;
+            firstAppBar = null;
+            firstActionButton = null;
+            firstButton = null;
+        }
+    }
+}
index d8a6729..4487f68 100755 (executable)
@@ -6,6 +6,8 @@ using Tizen.NUI.UIComponents;
 
 namespace Tizen.NUI.Samples
 {
+    using tlog = Tizen.Log;
+
     public class Example
     {
         public Example(string name, string title)
@@ -44,6 +46,8 @@ namespace Tizen.NUI.Samples
 
     public class DaliTableView
     {
+        static readonly string tag = "NUITEST";
+
         static private uint mCurPage = 0;
 
         static public string DEMO_IMAGE_DIR = CommonResource.GetDaliResourcePath() + "DaliDemo/";
@@ -195,6 +199,8 @@ namespace Tizen.NUI.Samples
             mAnimationTimer.Tick += PauseBackgroundAnimation;
             mAnimationTimer.Start();
             mBackgroundAnimsPlaying = true;
+
+            tlog.Debug(tag, $"Initialize() end!");
         }
 
         private bool PauseBackgroundAnimation(object source, Timer.TickEventArgs e)
@@ -357,14 +363,16 @@ namespace Tizen.NUI.Samples
             label.Text = title;
             label.HorizontalAlignment = HorizontalAlignment.Center;
             label.VerticalAlignment = VerticalAlignment.Center;
+            label.WidthResizePolicy = ResizePolicyType.FillToParent;
             label.HeightResizePolicy = ResizePolicyType.FillToParent;
-            //var fit = new PropertyMap();
-            //fit.Add("enable", new PropertyValue(true)).Add("minSize", new PropertyValue(3.0f)).Add("maxSize", new PropertyValue(50.0f));
-            //label.TextFit = fit;
-            label.PointSize = 11.0f * (float)(NUIApplication.GetDefaultWindow().Size.Height) / 1080.0f;
+
+            var fit = new PropertyMap();
+            fit.Add("enable", new PropertyValue(true)).Add("minSize", new PropertyValue(5.0f)).Add("maxSize", new PropertyValue(50.0f));
+            label.TextFit = fit;
 
             // Pad around the label as its size is the same as the 9-patch border. It will overlap it without padding.
             label.SetPadding(new PaddingType((int)TILE_LABEL_PADDING, (int)TILE_LABEL_PADDING, (int)TILE_LABEL_PADDING, (int)TILE_LABEL_PADDING));
+
             focusableTile.Add(label);
 
             // Connect to the touch events
index 74ece7b..6eea4be 100755 (executable)
@@ -81,20 +81,12 @@ namespace Tizen.NUI.Samples
             {
                 NUIApplication.GetDefaultWindow().Remove(navigator);
 
-                firstButton.Dispose();
+                navigator.Dispose();
+                navigator = null;
                 firstButton = null;
-
-                secondButton.Dispose();
-                secondButton = null;
-
-                firstPage.Dispose();
                 firstPage = null;
-
-                secondPage.Dispose();
+                secondButton = null;
                 secondPage = null;
-
-                navigator.Dispose();
-                navigator = null;
             }
         }
     }
index dbdd574..0589739 100755 (executable)
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.9" />
     <ProjectReference Include="../../../src/Tizen/Tizen.csproj" />
     <ProjectReference Include="../../../src/Tizen.Applications.Common/Tizen.Applications.Common.csproj" />