temporary fix for TCT failure of XU3 Milestone1 release

- merge from tizen branch

Conflicts:
	Tizen.NUI/Properties/AssemblyInfo.cs

Change-Id: I318ac5f298d3eb3509f7b3276c731bf0017f5821
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/Tizen.NUI/Properties/AssemblyInfo.cs b/Tizen.NUI/Properties/AssemblyInfo.cs
new file mode 100755 (executable)
index 0000000..e55d1f6
--- /dev/null
+++ b/Tizen.NUI/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;\r
+using System.Runtime.CompilerServices;\r
+using System.Runtime.InteropServices;\r
+\r
+// General Information about an assembly is controlled through the following\r
+// set of attributes. Change these attribute values to modify the information\r
+// associated with an assembly.\r
+[assembly: AssemblyTitle("Tizen.NUI")]\r
+[assembly: AssemblyDescription("nui dll")]\r
+[assembly: AssemblyConfiguration("")]\r
+[assembly: AssemblyCompany("sec")]\r
+[assembly: AssemblyProduct("DALi/NUI")]\r
+[assembly: AssemblyCopyright("sec")]\r
+[assembly: AssemblyTrademark("sec")]\r
+[assembly: AssemblyCulture("")]\r
+\r
+// Setting ComVisible to false makes the types in this assembly not visible\r
+// to COM components.  If you need to access a type in this assembly from\r
+// COM, set the ComVisible attribute to true on that type.\r
+[assembly: ComVisible(false)]\r
+\r
+// The following GUID is for the ID of the typelib if this project is exposed to COM\r
+[assembly: Guid("f03a3b48-9d9b-4bf3-92ce-bd63cadc3cd3")]\r
+\r
+// Version information for an assembly consists of the following four values:\r
+//\r
+//      Major Version\r
+//      Minor Version\r
+//      Build Number\r
+//      Revision\r
+//\r
+// You can specify all the values or you can default the Build and Revision Numbers\r
+// by using the '*' as shown below:\r
+// [assembly: AssemblyVersion("1.0.*")]\r
+[assembly: AssemblyVersion("0.2.39.0519")]\r
+[assembly: AssemblyFileVersion("0.2.39.0519")]\r

diff --git a/Tizen.NUI/Tizen.NUI.csproj b/Tizen.NUI/Tizen.NUI.csproj
index 7f90f6a..55f6438 100755 (executable)
--- a/Tizen.NUI/Tizen.NUI.csproj
+++ b/Tizen.NUI/Tizen.NUI.csproj
@@ -45,6 +45,7 @@
     <None Include="Tizen.NUI.project.json" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
     <Compile Include="src\internal\AccessibilityActionSignal.cs" />\r
     <Compile Include="src\internal\AccessibilityFocusOvershotSignal.cs" />\r
     <Compile Include="src\internal\AccessibilityManager.cs" />\r

diff --git a/Tizen.NUI/Tizen.NUI.sln b/Tizen.NUI/Tizen.NUI.sln
new file mode 100755 (executable)
index 0000000..5d64075
--- /dev/null
+++ b/Tizen.NUI/Tizen.NUI.sln
@@ -0,0 +1,22 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 14\r
+VisualStudioVersion = 14.0.25420.1\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.NUI", "Tizen.NUI.csproj", "{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs
index 63fcb44..2441ef9 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -1909,14 +1909,14 @@ namespace Tizen.NUI.BaseComponents
             SetVisible(false);
         }
 
-        internal void Raise()
+        public void Raise()
         {
             NDalicPINVOKE.Raise(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        internal void Lower()
+        public void Lower()
         {
             NDalicPINVOKE.Lower(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending)
@@ -2200,7 +2200,7 @@ namespace Tizen.NUI.BaseComponents
             return ret;
         }
 
-        internal Vector3 GetNaturalSize()
+        public Vector3 GetNaturalSize()
         {
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending)

diff --git a/Tizen.NUI/src/public/BaseComponents/VisualView.cs b/Tizen.NUI/src/public/BaseComponents/VisualView.cs
index 7cb39cd..60fcc01 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/VisualView.cs
+++ b/Tizen.NUI/src/public/BaseComponents/VisualView.cs
@@ -321,5 +321,23 @@ namespace Tizen.NUI.BaseComponents
             return null;
         }
 
+
+        //temporary fix to pass TCT 
+        public Animation VisualAnimate(VisualAnimator visualMap)
+        {
+            foreach (var item in _visualDictionary.ToList())
+            {
+                if (item.Value.Name == visualMap.Target)
+                {
+                    TransitionData _transitionData = new TransitionData(visualMap.OutputVisualMap);
+                    return this.CreateTransition(_transitionData);
+                }
+            }
+            return null;
+        }
+        //temporary fix to pass TCT 
+
+
+
     }
 }

