From: huayong.xu <huayong.xu@samsung.com>
Date: Mon, 21 Aug 2023 08:05:09 +0000 (+0800)
Subject: [NUI] Fix some SVACE issues.
X-Git-Tag: accepted/tizen/unified/20231205.024657~187
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4f1504f3e97621b50d2fdfe594cc267b9792509;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Fix some SVACE issues.
---

diff --git a/src/Tizen.NUI.Wearable/src/public/CircularPagination.cs b/src/Tizen.NUI.Wearable/src/public/CircularPagination.cs
index 4c41162..70183d2 100755
--- a/src/Tizen.NUI.Wearable/src/public/CircularPagination.cs
+++ b/src/Tizen.NUI.Wearable/src/public/CircularPagination.cs
@@ -694,7 +694,8 @@ namespace Tizen.NUI.Wearable
         private void UpdateVisual()
         {
             if (null == circularPaginationStyle.IndicatorSize) return;
-            if (null == circularPaginationStyle.IndicatorImageURL) return;
+            var indicatorImageURL = circularPaginationStyle.IndicatorImageURL;
+            if (null == indicatorImageURL) return;
             if (indicatorCount <= 0) return;
 
             for (int i = 0; i < indicatorList.Count; i++)
@@ -713,7 +714,7 @@ namespace Tizen.NUI.Wearable
                     }
                     else
                     {
-                        indicator.URL = circularPaginationStyle.IndicatorImageURL.Selected;
+                        indicator.URL = indicatorImageURL.Selected;
                     }
                     indicator.Opacity = 1.0f;
                 }
@@ -726,7 +727,7 @@ namespace Tizen.NUI.Wearable
                     }
                     else
                     {
-                        indicator.URL = circularPaginationStyle.IndicatorImageURL.Normal;
+                        indicator.URL = indicatorImageURL.Normal;
                     }
                     indicator.Opacity = 0.5f;
                 }
@@ -753,7 +754,8 @@ namespace Tizen.NUI.Wearable
         private void UpdateAsymmetry()
         {
             if (null == circularPaginationStyle.IndicatorSize) return;
-            if (null == circularPaginationStyle.IndicatorImageURL) return;
+            var indicatorImageURL = circularPaginationStyle.IndicatorImageURL;
+            if (null == indicatorImageURL) return;
 
             int listCount = indicatorList.Count;
 
@@ -778,7 +780,7 @@ namespace Tizen.NUI.Wearable
                 }
                 else
                 {
-                    newOne.URL = circularPaginationStyle.IndicatorImageURL.Normal;
+                    newOne.URL = indicatorImageURL.Normal;
                 }
                 newOne.Opacity = 0.5f;
                 container.AddVisual("Indicator" + i, newOne);
@@ -798,7 +800,7 @@ namespace Tizen.NUI.Wearable
             }
             else
             {
-                indicatorList[selectedIndex].URL = circularPaginationStyle.IndicatorImageURL.Selected;
+                indicatorList[selectedIndex].URL = indicatorImageURL.Selected;
                 indicatorList[selectedIndex].Opacity = 1.0f;
             }
         }
diff --git a/src/Tizen.NUI/src/internal/Common/EnumHelper.cs b/src/Tizen.NUI/src/internal/Common/EnumHelper.cs
index 2e5d4d3..93f0508 100755
--- a/src/Tizen.NUI/src/internal/Common/EnumHelper.cs
+++ b/src/Tizen.NUI/src/internal/Common/EnumHelper.cs
@@ -38,9 +38,9 @@ namespace Tizen.NUI
             string result = value.ToString();
             FieldInfo info = typeof(T).GetField(result);
             var attributes = info.GetCustomAttributes(typeof(DescriptionAttribute), true);
-            if (null != attributes?.FirstOrDefault() && (attributes.First() as DescriptionAttribute) != null)
+            if (null != attributes?.FirstOrDefault() && attributes?.First() as DescriptionAttribute is var firstAttribute && firstAttribute != null)
             {
-                result = (attributes.First() as DescriptionAttribute).Description;
+                result = firstAttribute.Description;
             }
 
             return result;
diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs b/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs
index 55edd7d..e82588c 100755
--- a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs
@@ -421,7 +421,7 @@ namespace Tizen.NUI.Xaml
             {
                 var info = assembly.GetManifestResourceInfo(resource);
 
-                if (!string.IsNullOrEmpty(info.FileName) &&
+                if (info != null && !string.IsNullOrEmpty(info.FileName) &&
                     string.Compare(info.FileName, filename, StringComparison.OrdinalIgnoreCase) == 0)
                     return true;
             }
diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs
index 9f8ea51..81581d5 100755
--- a/src/Tizen.NUI/src/public/CustomView/Spin.cs
+++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Binding;
 
@@ -686,7 +687,7 @@ namespace Tizen.NUI
             int previousValue = currentValue;
 
             // If the input value is invalid, change it back to the previous valid value
-            if (int.TryParse(textField.Text, out currentValue))
+            if (int.TryParse(textField.Text, NumberStyles.None, CultureInfo.InvariantCulture, out currentValue))
             {
                 if (currentValue < minValue || currentValue > maxValue)
                 {