From c000bc0e9ac64e54a35a37f1d6ba8bb780f7f6b2 Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Sat, 15 Jun 2013 15:50:19 +0900 Subject: [PATCH] [entry] Apply font_color_black entry text color according to dark theme UX. font_color_black entry need to be renamed. Change-Id: I889ebccf5dd429cd15fef368b058551731c570be --- themes/inc/tizen-dark-inc.edc | 4 ++++ themes/inc/tizen-light-inc.edc | 4 ++++ themes/widgets/entry.edc | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 037995f..622a71f 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -979,6 +979,10 @@ #define ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC "#485D93" #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36 +#define ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC "#FAFAFA" +#define ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC "#FAFAFA66" +#define ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC "#5D6176" + #define ENTRY_BUBBLE_EX_PAD 58 #define ENTRY_BUBBLE_EX_CALLERID_PAD 178 #define ENTRY_BUBBLE_IX_PAD 20 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 658342c..1d2ca11 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -1007,6 +1007,10 @@ #define ENTRY_EDITFIELD_GUIDE_TEXT_COLOR_INC "#90A9C7" #define ENTRY_EDITFIELD_SEARCHBAR_TEXT_SIZE_INC 36 +#define ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC "#000000" +#define ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC "#00000080" +#define ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC "#90A9C7" + #define ENTRY_BUBBLE_EX_PAD 58 #define ENTRY_BUBBLE_EX_CALLERID_PAD 178 #define ENTRY_BUBBLE_IX_PAD 20 diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc index b1fa6fc..3cb418f 100644 --- a/themes/widgets/entry.edc +++ b/themes/widgets/entry.edc @@ -4721,7 +4721,7 @@ group { name: "elm/entry/base/font_color_black"; styles { style { name: "font_color_black_textblock_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=mixed left_margin=1 right_margin=2 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -4737,7 +4737,7 @@ group { name: "elm/entry/base/font_color_black"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "font_color_black_textblock_disabled_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=mixed left_margin=1 right_margin=2 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -4753,7 +4753,7 @@ group { name: "elm/entry/base/font_color_black"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "font_color_black_textblock_guide_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=mixed left_margin=1 right_margin=2 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=mixed left_margin=1 right_margin=2 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -4982,7 +4982,7 @@ group { name: "elm/entry/base-charwrap/font_color_black"; styles { style { name: "font_color_black_textblock_char_wrap_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=char left_margin=1 right_margin=2 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -4998,7 +4998,7 @@ group { name: "elm/entry/base-charwrap/font_color_black"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "font_color_black_textblock_char_wrap_disabled_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=char left_margin=1 right_margin=2 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5014,7 +5014,7 @@ group { name: "elm/entry/base-charwrap/font_color_black"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "font_color_black_textblock_char_wrap_guide_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=char left_margin=1 right_margin=2 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=char left_margin=1 right_margin=2 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5143,7 +5143,7 @@ group { name: "elm/entry/base-single/font_color_black"; styles { style { name: "font_color_black_single_textblock_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5159,7 +5159,7 @@ group { name: "elm/entry/base-single/font_color_black"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "font_color_black_single_textblock_disabled_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5175,7 +5175,7 @@ group { name: "elm/entry/base-single/font_color_black"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "font_color_black_single_textblock_guide_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=entry"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=entry"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5388,7 +5388,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class"; inherit: "elm/entry/base-single/font_color_black"; styles { style { name: "tizen_text_class_single_textblock_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#000000FF wrap=none left_margin=1 right_margin=3 text_class=tizen"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5404,7 +5404,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "tizen_text_class_single_textblock_disabled_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#00000080 wrap=none left_margin=1 right_margin=3 text_class=tizen"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_DISABLED_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; @@ -5420,7 +5420,7 @@ group { name: "elm/entry/base-single/font_color_black/tizen_text_class"; tag: "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color=#000000FF"; } style { name: "tizen_text_class_single_textblock_guide_style"; - base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color=#90A9C7 wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0"; + base: "font=Tizen:style=Roman font_size="ENTRY_TEXT_SIZE_INC" color="ENTRY_FONT_COLOR_BLACK_GUIDE_TEXT_COLOR_INC" wrap=none left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; -- 2.7.4