Editfield : Black theme

Change-Id: I05341f45072b3abc4e3253dc28467751903c8c86

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 1803b92..b7320e3 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -29,7 +29,7 @@ group { name: "elm/editfield/base/default";
    }
    styles {
       style { name: "editfield_content_singleline_style";
-         base: "font=SLP:style=Roman font_size=32 color=#000000 wrap=mixed ellipsis=1";
+         base: "font=SLP:style=Roman font_size=32 color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=mixed ellipsis=1";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -39,7 +39,7 @@ group { name: "elm/editfield/base/default";
          tag:  "hilight" "+ font=SLP:style=Bold";
       }
       style { name: "editfield_content_password_style";
-         base: "font=SLP:style=Roman font_size=24 color=#000000 wrap=none ellipsis=1";
+         base: "font=SLP:style=Roman font_size=24 color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=none ellipsis=1";
          tag:  "br" "\n";
          tag:  "ps" "ps";
          tag:  "tab" "\t";
@@ -305,7 +305,7 @@ group { name: "elm/editfield/base/default";
             fixed: 1 1;
             rel1.to: "elm.swallow.content";
             rel2.to: "elm.swallow.content";
-            color: 163 157 138 255;
+            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
             text {
                font: "SLP:style=Roman";
                size: 32;
@@ -329,11 +329,9 @@ group { name: "elm/editfield/base/default";
             visible: 0;
             rel1.to: "elm.swallow.content";
             rel2.to: "elm.swallow.content";
-            color: 0 0 0 255;
             text {
                style: "editfield_content_singleline_style";
                min: 0 0;
-               max: 0 1;
             }
          }
          description {
@@ -359,7 +357,6 @@ group { name: "elm/editfield/base/default";
             visible: 0;
             rel1.to: "elm.swallow.content";
             rel2.to: "elm.swallow.content";
-            color: 0 0 0 255;
             text {
                style: "editfield_content_password_style";
                repch: "*";
@@ -841,7 +838,7 @@ group { name: "elm/editfield/base/searchbar";
             fixed: 1 1;
             rel1.to: "elm.swallow.content";
             rel2.to: "elm.swallow.content";
-            color: 163 157 138 255;
+            color: EDITFIELD_GUIDE_TEXT_COLOR_INC;
             text {
                font: "SLP:style=Roman";
                size: 32;

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index 8cc1cb9..e735514 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -304,7 +304,7 @@
                styles
                {
                        style { name: "editfield_textblock_style";
-                               base: "font=SLP:style=Roman font_size=32 color=#000000 wrap=mixed";
+                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=mixed";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -512,7 +512,7 @@
                styles
                {
                        style { name: "editfield_single_textblock_style";
-                               base: "font=SLP:style=Roman font_size=32 color=#000000 wrap=none";
+                               base: "font=SLP:style=Roman font_size=32 color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=none";
                                tag:  "br" "\n";
                                tag:  "ps" "ps";
                                tag:  "tab" "\t";
@@ -706,7 +706,7 @@
       styles
        {
           style { name: "entry_single_textblock_style";
-             base: "font=SLP:style=Roman font_size=24 color=#000000 wrap=none";
+             base: "font=SLP:style=Roman font_size=24 color="ENTRY_EDITFIELD_TEXT_COLOR_INC" wrap=none";
              tag:  "br" "\n";
              tag:  "ps" "ps";
              tag:  "tab" "\t";
@@ -1425,7 +1425,7 @@ group { name: "elm/entry/custom-password/popup";
                                                relative: 0.0  1.0;
                                                offset: 0 -2;
                                        }
-                                       color: 229 134 22 255;
+                                       color: ENTRY_EDITFIELD_CURSOR_COLOR_INC;
                                }
                                description { state: "hidden" 0.0;
                                        inherit: "default" 0.0;

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index f867042..b25764c 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -244,7 +244,8 @@
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 255 255 255 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 149 145 136 255
 
-#define EDITFIELD_TITLE_COLOR_INC 73 73 73 255_
+#define EDITFIELD_TITLE_COLOR_INC 73 73 73 255
+#define EDITFIELD_GUIDE_TEXT_COLOR_INC 70 70 70 255
 
 #define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
 #define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
@@ -262,3 +263,6 @@
 
 #define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 42 109 140 255
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 64 182 237 255
+
+#define ENTRY_EDITFIELD_TEXT_COLOR_INC "#FFFFFF"
+#define ENTRY_EDITFIELD_CURSOR_COLOR_INC 42 109 140 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index b775971..75b2304 100755 (executable)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -267,7 +267,8 @@
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 255 255 255 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 149 145 136 255
 
-#define EDITFIELD_TITLE_COLOR_INC 73 73 73 255_
+#define EDITFIELD_TITLE_COLOR_INC 73 73 73 255
+#define EDITFIELD_GUIDE_TEXT_COLOR_INC 189 189 189 255
 
 #define BUTTON_TEXT_TICKERNOTI_NORMAL_COLOR_INC        255 255 255 255
 #define BUTTON_TEXT_TICKERNOTI_DISABLED_COLOR_INC         185 185 185 255
@@ -285,3 +286,6 @@
 
 #define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 195 160 107 255
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255
+
+#define ENTRY_EDITFIELD_TEXT_COLOR_INC "#000000"
+#define ENTRY_EDITFIELD_CURSOR_COLOR_INC 217 147 26 255