[NUI] Add to check xaml image resource (#2799)

- If we create button by xaml, we can't set child resource
- Add BackgroundImage checker for xaml

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Co-authored-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index fd1549f..1d5b02d 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -38,7 +38,7 @@ namespace Tizen.NUI.BaseComponents
             var imageView = (ImageView)bindable;
             string url = (string)newValue;
             url = (url == null ? "" : url);
-            if (imageView.IsCreateByXaml && url.Contains("*Resource*"))
+            if (url.StartsWith("*Resource*"))
             {
                 string resource = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
                 url = url.Replace("*Resource*", resource);
@@ -73,7 +73,7 @@ namespace Tizen.NUI.BaseComponents
                     bool ret = false;
                     if (urlValue != null) ret = urlValue.Get(out url);
                     PropertyMap mmap = new PropertyMap();
-                    if (ret && url.Contains("*Resource*"))
+                    if (ret && url.StartsWith("*Resource*"))
                     {
                         url = url.Replace("*Resource*", resource);
                         mmap.Insert(NDalic.ImageVisualUrl, new PropertyValue(url));
@@ -82,7 +82,7 @@ namespace Tizen.NUI.BaseComponents
                     ret = false;
                     PropertyValue alphaMaskUrlValue = map.Find(NDalic.ImageVisualAlphaMaskUrl);
                     if (alphaMaskUrlValue != null) ret = alphaMaskUrlValue.Get(out alphaMaskURL);
-                    if (ret && alphaMaskURL.Contains("*Resource*"))
+                    if (ret && alphaMaskURL.StartsWith("*Resource*"))
                     {
                         alphaMaskURL = alphaMaskURL.Replace("*Resource*", resource);
                         mmap.Insert(NDalic.ImageVisualUrl, new PropertyValue(alphaMaskURL));
@@ -91,7 +91,7 @@ namespace Tizen.NUI.BaseComponents
                     ret = false;
                     PropertyValue auxiliaryImageURLValue = map.Find(NDalic.ImageVisualAuxiliaryImageUrl);
                     if (auxiliaryImageURLValue != null) ret = auxiliaryImageURLValue.Get(out auxiliaryImageURL);
-                    if (ret && auxiliaryImageURL.Contains("*Resource*"))
+                    if (ret && auxiliaryImageURL.StartsWith("*Resource*"))
                     {
                         auxiliaryImageURL = auxiliaryImageURL.Replace("*Resource*", resource);
                         mmap.Insert(NDalic.ImageVisualAuxiliaryImageUrl, new PropertyValue(auxiliaryImageURL));

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
index ebd1d80..e2507d0 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
@@ -149,6 +149,12 @@ namespace Tizen.NUI.BaseComponents
                 return;
             }
 
+            if (url.StartsWith("*Resource*"))
+            {
+                string resource = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+                url = url.Replace("*Resource*", resource);
+            }
+
             if (view.backgroundExtraData == null)
             {
                 Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.BACKGROUND, new PropertyValue(url));