[NUI] Update 6.5 UX for CheckBox, Switch and RadioButton (#2773)

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

diff --git a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
index c5214a1..53b0231 100755 (executable)
--- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
+++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
@@ -54,38 +54,26 @@ namespace Tizen.NUI.Components
 
             theme.AddStyleWithoutClone("Tizen.NUI.Components.CheckBox", new ButtonStyle()
             {
-                TextPadding = 5,
+                TextPadding = new Extents(32, 0, 0, 0),
                 Icon = new ImageViewStyle()
                 {
-                    Size = new Size(30, 30),
-                    Opacity = new Selector<float?>()
-                    {
-                        Normal = 1.0f,
-                        Disabled = 0.4f,
-                        Selected = 1.0f,
-                    },
-                    BackgroundImage = new Selector<string>()
-                    {
-                        Pressed = FrameworkInformation.ResourcePath + "nui_component_default_checkbox_bg_p.png",
-                        Selected = FrameworkInformation.ResourcePath + "nui_component_default_checkbox_bg_p.png",
-                        Other = FrameworkInformation.ResourcePath + "nui_component_default_checkbox_bg_n.png",
-                    },
+                    Size = new Size(36, 36),
                     ResourceUrl = new Selector<string>()
                     {
-                        Pressed = "",
-                        Selected = FrameworkInformation.ResourcePath + "nui_component_default_checkbox_s.png",
-                        Other = "",
+                        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",
                     },
                 },
                 Text = new TextLabelStyle()
                 {
-                    PointSize = 12,
-                    TextColor = new Selector<Color>()
-                    {
-                        Normal = new Color(0.22f, 0.22f, 0.22f, 1),
-                        Pressed = new Color(0.11f, 0.11f, 0.11f, 1),
-                        Disabled = new Color(0.66f, 0.66f, 0.66f, 1),
-                    }
+                    PixelSize = 32,
+                    TextColor = new Color("#001447")
                 }
             });
 
@@ -146,32 +134,26 @@ namespace Tizen.NUI.Components
 
             theme.AddStyleWithoutClone("Tizen.NUI.Components.RadioButton", new ButtonStyle()
             {
-                IconPadding = 5,
+                TextPadding = new Extents(32, 0, 0, 0),
                 Icon = new ImageViewStyle()
                 {
-                    Size = new Size(30, 30),
-                    Opacity = new Selector<float?>()
+                    Size = new Size(36, 36),
+                    ResourceUrl = new Selector<string>()
                     {
-                        Normal = 1.0f,
-                        Disabled = 0.4f,
-                        Selected = 1.0f,
+                        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",
                     },
-                    BackgroundImage = new Selector<string>()
-                    {
-                        Pressed = FrameworkInformation.ResourcePath + "nui_component_default_radiobutton_p.png",
-                        Selected = FrameworkInformation.ResourcePath + "nui_component_default_radiobutton_s.png",
-                        Other = FrameworkInformation.ResourcePath + "nui_component_default_radiobutton_n.png",
-                    }
                 },
                 Text = new TextLabelStyle()
                 {
-                    PointSize = 12,
-                    TextColor = new Selector<Color>()
-                    {
-                        Normal = new Color(0.22f, 0.22f, 0.22f, 1),
-                        Pressed = new Color(0.11f, 0.11f, 0.11f, 1),
-                        Disabled = new Color(0.66f, 0.66f, 0.66f, 1),
-                    }
+                    PixelSize = 32,
+                    TextColor = new Color("#001447")
                 }
             });
 
@@ -206,37 +188,38 @@ namespace Tizen.NUI.Components
 
             theme.AddStyleWithoutClone("Tizen.NUI.Components.Switch", new SwitchStyle()
             {
-                IconPadding = 5,
+                TextPadding = new Extents(32, 0, 0, 0),
                 Track = new ImageViewStyle()
                 {
-                    Size = new Size(96, 60),
+                    Size = new Size(80, 40),
                     ResourceUrl = new Selector<string>()
                     {
-                        Normal = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_n.png",
-                        Selected = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_s.png",
-                        Disabled = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_d.png",
-                        DisabledSelected = FrameworkInformation.ResourcePath + "nui_component_default_switch_track_ds.png",
-                    }
+                        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",
+                    },
                 },
                 Thumb = new ImageViewStyle()
                 {
-                    Size = new Size(60, 60),
+                    Size = new Size(40, 40),
                     ResourceUrl = new Selector<string>()
                     {
-                        Normal = FrameworkInformation.ResourcePath + "nui_component_default_switch_thumb_n.png",
-                        Disabled = FrameworkInformation.ResourcePath + "nui_component_default_switch_thumb_d.png",
-                        Selected = FrameworkInformation.ResourcePath + "nui_component_default_switch_thumb_n.png",
+                        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",
                     }
                 },
                 Text = new TextLabelStyle()
                 {
-                    PointSize = 12,
-                    TextColor = new Selector<Color>()
-                    {
-                        Normal = new Color(0.22f, 0.22f, 0.22f, 1),
-                        Pressed = new Color(0.11f, 0.11f, 0.11f, 1),
-                        Disabled = new Color(0.66f, 0.66f, 0.66f, 1),
-                    }
+                    PixelSize = 32,
+                    TextColor = new Color("#001447")
                 }
             });
 

