[NUI] Update NUI Slider default and dark themes (#2925)
authorSeoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com>
Tue, 20 Apr 2021 05:46:29 +0000 (14:46 +0900)
committerJoogabYun <40262755+JoogabYun@users.noreply.github.com>
Tue, 20 Apr 2021 07:10:07 +0000 (16:10 +0900)
- Update default theme and dark theme of Slider component.

Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
12 files changed:
src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
src/Tizen.NUI.Components/Theme/ThemeDark.cs
src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_slider_handler_normalW.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_slider_status_track.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png [new file with mode: 0755]
src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png [new file with mode: 0755]

index 9649e8c..a51a2fa 100755 (executable)
@@ -119,9 +119,10 @@ namespace Tizen.NUI.Components
 
             theme.AddStyleWithoutClone("Tizen.NUI.Components.Progress", new ProgressStyle()
             {
-                Size = new Size(200, 5),
+                Size = new Size(200, 25),
                 Track = new ImageViewStyle()
                 {
+                    ResourceUrl = FrameworkInformation.ResourcePath + "IoT_progressindicator_empty.png",
                     BackgroundColor = new Color(0, 0, 0, 0.1f),
                 },
                 Buffer = new ImageViewStyle()
@@ -130,6 +131,11 @@ namespace Tizen.NUI.Components
                 },
                 Progress = new ImageViewStyle()
                 {
+                    ResourceUrl = new Selector<string>()
+                    {
+                        Normal = FrameworkInformation.ResourcePath + "IoT_progressindicator_progress.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_progressindicator_progressdisabled.png",
+                    },
                     BackgroundColor = new Color(0.05f, 0.63f, 0.9f, 1),
                 },
                 IndeterminateImageUrl = FrameworkInformation.ResourcePath + "nui_component_default_progress_indeterminate.png",
@@ -164,29 +170,38 @@ namespace Tizen.NUI.Components
             theme.AddStyleWithoutClone("Tizen.NUI.Components.Slider", new SliderStyle()
             {
                 Size = new Size(200, 50),
-                TrackThickness = 5,
+                TrackThickness = 8,
                 Track = new ImageViewStyle()
                 {
-                    BackgroundColor = new Color(0, 0, 0, 0.1f),
+                    Size = new Size(100, 8),
+                    ResourceUrl = new Selector<string>()
+                    {
+                        Normal = FrameworkInformation.ResourcePath + "IoT_slider_status_empty_track.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_slider_status_track_disabled.png",
+                    },
+                    BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 0.1f),
                 },
                 Progress = new ImageViewStyle()
                 {
-                    BackgroundColor = new Color(0.5f, 0.63f, 0.9f, 1),
+                    Size = new Size(100, 8),
+                    ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_status_track.png",
+                    BackgroundColor = new Color(0.03f, 0.05f, 0.3f, 1),
                 },
                 Thumb = new ImageViewStyle()
                 {
-                    Size = new Size(50, 50),
-                    ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_n.png",
-                    BackgroundImage = new Selector<string>()
+                    Size = new Size(36, 36),
+                    ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_handler_normal.png",
+                    // TODO : Should check later when UX guide provides the pressed image
+                    /*BackgroundImage = new Selector<string>()
                     {
                         Normal = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png",
                         Pressed = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png",
-                    }
+                    }*/
                 },
                 ValueIndicatorImage = new ImageViewStyle()
                 {
-                    Size = new Size(83, 54),
-                    ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_value_indicator.png",
+                    Size = new Size(49, 24),
+                    BackgroundColor = new Color(0.0f, 0.04f, 0.16f, 1.0f),
                 },
             });
 
index 0f3b6c3..4c31c32 100755 (executable)
@@ -118,9 +118,10 @@ namespace Tizen.NUI.Components
 
             theme.AddStyleWithoutClone("Tizen.NUI.Components.Progress", new ProgressStyle()
             {
-                Size = new Size(200, 5),
+                Size = new Size(200, 25),
                 Track = new ImageViewStyle()
                 {
+                    ResourceUrl = FrameworkInformation.ResourcePath + "IoT_progressindicator_empty.png",
                     BackgroundColor = new Color(0, 0, 0, 0.1f),
                 },
                 Buffer = new ImageViewStyle()
@@ -129,6 +130,11 @@ namespace Tizen.NUI.Components
                 },
                 Progress = new ImageViewStyle()
                 {
+                    ResourceUrl = new Selector<string>()
+                    {
+                        Normal = FrameworkInformation.ResourcePath + "IoT_progressindicator_progress_dark.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_progressindicator_progressdisabled.png",
+                    },
                     BackgroundColor = new Color(0.05f, 0.63f, 0.9f, 1),
                 },
                 IndeterminateImageUrl = FrameworkInformation.ResourcePath + "nui_component_default_progress_indeterminate.png",
@@ -163,29 +169,32 @@ namespace Tizen.NUI.Components
             theme.AddStyleWithoutClone("Tizen.NUI.Components.Slider", new SliderStyle()
             {
                 Size = new Size(200, 50),
-                TrackThickness = 5,
+                TrackThickness = 8,
                 Track = new ImageViewStyle()
                 {
-                    BackgroundColor = new Color(0, 0, 0, 0.1f),
+                    Size = new Size(100, 8),
+                    ResourceUrl = new Selector<string>()
+                    {
+                        Normal = FrameworkInformation.ResourcePath + "IoT_slider_status_empty_track.png",
+                        Disabled = FrameworkInformation.ResourcePath + "IoT_slider_status_track_disabled.png",
+                    },
+                    BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 0.1f),
                 },
                 Progress = new ImageViewStyle()
                 {
-                    BackgroundColor = new Color(0.5f, 0.63f, 0.9f, 1),
+                    Size = new Size(100, 8),
+                    ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_status_trackW.png",
+                    BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 1),
                 },
                 Thumb = new ImageViewStyle()
                 {
-                    Size = new Size(50, 50),
-                    ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_n.png",
-                    BackgroundImage = new Selector<string>()
-                    {
-                        Normal = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png",
-                        Pressed = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png",
-                    }
+                    Size = new Size(36, 36),
+                    ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_handler_normalW.png",
                 },
                 ValueIndicatorImage = new ImageViewStyle()
                 {
-                    Size = new Size(83, 54),
-                    ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_value_indicator.png",
+                    Size = new Size(49, 24),
+                    BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 1.0f),
                 },
             });
 
diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png
new file mode 100755 (executable)
index 0000000..2c6abaa
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png
new file mode 100755 (executable)
index 0000000..8e02cb6
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png
new file mode 100755 (executable)
index 0000000..f08c7c0
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png
new file mode 100755 (executable)
index 0000000..d8f57dc
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png b/src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png
new file mode 100755 (executable)
index 0000000..84238df
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_slider_handler_normalW.png b/src/Tizen.NUI.Components/res/IoT_slider_handler_normalW.png
new file mode 100755 (executable)
index 0000000..8cc7da3
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_slider_handler_normalW.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png b/src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png
new file mode 100755 (executable)
index 0000000..541142c
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_track.png b/src/Tizen.NUI.Components/res/IoT_slider_status_track.png
new file mode 100755 (executable)
index 0000000..7cd5ccb
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_slider_status_track.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png b/src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png
new file mode 100755 (executable)
index 0000000..ffffbda
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png differ
diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png b/src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png
new file mode 100755 (executable)
index 0000000..9607d9c
Binary files /dev/null and b/src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png differ