[NUI] ThemeManager.GetStyle returns integrate style and fix some bugs.

* ThemeManager.GetStyle returns integrated style instead user style.
* Fix bug that access null string.

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
index db50bf5..73f571a 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
@@ -1385,15 +1385,20 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void InitializeStyle(ViewStyle style = null)
         {
-            // First, apply initial style if needs.
             var initialStyle = ThemeManager.GetInitialStyleWithoutClone(GetType());
-            if (style == null || style.IncludeDefaultStyle)
+            if (style == null)
             {
                 ApplyStyle(initialStyle);
             }
-
-            // Then, apply given style.
-            ApplyStyle(style);
+            else
+            {
+                var refinedStyle = style;
+                if (style.IncludeDefaultStyle)
+                {
+                    refinedStyle = initialStyle?.Merge(style);
+                }
+                ApplyStyle(style);
+            }
 
             // Listen theme change event if needs.
             if (ThemeManager.PlatformThemeEnabled && initialStyle != null)

diff --git a/src/Tizen.NUI/src/public/Theme/ThemeManager.cs b/src/Tizen.NUI/src/public/Theme/ThemeManager.cs
index ffacf44..44b6cae 100755 (executable)
--- a/src/Tizen.NUI/src/public/Theme/ThemeManager.cs
+++ b/src/Tizen.NUI/src/public/Theme/ThemeManager.cs
@@ -192,7 +192,7 @@ namespace Tizen.NUI
         public static ViewStyle GetStyle(string styleName)
         {
             if (styleName == null) throw new ArgumentNullException(nameof(styleName));
-            return GetStyleWithoutClone(styleName)?.Clone();
+            return GetInitialStyleWithoutClone(styleName)?.Clone();
         }
 
         /// <summary>
@@ -205,7 +205,7 @@ namespace Tizen.NUI
         public static ViewStyle GetStyle(Type viewType)
         {
             if (viewType == null) throw new ArgumentNullException(nameof(viewType));
-            return GetStyleWithoutClone(viewType)?.Clone();
+            return GetInitialStyleWithoutClone(viewType)?.Clone();
         }
 
         /// <summary>
@@ -238,18 +238,6 @@ namespace Tizen.NUI
         /// Load a style with style name in the current theme.
         /// </summary>
         /// <param name="styleName">The style name.</param>
-        internal static ViewStyle GetStyleWithoutClone(string styleName) => userTheme?.GetStyle(styleName);
-
-        /// <summary>
-        /// Load a style with View type in the current theme.
-        /// </summary>
-        /// <param name="viewType">The type of View.</param>
-        internal static ViewStyle GetStyleWithoutClone(Type viewType) => userTheme?.GetStyle(viewType);
-
-        /// <summary>
-        /// Load a style with style name in the current theme.
-        /// </summary>
-        /// <param name="styleName">The style name.</param>
         internal static ViewStyle GetUpdateStyleWithoutClone(string styleName) => themeForUpdate?.GetStyle(styleName);
 
         /// <summary>
@@ -384,7 +372,7 @@ namespace Tizen.NUI
                 }
                 else
                 {
-                    if (!baseTheme.HasSameIdAndVersion(ExternalThemeManager.CurrentThemeId, ExternalThemeManager.CurrentThemeVersion))
+                    if (!string.IsNullOrEmpty(ExternalThemeManager.CurrentThemeId) && !baseTheme.HasSameIdAndVersion(ExternalThemeManager.CurrentThemeId, ExternalThemeManager.CurrentThemeVersion))
                     {
                         var loaded = LoadPlatformTheme(ExternalThemeManager.CurrentThemeId);
                         if (loaded != null)