diff --git a/src/Tizen.NUI.Components/Tizen.NUI.Components.csproj b/src/Tizen.NUI.Components/Tizen.NUI.Components.csproj
index 56924db..b701655 100755 (executable)
--- a/src/Tizen.NUI.Components/Tizen.NUI.Components.csproj
+++ b/src/Tizen.NUI.Components/Tizen.NUI.Components.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="res\*.png">
+    <None Update="res\*.png;res\*.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/src/Tizen.NUI.Components/res/IoT_check_off.svg b/src/Tizen.NUI.Components/res/IoT_check_off.svg
new file mode 100644 (file)
index 0000000..6938727
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_off.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_off_d.svg
new file mode 100644 (file)
index 0000000..ecb7299
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_off_d.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_off_f.svg
new file mode 100644 (file)
index 0000000..c7315da
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_off_f.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_off_p.svg
new file mode 100644 (file)
index 0000000..05999ad
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_off_p.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_on.svg
new file mode 100644 (file)
index 0000000..b324283
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_on.svg
@@ -0,0 +1,4 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_on_d.svg
new file mode 100644 (file)
index 0000000..a1c659a
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_on_d.svg
@@ -0,0 +1,4 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_on_f.svg
new file mode 100644 (file)
index 0000000..051e746
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_on_f.svg
@@ -0,0 +1,4 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_check_on_p.svg
new file mode 100644 (file)
index 0000000..0730065
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_check_on_p.svg
@@ -0,0 +1,4 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off.svg
new file mode 100644 (file)
index 0000000..ae68f25
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_off.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.svg
new file mode 100644 (file)
index 0000000..1985700
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_d.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.svg
new file mode 100644 (file)
index 0000000..b1560f1
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_f.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.svg
new file mode 100644 (file)
index 0000000..71c0162
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_off_p.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on.svg
new file mode 100644 (file)
index 0000000..762f9b3
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_on.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.svg
new file mode 100644 (file)
index 0000000..b1ad58a
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_d.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.svg
new file mode 100644 (file)
index 0000000..8700ee1
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_f.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.svg
new file mode 100644 (file)
index 0000000..d1fb04a
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_radiobutton_on_p.svg
@@ -0,0 +1 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb.svg
new file mode 100644 (file)
index 0000000..913ab6c
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_thumb.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.svg
new file mode 100644 (file)
index 0000000..9476d69
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_thumb_d.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.svg
new file mode 100644 (file)
index 0000000..0701fc9
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_thumb_s.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.svg
new file mode 100644 (file)
index 0000000..991876f
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sf.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.svg
new file mode 100644 (file)
index 0000000..6a2c071
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_thumb_sp.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off.svg
new file mode 100644 (file)
index 0000000..7c26f08
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_off.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.svg
new file mode 100644 (file)
index 0000000..f8ce0a6
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_off_d.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.svg
new file mode 100644 (file)
index 0000000..c7c8856
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_off_f.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.svg
new file mode 100644 (file)
index 0000000..f8a0b72
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_off_p.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on.svg
new file mode 100644 (file)
index 0000000..c039e88
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_on.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.svg
new file mode 100644 (file)
index 0000000..477333e
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_on_d.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.svg
new file mode 100644 (file)
index 0000000..e8dfdb7
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_on_f.svg
@@ -0,0 +1,3 @@
+<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.svg b/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.svg
new file mode 100644 (file)
index 0000000..53d8c86
--- /dev/null
+++ b/src/Tizen.NUI.Components/res/IoT_switch_track_on_p.svg
@@ -0,0 +1,3 @@
+<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

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_checkbox_bg_n.png b/src/Tizen.NUI.Components/res/nui_component_default_checkbox_bg_n.png
deleted file mode 100755 (executable)
index fd70968..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_checkbox_bg_n.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_checkbox_bg_p.png b/src/Tizen.NUI.Components/res/nui_component_default_checkbox_bg_p.png
deleted file mode 100755 (executable)
index 9a3af3a..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_checkbox_bg_p.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_checkbox_s.png b/src/Tizen.NUI.Components/res/nui_component_default_checkbox_s.png
deleted file mode 100755 (executable)
index 4d22858..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_checkbox_s.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_n.png b/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_n.png
deleted file mode 100755 (executable)
index d423241..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_n.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_p.png b/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_p.png
deleted file mode 100755 (executable)
index e9dc2a0..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_p.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_s.png b/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_s.png
deleted file mode 100755 (executable)
index d08e8e7..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_radiobutton_s.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_switch_thumb_d.png b/src/Tizen.NUI.Components/res/nui_component_default_switch_thumb_d.png
deleted file mode 100755 (executable)
index cc87048..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_switch_thumb_d.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_switch_thumb_n.png b/src/Tizen.NUI.Components/res/nui_component_default_switch_thumb_n.png
deleted file mode 100755 (executable)
index edafdc1..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_switch_thumb_n.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_d.png b/src/Tizen.NUI.Components/res/nui_component_default_switch_track_d.png
deleted file mode 100755 (executable)
index 5c62b94..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_d.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_ds.png b/src/Tizen.NUI.Components/res/nui_component_default_switch_track_ds.png
deleted file mode 100755 (executable)
index 427763b..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_ds.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_n.png b/src/Tizen.NUI.Components/res/nui_component_default_switch_track_n.png
deleted file mode 100755 (executable)
index 93fd2c4..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_n.png and /dev/null differ

diff --git a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_s.png b/src/Tizen.NUI.Components/res/nui_component_default_switch_track_s.png
deleted file mode 100755 (executable)
index 128f236..0000000
Binary files a/src/Tizen.NUI.Components/res/nui_component_default_switch_track_s.png and /dev/null differ

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs b/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs
index a379120..8299a9a 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs
@@ -62,6 +62,11 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly ControlState Selected = Create("Selected");
         /// <summary>
+        /// SelectedPressed State.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly ControlState SelectedPressed = Selected + Pressed;
+        /// <summary>
         /// DisabledSelected State.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]

diff --git a/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs b/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs
index 7565402..7ee1142 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs
@@ -197,6 +197,17 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
+        /// SelectedPressed State.
+        /// </summary>
+        /// <exception cref="KeyNotFoundException">Thrown when the selector does not contain the this value.</exception>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public T SelectedPressed
+        {
+            get => GetOrThrowKeyNotFound(x => x.State == ControlState.SelectedPressed);
+            set => Add(ControlState.SelectedPressed, value);
+        }
+
+        /// <summary>
         /// Other State.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>