[NUI] Enhance button relayout and change styles

* Enhance button relayout logic
* Change default item alignments
* Change resource to png from svg

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

diff --git a/src/Tizen.NUI.Components/Controls/Button.Internal.cs b/src/Tizen.NUI.Components/Controls/Button.Internal.cs
index 33f85a7..883bf2e 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Button.Internal.cs
+++ b/src/Tizen.NUI.Components/Controls/Button.Internal.cs
@@ -289,6 +289,11 @@ namespace Tizen.NUI.Components
         {
             Debug.Assert(size != null);
 
+            if (size.Equals(this.size))
+            {
+                return;
+            }
+
             this.size = new Vector2(size);
 
             UpdateSizeAndSpacing();

diff --git a/src/Tizen.NUI.Components/Controls/Button.cs b/src/Tizen.NUI.Components/Controls/Button.cs
index 042e662..09c930a 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Button.cs
+++ b/src/Tizen.NUI.Components/Controls/Button.cs
@@ -158,8 +158,13 @@ namespace Tizen.NUI.Components
         internal static readonly BindableProperty ItemAlignmentProperty = BindableProperty.Create(nameof(ItemAlignment), typeof(LinearLayout.Alignment), typeof(Button), LinearLayout.Alignment.Center, propertyChanged: (bindable, oldValue, newValue) =>
         {
             var instance = (Button)bindable;
-            instance.itemAlignment = (LinearLayout.Alignment)newValue;
-            instance.LayoutItems();
+            var newAlignment = (LinearLayout.Alignment)newValue;
+
+            if (instance.itemAlignment != newAlignment)
+            {
+                instance.itemAlignment = newAlignment;
+                instance.LayoutItems();   
+            }
         },
         defaultValueCreator: (bindable) => ((Button)bindable).itemAlignment);
 
@@ -178,7 +183,7 @@ namespace Tizen.NUI.Components
         private bool isSelectable = false;
         private bool isEnabled = true;
         private Size2D itemSpacing;
-        private LinearLayout.Alignment itemAlignment;
+        private LinearLayout.Alignment itemAlignment = LinearLayout.Alignment.Center;
 
         static Button() { }
 

diff --git a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
index 48f98b6..9649e8c 100755 (executable)
--- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
+++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
@@ -56,20 +56,20 @@ namespace Tizen.NUI.Components
             theme.AddStyleWithoutClone("Tizen.NUI.Components.CheckBox", new ButtonStyle()
             {
                 ItemSpacing = new Size2D(32, 32),
-                ItemAlignment = LinearLayout.Alignment.Begin,
+                ItemAlignment = LinearLayout.Alignment.CenterVertical,
                 Icon = new ImageViewStyle()
                 {
                     Size = new Size(36, 36),
                     ResourceUrl = new Selector<string>()
                     {
-                        Normal = FrameworkInformation.ResourcePath + "IoT_check_off.svg",
-                        Pressed = FrameworkInformation.ResourcePath + "IoT_check_off_p.svg",
-                        Disabled = FrameworkInformation.ResourcePath + "IoT_check_off_d.svg",
-                        Focused = FrameworkInformation.ResourcePath + "IoT_check_off_f.svg",
-                        Selected = FrameworkInformation.ResourcePath + "IoT_check_on.svg",
-                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_check_on_p.svg",
-                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_check_on_f.svg",
-                        DisabledSelected = FrameworkInformation.ResourcePath + "IoT_check_on_d.svg",
+                        Normal = FrameworkInformation.ResourcePath + "IoT_check_off.png",
+                        Pressed = FrameworkInformation.ResourcePath + "IoT_check_off_p.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_check_off_d.png",
+                        Focused = FrameworkInformation.ResourcePath + "IoT_check_off_f.png",
+                        Selected = FrameworkInformation.ResourcePath + "IoT_check_on.png",
+                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_check_on_p.png",
+                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_check_on_f.png",
+                        DisabledSelected = FrameworkInformation.ResourcePath + "IoT_check_on_d.png",
                     },
                 },
                 Text = new TextLabelStyle()
@@ -138,20 +138,20 @@ namespace Tizen.NUI.Components
             theme.AddStyleWithoutClone("Tizen.NUI.Components.RadioButton", new ButtonStyle()
             {
                 ItemSpacing = new Size2D(32, 32),
-                ItemAlignment = LinearLayout.Alignment.Begin,
+                ItemAlignment = LinearLayout.Alignment.CenterVertical,
                 Icon = new ImageViewStyle()
                 {
                     Size = new Size(36, 36),
                     ResourceUrl = new Selector<string>()
                     {
-                        Normal = FrameworkInformation.ResourcePath + "IoT_radiobutton_off.svg",
-                        Pressed = FrameworkInformation.ResourcePath + "IoT_radiobutton_off_p.svg",
-                        Disabled = FrameworkInformation.ResourcePath + "IoT_radiobutton_off_d.svg",
-                        Focused = FrameworkInformation.ResourcePath + "IoT_radiobutton_off_f.svg",
-                        Selected = FrameworkInformation.ResourcePath + "IoT_radiobutton_on.svg",
-                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_radiobutton_on_p.svg",
-                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_radiobutton_on_f.svg",
-                        DisabledSelected = FrameworkInformation.ResourcePath + "IoT_radiobutton_on_d.svg",
+                        Normal = FrameworkInformation.ResourcePath + "IoT_radiobutton_off.png",
+                        Pressed = FrameworkInformation.ResourcePath + "IoT_radiobutton_off_p.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_radiobutton_off_d.png",
+                        Focused = FrameworkInformation.ResourcePath + "IoT_radiobutton_off_f.png",
+                        Selected = FrameworkInformation.ResourcePath + "IoT_radiobutton_on.png",
+                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_radiobutton_on_p.png",
+                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_radiobutton_on_f.png",
+                        DisabledSelected = FrameworkInformation.ResourcePath + "IoT_radiobutton_on_d.png",
                     },
                 },
                 Text = new TextLabelStyle()
@@ -193,20 +193,20 @@ namespace Tizen.NUI.Components
             theme.AddStyleWithoutClone("Tizen.NUI.Components.Switch", new SwitchStyle()
             {
                 ItemSpacing = new Size2D(32, 32),
-                ItemAlignment = LinearLayout.Alignment.Begin,
+                ItemAlignment = LinearLayout.Alignment.CenterVertical,
                 Track = new ImageViewStyle()
                 {
                     Size = new Size(80, 40),
                     ResourceUrl = new Selector<string>()
                     {
-                        Normal = FrameworkInformation.ResourcePath + "IoT_switch_track_off.svg",
-                        Pressed = FrameworkInformation.ResourcePath + "IoT_switch_track_off_p.svg",
-                        Disabled = FrameworkInformation.ResourcePath + "IoT_switch_track_off_d.svg",
-                        Focused = FrameworkInformation.ResourcePath + "IoT_switch_track_off_f.svg",
-                        Selected = FrameworkInformation.ResourcePath + "IoT_switch_track_on.svg",
-                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_switch_track_on_p.svg",
-                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_switch_track_on_f.svg",
-                        DisabledSelected = FrameworkInformation.ResourcePath + "IoT_switch_track_on_d.svg",
+                        Normal = FrameworkInformation.ResourcePath + "IoT_switch_track_off.png",
+                        Pressed = FrameworkInformation.ResourcePath + "IoT_switch_track_off_p.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_switch_track_off_d.png",
+                        Focused = FrameworkInformation.ResourcePath + "IoT_switch_track_off_f.png",
+                        Selected = FrameworkInformation.ResourcePath + "IoT_switch_track_on.png",
+                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_switch_track_on_p.png",
+                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_switch_track_on_f.png",
+                        DisabledSelected = FrameworkInformation.ResourcePath + "IoT_switch_track_on_d.png",
                     },
                 },
                 Thumb = new ImageViewStyle()
@@ -214,11 +214,11 @@ namespace Tizen.NUI.Components
                     Size = new Size(40, 40),
                     ResourceUrl = new Selector<string>()
                     {
-                        Normal = FrameworkInformation.ResourcePath + "IoT_switch_thumb.svg",
-                        Disabled = FrameworkInformation.ResourcePath + "IoT_switch_thumb_d.svg",
-                        Selected = FrameworkInformation.ResourcePath + "IoT_switch_thumb_s.svg",
-                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_switch_thumb_sp.svg",
-                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_switch_thumb_sf.svg",
+                        Normal = FrameworkInformation.ResourcePath + "IoT_switch_thumb.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_switch_thumb_d.png",
+                        Selected = FrameworkInformation.ResourcePath + "IoT_switch_thumb_s.png",
+                        SelectedPressed = FrameworkInformation.ResourcePath + "IoT_switch_thumb_sp.png",
+                        SelectedFocused = FrameworkInformation.ResourcePath + "IoT_switch_thumb_sf.png",
                     }
                 },
                 Text = new TextLabelStyle()

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off.png b/src/Tizen.NUI.Components/res/IoT_check_off.png
new file mode 100644 (file)
index 0000000..9e45fd2
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_off.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off.svg b/src/Tizen.NUI.Components/res/IoT_check_off.svg
deleted file mode 100644 (file)
index 6938727..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_off.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38">
-    <rect fill="none" width="36" height="36" rx="8" stroke="#000c2b" stroke-width="2"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off_d.png b/src/Tizen.NUI.Components/res/IoT_check_off_d.png
new file mode 100644 (file)
index 0000000..7aba7cf
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_off_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off_d.svg b/src/Tizen.NUI.Components/res/IoT_check_off_d.svg
deleted file mode 100644 (file)
index ecb7299..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_off_d.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38">
-    <rect fill="none" width="36" height="36" rx="8" stroke="#c3cad2" stroke-width="2"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off_f.png b/src/Tizen.NUI.Components/res/IoT_check_off_f.png
new file mode 100644 (file)
index 0000000..b8a7d0d
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_off_f.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off_f.svg b/src/Tizen.NUI.Components/res/IoT_check_off_f.svg
deleted file mode 100644 (file)
index c7315da..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_off_f.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38">
-    <rect fill="none" width="36" height="36" rx="8" stroke="#2b5fb9" stroke-width="2"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off_p.png b/src/Tizen.NUI.Components/res/IoT_check_off_p.png
new file mode 100644 (file)
index 0000000..31f454a
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_off_p.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off_p.svg b/src/Tizen.NUI.Components/res/IoT_check_off_p.svg
deleted file mode 100644 (file)
index 05999ad..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_off_p.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38">
-    <rect fill="none" width="36" height="36" rx="8" stroke="#00338b" stroke-width="2"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on.png b/src/Tizen.NUI.Components/res/IoT_check_on.png
new file mode 100644 (file)
index 0000000..43ed9f3
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_on.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on.svg b/src/Tizen.NUI.Components/res/IoT_check_on.svg
deleted file mode 100644 (file)
index b324283..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_on.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36">
-    <rect fill="#000c2b" width="36" height="36" rx="8"/>
-    <path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="M19447.816-2224.72l10.031,11.272,17.969-22.257" transform="translate(-19444 2242)"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on_d.png b/src/Tizen.NUI.Components/res/IoT_check_on_d.png
new file mode 100644 (file)
index 0000000..c5996ee
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_on_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on_d.svg b/src/Tizen.NUI.Components/res/IoT_check_on_d.svg
deleted file mode 100644 (file)
index a1c659a..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_on_d.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36">
-    <rect fill="#c3cad2" width="36" height="36" rx="8"/>
-    <path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="M19447.816-2224.72l10.031,11.272,17.969-22.257" transform="translate(-19444 2242)"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on_f.png b/src/Tizen.NUI.Components/res/IoT_check_on_f.png
new file mode 100644 (file)
index 0000000..91be569
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_on_f.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on_f.svg b/src/Tizen.NUI.Components/res/IoT_check_on_f.svg
deleted file mode 100644 (file)
index 051e746..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_on_f.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36">
-    <rect fill="#2b5fb9" width="36" height="36" rx="8"/>
-    <path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="M19447.816-2224.72l10.031,11.272,17.969-22.257" transform="translate(-19444 2242)"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on_p.png b/src/Tizen.NUI.Components/res/IoT_check_on_p.png
new file mode 100644 (file)
index 0000000..b4079c4
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_check_on_p.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_check_on_p.svg b/src/Tizen.NUI.Components/res/IoT_check_on_p.svg
deleted file mode 100644 (file)
index 0730065..0000000
--- a/src/Tizen.NUI.Components/res/IoT_check_on_p.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36">
-    <rect fill="#00338b" width="36" height="36" rx="8"/>
-    <path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="M19447.816-2224.72l10.031,11.272,17.969-22.257" transform="translate(-19444 2242)"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_off.png
new file mode 100644 (file)
index 0000000..1be8156
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_off.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off.svg
deleted file mode 100644 (file)
index ae68f25..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1.5 -1.5 39 39"><circle cx="18" cy="18" r="18" stroke="#000c2b" stroke-width="3" fill="none"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.png
new file mode 100644 (file)
index 0000000..dc659f8
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.svg
deleted file mode 100644 (file)
index 1985700..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1.5 -1.5 39 39"><circle cx="18" cy="18" r="18" stroke="#c3cad2" stroke-width="3" fill="none"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.png
new file mode 100644 (file)
index 0000000..65d93c6
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.svg
deleted file mode 100644 (file)
index b1560f1..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1.5 -1.5 39 39"><circle cx="18" cy="18" r="18" stroke="#2b5fb9" stroke-width="3" fill="none"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.png
new file mode 100644 (file)
index 0000000..d3c9464
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.svg
deleted file mode 100644 (file)
index 71c0162..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1.5 -1.5 39 39"><circle cx="18" cy="18" r="18" stroke="#00338b" stroke-width="3" fill="none"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_on.png
new file mode 100644 (file)
index 0000000..db4b5a9
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_on.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on.svg
deleted file mode 100644 (file)
index 762f9b3..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38"><circle cx="18" cy="18" r="18" stroke="#000c2b" stroke-width="2" fill="none"/><circle cx="18" cy="18" r="12" fill="#000c2b"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.png
new file mode 100644 (file)
index 0000000..4e30b7f
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.svg
deleted file mode 100644 (file)
index b1ad58a..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38"><circle cx="18" cy="18" r="18" stroke="#c3cad2" stroke-width="2" fill="none"/><circle cx="18" cy="18" r="12" fill="#c3cad2"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.png
new file mode 100644 (file)
index 0000000..7c3afab
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.svg
deleted file mode 100644 (file)
index 8700ee1..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38"><circle cx="18" cy="18" r="18" stroke="#2b5fb9" stroke-width="2" fill="none"/><circle cx="18" cy="18" r="12" fill="#2b5fb9"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.png b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.png
new file mode 100644 (file)
index 0000000..1a83ae3
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.svg
deleted file mode 100644 (file)
index d1fb04a..0000000
--- a/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-1 -1 38 38"><circle cx="18" cy="18" r="18" stroke="#00338b" stroke-width="2" fill="none"/><circle cx="18" cy="18" r="12" fill="#00338b"/></svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb.png b/src/Tizen.NUI.Components/res/IoT_switch_thumb.png
new file mode 100644 (file)
index 0000000..2f3b0c9
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_thumb.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb.svg
deleted file mode 100644 (file)
index 913ab6c..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_thumb.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-2 -2 40 40">
-    <circle fill="#c3cad2" cx="18" cy="18" r="18"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.png b/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.png
new file mode 100644 (file)
index 0000000..3dc08b6
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.svg
deleted file mode 100644 (file)
index 9476d69..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-2 -2 40 40">
-    <circle fill="#c3cad2" cx="18" cy="18" r="18" stroke="#fff"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.png b/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.png
new file mode 100644 (file)
index 0000000..70f901d
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.svg
deleted file mode 100644 (file)
index 0701fc9..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-2 -2 40 40">
-    <circle fill="#000660" cx="18" cy="18" r="18"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.png b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.png
new file mode 100644 (file)
index 0000000..1dd042c
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.svg
deleted file mode 100644 (file)
index 991876f..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-2 -2 40 40">
-    <circle fill="#2b5fb9" cx="18" cy="18" r="18"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.png b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.png
new file mode 100644 (file)
index 0000000..2bec135
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.svg
deleted file mode 100644 (file)
index 6a2c071..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="-2 -2 40 40">
-    <circle fill="#00338b" cx="18" cy="18" r="18"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off.png b/src/Tizen.NUI.Components/res/IoT_switch_track_off.png
new file mode 100644 (file)
index 0000000..866c29f
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_off.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off.svg
deleted file mode 100644 (file)
index 7c26f08..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_off.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.5 -0.5 81 41">
-    <rect fill="#fff" width="80" height="40" rx="20" stroke="#c3cad2"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.png b/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.png
new file mode 100644 (file)
index 0000000..b2f0f27
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.svg
deleted file mode 100644 (file)
index f8ce0a6..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="0 0 80 40">
-    <rect fill="#c3cad2" width="80" height="40" rx="20"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.png b/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.png
new file mode 100644 (file)
index 0000000..f9e8e5c
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.svg
deleted file mode 100644 (file)
index c7c8856..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.5 -0.5 81 41">
-    <rect fill="#fff" width="80" height="40" rx="20" stroke="#2b5fb9"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.png b/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.png
new file mode 100644 (file)
index 0000000..02c01b7
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.svg
deleted file mode 100644 (file)
index f8a0b72..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.5 -0.5 81 41">
-    <rect fill="#fff" width="80" height="40" rx="20" stroke="#00338b"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on.png b/src/Tizen.NUI.Components/res/IoT_switch_track_on.png
new file mode 100644 (file)
index 0000000..aa6b93f
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_on.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on.svg
deleted file mode 100644 (file)
index c039e88..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_on.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.25 -0.25 80.5 40.5">
-    <rect fill="#f2f7ff" width="80" height="40" rx="20" stroke="#0a0e4a" stroke-width="0.5"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.png b/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.png
new file mode 100644 (file)
index 0000000..5046ce8
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.svg
deleted file mode 100644 (file)
index 477333e..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.25 -0.25 80.5 40.5">
-    <rect fill="#c3cad2" width="80" height="40" rx="20" stroke="#000660" stroke-width="0.5"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.png b/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.png
new file mode 100644 (file)
index 0000000..e8340c2
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.svg
deleted file mode 100644 (file)
index e8dfdb7..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.25 -0.25 80.5 40.5">
-    <rect fill="#f2f7ff" width="80" height="40" rx="20" stroke="#2b5fb9" stroke-width="0.5"/>
-</svg>
\ No newline at end of file

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.png b/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.png
new file mode 100644 (file)
index 0000000..cf2a9f4
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.png differ

diff --git a/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.svg
deleted file mode 100644 (file)
index 53d8c86..0000000
--- a/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="40" viewBox="-0.25 -0.25 80.5 40.5">
-    <rect fill="#f2f7ff" width="80" height="40" rx="20" stroke="#00338b" stroke-width="0.5"/>
-</svg>
\ No newline at end of file