[EXaml] Support import xaml to ResourceDictionary in EXaml

diff --git a/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll b/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll
index b855cffa87d9a67f8f027857bb1cd7e98fb36b8b..24c85252cbf6ce188a08e7b2e464a51820f0a8ff 100644 (file)
Binary files a/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll and b/pkg/Tizen.NET.API10/xamlbuild/Tizen.NUI.XamlBuild.dll differ

diff --git a/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXaml/EXamlCreateObject/EXamlCreateArrayObject.cs b/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXaml/EXamlCreateObject/EXamlCreateArrayObject.cs
index 0cdc35360f5a57be12b7407b56d8a067c50cb21c..7bb4b1b5620f518a53ec3fa8805666f2341f6691 100755 (executable)
--- a/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXaml/EXamlCreateObject/EXamlCreateArrayObject.cs
+++ b/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXaml/EXamlCreateObject/EXamlCreateArrayObject.cs
@@ -37,7 +37,7 @@ namespace Tizen.NUI.EXaml
             }
 
             string itemsString = "";
-            if (0 < items.Count)
+            if (null != items && 0 < items.Count)
             {
                 itemsString += "(";
 

diff --git a/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXamlSetPropertiesVisitor.cs b/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXamlSetPropertiesVisitor.cs
index be707b62114a68ef9fbebe7d5ef0e7a280ff4661..acbabc06c2bb1aee571ffd661815cf9447caea2b 100755 (executable)
--- a/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXamlSetPropertiesVisitor.cs
+++ b/src/Tizen.NUI.XamlBuild/src/public/EXamlBuild/EXamlSetPropertiesVisitor.cs
@@ -913,6 +913,8 @@ namespace Tizen.NUI.EXaml.Build.Tasks
             var valueNode = node as ValueNode;
             var elementNode = node as IElementNode;
 
+            bool needToSetProperty = true;
+
             //if it's a value type, load the address so we can invoke methods on it
             if (parent.Type.IsValueType)
             {
@@ -937,15 +939,24 @@ namespace Tizen.NUI.EXaml.Build.Tasks
                 }
                 else
                 {
-                    var converterType = valueNode.GetConverterType(new ICustomAttributeProvider[] { property, propertyType.ResolveCached() });
-                    if (null != converterType)
+                    if ("Tizen.NUI.Binding.ResourceDictionary" == parent.GetType().FullName &&
+                        "Source" == property.Name)
                     {
-                        var converterValue = new EXamlValueConverterFromString(context, converterType.Resolve(), valueNode.Value as string);
-                        context.Values[node] = new EXamlCreateObject(context, converterValue, propertyType);
+                        ImportXamlToResourceDictionary(parent, valueNode, context);
+                        needToSetProperty = false;
                     }
                     else
                     {
-                        context.Values[node] = valueNode.GetBaseValue(context, property.PropertyType);
+                        var converterType = valueNode.GetConverterType(new ICustomAttributeProvider[] { property, propertyType.ResolveCached() });
+                        if (null != converterType)
+                        {
+                            var converterValue = new EXamlValueConverterFromString(context, converterType.Resolve(), valueNode.Value as string);
+                            context.Values[node] = new EXamlCreateObject(context, converterValue, propertyType);
+                        }
+                        else
+                        {
+                            context.Values[node] = valueNode.GetBaseValue(context, propertyType);
+                        }
                     }
                 }
             }
@@ -977,7 +988,63 @@ namespace Tizen.NUI.EXaml.Build.Tasks
                 }
             }
 
-            new EXamlSetProperty(context, parent, localName, context.Values[node]);
+            if (needToSetProperty)
+            {
+                new EXamlSetProperty(context, parent, localName, context.Values[node]);
+            }
+        }
+
+        static void ImportXamlToResourceDictionary(EXamlCreateObject parentObj, ValueNode valueNode, EXamlContext context)
+        {
+            var resourceName = valueNode.Value as string;
+
+            foreach (var resource in context.Module.Resources.OfType<EmbeddedResource>())
+            {
+                var embeddedResourceNameSpace = context.EmbeddedResourceNameSpace;
+                if (resource.Name.StartsWith(embeddedResourceNameSpace) && resource.Name.EndsWith(resourceName))
+                {
+                    string classname = null;
+
+                    if (resource.IsResourceDictionaryXaml(context.Module, out classname))
+                    {
+                        int lastIndex = classname.LastIndexOf('.');
+                        var realClassName = classname.Substring(lastIndex + 1);
+                        var typeref = XmlTypeExtensions.GetTypeReference(realClassName, context.Module, valueNode, XmlTypeExtensions.ModeOfGetType.Both);
+
+                        var rootnode = XamlTask.ParseXaml(resource.GetResourceStream(), typeref);
+
+                        var typeDef = typeref.ResolveCached();
+                        var visitorContext = new EXamlContext(typeDef, typeDef.Module, embeddedResourceNameSpace);
+
+                        visitorContext.Values[rootnode] = new EXamlCreateObject(visitorContext, null, rootnode.TypeReference);
+
+                        rootnode.Accept(new XamlNodeVisitor((node, parent) => node.Parent = parent), null);
+                        rootnode.Accept(new EXamlExpandMarkupsVisitor(visitorContext), null);
+                        rootnode.Accept(new PruneIgnoredNodesVisitor(), null);
+                        rootnode.Accept(new EXamlCreateObjectVisitor(visitorContext), null);
+                        rootnode.Accept(new EXamlSetNamescopesAndRegisterNamesVisitor(visitorContext), null);
+                        rootnode.Accept(new EXamlSetFieldVisitor(visitorContext), null);
+                        rootnode.Accept(new EXamlSetResourcesVisitor(visitorContext), null);
+                        rootnode.Accept(new EXamlSetPropertiesVisitor(visitorContext, true), null);
+
+                        foreach (var pair in visitorContext.resourceDictionary)
+                        {
+                            new EXamlAddToResourceDictionary(context, parentObj, pair.Key, pair.Value);
+                        }
+
+                        break;
+                    }
+                }
+            }
+
+            //rootnode.Accept(new XamlNodeVisitor((node, parent) => node.Parent = parent), null);
+            //rootnode.Accept(new EXamlExpandMarkupsVisitor(context), null);
+            //rootnode.Accept(new PruneIgnoredNodesVisitor(), null);
+            //rootnode.Accept(new EXamlCreateObjectVisitor(context), null);
+            //rootnode.Accept(new EXamlSetNamescopesAndRegisterNamesVisitor(context), null);
+            //rootnode.Accept(new EXamlSetFieldVisitor(context), null);
+            //rootnode.Accept(new EXamlSetResourcesVisitor(context), null);
+            //rootnode.Accept(new EXamlSetPropertiesVisitor(context, true), null);
         }
 
         static void Get(EXamlCreateObject parent, string localName, IXmlLineInfo iXmlLineInfo, EXamlContext context, out TypeReference propertyType)