[Button] Apply segmentcontrol and color selector for Dark theme UX 0.4

Change-Id: I5990a94c68c9c6ba074d8522c70a810a64c5ffd3

diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45.png b/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45.png
index 13147dd..143d98b 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45.png and b/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45.png differ

diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45_dim.png b/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45_dim.png
index 8775de1..8437cfe 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45_dim.png and b/themes/images/HD/dark/Controls/00_icon_favorite_off_45x45_dim.png differ

diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45.png b/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45.png
index 94b2a7e..d96088f 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45.png and b/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45.png differ

diff --git a/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45_dim.png b/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45_dim.png
index 2c0d0ca..74c8dbd 100644 (file)
Binary files a/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45_dim.png and b/themes/images/HD/dark/Controls/00_icon_favorite_on_45x45_dim.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 609e98c..a3a82b6 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -428,9 +428,9 @@
 #define BUTTON_CIRCLE_STYLE_MINUS_PRESSED_COLOR_INC 250 250 250 255
 #define BUTTON_CIRCLE_STYLE_MINUS_DISABLED_COLOR_INC 250 250 250 128
 
-#define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC 58 58 58 76
+#define BUTTON_TEXT_COLORSELECTOR_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_TEXT_COLORSELECTOR_PRESSED_COLOR_INC 250 250 250 255
+#define BUTTON_TEXT_COLORSELECTOR_DISABLED_COLOR_INC 250 250 250 128
 
 #define BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_NORMAL_COLOR_INC 255 255 255 255
 #define BUTTON_BUBBLE_CIRCLE_RECEIVE_ICON_PRESSED_COLOR_INC 255 255 255 255
@@ -566,17 +566,17 @@
 #define BUTTON_NAVIFRAME_TOOLBAR_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1228 72
 #define BUTTON_NAVIFRAME_TOOLBAR_LANDSCAPE_TEXTBLOCK_MIN_INC 612 81
 
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 32
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 70
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC 9999 70
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC 35 35 35 35
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 36
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 72
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MAX_INC 9999 72
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_BORDER_INC 40 40 40 40
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_LEFT_PADDING_MIN_INC 28 5
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC 30 5
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_RIGHT_PADDING_MIN_INC 28 5
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 16 16
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 18 18
 
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 250 250 250 255
 
 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98
 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85
@@ -594,7 +594,7 @@
 
 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
 #define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 15 15
-#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 45 45
 
 #define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74
 #define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 15 15

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index a3366c0..4729604 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -604,8 +604,8 @@
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXTBLOCK_MIN_INC 110 70
 #define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_MIN_INC 16 16
 
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 58 58 58 255
-#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_NORMAL_COLOR_INC 250 250 250 255
+#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_ICON_PRESSED_COLOR_INC 250 250 250 255
 
 #define BUTTON_NAVIFRAME_MORE_BG_MIN_MAX_INC 85 98
 #define BUTTON_NAVIFRAME_LANDSCAPE_MORE_BG_MIN_MAX_INC 85 85
@@ -623,7 +623,7 @@
 
 #define BUTTON_COLORSELECTOR_BG_DEFAULT_MIN_INC 74 74
 #define BUTTON_COLORSELECTOR_BG_BORDER_INC 13 13 13 13
-#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 74 74
+#define BUTTON_COLORSELECTOR_IMAGE_MIN_MAX_INC 45 45
 
 #define BUTTON_DEFAULT_STYLE_BG_MIN_INC 100 74
 #define BUTTON_DEFAULT_STYLE_BG_BORDER_INC 13 13 13 13

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 5a2ab55..201fab4 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -5603,7 +5603,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
                color: BUTTON_NAVIFRAME_TOOLBAR_TEXT_DISABLED_COLOR_INC;
-               color2: BUTTON_NAVIFRAME_TEXT_SHADOW_NORMAL_COLOR_INC;
                visible: 1;
             }
             description { state: "focused" 0.0;