diff --git a/Tizen.NUI/src/public/VisualMaps.cs b/Tizen.NUI/src/public/VisualMaps.cs
index c417461..dee7c61 100755 (executable)
--- a/Tizen.NUI/src/public/VisualMaps.cs
+++ b/Tizen.NUI/src/public/VisualMaps.cs
@@ -1976,4 +1976,222 @@ namespace Tizen.NUI
     }
 
 
+
+    //temporary fix for TCT
+    public class VisualAnimator : VisualMap
+    {
+        public VisualAnimator() : base()
+        {
+        }
+
+        private string _alphaFunction = null;
+        private int _startTime = 0;
+        private int _endTime = 0;
+        private string _target = null;
+        private string _propertyIndex = null;
+        private object _destinationValue = null;
+
+        public AlphaFunction.BuiltinFunctions AlphaFunction
+        {
+            get
+            {
+                switch (_alphaFunction)
+                {
+                    case "LINEAR":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.Linear;
+                    case "REVERSE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.Reverse;
+                    case "EASE_IN_SQUARE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSquare;
+                    case "EASE_OUT_SQUARE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSquare;
+                    case "EASE_IN":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseIn;
+                    case "EASE_OUT":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOut;
+                    case "EASE_IN_OUT":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOut;
+                    case "EASE_IN_SINE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSine;
+                    case "EASE_OUT_SINE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSine;
+                    case "EASE_IN_OUT_SINE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOutSine;
+                    case "BOUNCE":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.Bounce;
+                    case "SIN":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.Sin;
+                    case "EASE_OUT_BACK":
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutBack;
+                    default:
+                        return Tizen.NUI.AlphaFunction.BuiltinFunctions.Default;
+                }
+            }
+            set
+            {
+                switch (value)
+                {
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.Linear:
+                        {
+                            _alphaFunction = "LINEAR";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.Reverse:
+                        {
+                            _alphaFunction = "REVERSE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSquare:
+                        {
+                            _alphaFunction = "EASE_IN_SQUARE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSquare:
+                        {
+                            _alphaFunction = "EASE_OUT_SQUARE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseIn:
+                        {
+                            _alphaFunction = "EASE_IN";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOut:
+                        {
+                            _alphaFunction = "EASE_OUT";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOut:
+                        {
+                            _alphaFunction = "EASE_IN_OUT";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInSine:
+                        {
+                            _alphaFunction = "EASE_IN_SINE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutSine:
+                        {
+                            _alphaFunction = "EASE_OUT_SINE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseInOutSine:
+                        {
+                            _alphaFunction = "EASE_IN_OUT_SINE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.Bounce:
+                        {
+                            _alphaFunction = "BOUNCE";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.Sin:
+                        {
+                            _alphaFunction = "SIN";
+                            break;
+                        }
+                    case Tizen.NUI.AlphaFunction.BuiltinFunctions.EaseOutBack:
+                        {
+                            _alphaFunction = "EASE_OUT_BACK";
+                            break;
+                        }
+                    default:
+                        {
+                            _alphaFunction = "DEFAULT";
+                            break;
+                        }
+                }
+            }
+        }
+
+        public int StartTime
+        {
+            get
+            {
+                return _startTime;
+            }
+            set
+            {
+                _startTime = value;
+            }
+        }
+
+        public int EndTime
+        {
+            get
+            {
+                return _endTime;
+            }
+            set
+            {
+                _endTime = value;
+            }
+        }
+
+        public string Target
+        {
+            get
+            {
+                return _target;
+            }
+            set
+            {
+                _target = value;
+            }
+        }
+
+        public string PropertyIndex
+        {
+            get
+            {
+                return _propertyIndex;
+            }
+            set
+            {
+                _propertyIndex = value;
+            }
+        }
+
+        public object DestinationValue
+        {
+            get
+            {
+                return _destinationValue;
+            }
+            set
+            {
+                _destinationValue = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            PropertyMap _animator = new PropertyMap();
+            _animator.Add("alphaFunction", new PropertyValue(_alphaFunction));
+
+            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));
+
+            string _str1 = _propertyIndex.Substring(0, 1);
+            string _str2 = _propertyIndex.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            PropertyValue val = PropertyValue.CreateFromObject(_destinationValue);
+
+            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));
+
+            _outputVisualMap = _transition;
+        }
+    }
+    //temporary fix for TCT
+
+
+
 }