Support new features of Tizen.CircularUI (#188)

[platform/core/csapi/xsf.git] / src / XSF / Tizen.Wearable.CircularUI.Forms.Renderer / InformationPopupImplementation.cs

diff --git a/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs b/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs
index 87b39d3..d867e35 100644 (file)
--- a/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs
+++ b/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs
@@ -85,7 +85,7 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
                                        _box = null;
                                }
 
-                               if(_progress != null)
+                               if (_progress != null)
                                {
                                        _progress.Unrealize();
                                        _progress = null;
@@ -181,7 +181,7 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
 
                void UpdateProcessVisibility()
                {
-                       if(!XForms.IsInitialized)
+                       if (!XForms.IsInitialized)
                        {
                                Log.Debug(FormsCircularUI.Tag, "Tizen Forms is not initialized");
                                return;
@@ -241,7 +241,7 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
                                        Style = "bottom"
                                };
 
-                               if (!string.IsNullOrEmpty(BottomButton.Text))_bottomButton.Text = BottomButton.Text;
+                               if (!string.IsNullOrEmpty(BottomButton.Text)) _bottomButton.Text = BottomButton.Text;
 
                                if (!BottomButton.IconImageSource.IsNullOrEmpty())
                                {
@@ -274,9 +274,14 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
 
                void UpdateTitle()
                {
+                       string title = _title?.Replace("&", "&")
+                                                                 .Replace("<", "&lt;")
+                                                                 .Replace(">", "&gt;")
+                                                                 .Replace(Environment.NewLine, "<br>");
+
                        if (!_isProgressRunning)
                        {
-                               _layout.SetPartText("elm.text.title", _title);
+                               _layout.SetPartText("elm.text.title", title);
                        }
                        else
                        {
@@ -286,14 +291,19 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
 
                void UpdateText()
                {
+                       string text = _text?.Replace("&", "&amp;")
+                                                               .Replace("<", "&lt;")
+                                                               .Replace(">", "&gt;")
+                                                               .Replace(Environment.NewLine, "<br>");
+
                        if (!_isProgressRunning)
                        {
-                               _layout.SetPartText("elm.text", _text);
+                               _layout.SetPartText("elm.text", text);
                        }
                        else
                        {
                                _layout.SetPartText("elm.text", null);
-                               if (!string.IsNullOrEmpty(_text))
+                               if (!string.IsNullOrEmpty(text))
                                {
                                        if (_progressLabel == null)
                                        {
@@ -302,7 +312,7 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
                                                        TextStyle = "DEFAULT ='font=Tizen:style=Light color=#F9F9F9FF font_size=32 align=center valign=top wrap=word'",
                                                };
                                        }
-                                       _progressLabel.Text = _text;
+                                       _progressLabel.Text = text;
                                        _progressLabel.Show();
                                        if (_box != null)
                                        {