UX changes in token EEA

Change-Id: I83fc77f0807bd38d5db1503a93fb76c424a71ba2
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index 3777a24..63adbc8 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -488,6 +488,38 @@ _TokenEditPresenter::Initialize(const _Control& control)
        GET_COLOR_CONFIG(TOKENEDIT::TITLE_TEXT_DISABLED, titleTextDisabledColor);
        __pTokenEdit->SetTitleTextColor(EDIT_STATUS_DISABLED, titleTextDisabledColor);
 
+       Color tokenEditBgNormal;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_BG_NORMAL, tokenEditBgNormal);
+       __pTokenEdit->SetColor(EDIT_STATUS_NORMAL, tokenEditBgNormal);
+
+       Color tokenEditBgPressed;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_BG_PRESSED, tokenEditBgPressed);
+       __pTokenEdit->SetColor(EDIT_STATUS_PRESSED, tokenEditBgPressed);
+
+       Color tokenEditBgHighlighted;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_BG_HIGHLIGHTED, tokenEditBgHighlighted);
+       __pTokenEdit->SetColor(EDIT_STATUS_HIGHLIGHTED, tokenEditBgHighlighted);
+
+       Color tokenEditBgDisabled;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_BG_DISABLED, tokenEditBgDisabled);
+       __pTokenEdit->SetColor(EDIT_STATUS_DISABLED, tokenEditBgDisabled);
+
+       Color tokenEditTextNormal;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_TEXT_NORMAL, tokenEditTextNormal);
+       __pTokenEdit->SetTextColor(EDIT_TEXT_COLOR_NORMAL, tokenEditTextNormal);
+
+       Color tokenEditTextHighlighted;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_TEXT_HIGHLIGHTED, tokenEditTextHighlighted);
+       __pTokenEdit->SetTextColor(EDIT_TEXT_COLOR_HIGHLIGHTED, tokenEditTextHighlighted);
+
+       Color tokenEditTextDisabled;
+       GET_COLOR_CONFIG(TOKENEDIT::EDIT_TEXT_DISABLED, tokenEditTextDisabled);
+       __pTokenEdit->SetTextColor(EDIT_TEXT_COLOR_DISABLED, tokenEditTextDisabled);
+
+       Color tokenGuideTextNormal;
+       GET_COLOR_CONFIG(TOKENEDIT::GUIDE_TEXT_NORMAL, tokenGuideTextNormal);
+       __pTokenEdit->SetGuideTextColor(tokenGuideTextNormal);
+
        float leftMargin = 0.0f;
        float rightMargin = 0.0f;
        float tokenTopMargin = 0.0f;

diff --git a/src/ui/inc/FUi_ResourceTokenEditConfig.h b/src/ui/inc/FUi_ResourceTokenEditConfig.h
index 7b60083..22782cc 100644 (file)
--- a/src/ui/inc/FUi_ResourceTokenEditConfig.h
+++ b/src/ui/inc/FUi_ResourceTokenEditConfig.h
@@ -37,6 +37,15 @@ DECLARE_UI_CONFIG(TOKENEDIT);
        DECLARE_COLOR_CONFIG(TITLE_TEXT_PRESSED, 10);
        DECLARE_COLOR_CONFIG(TITLE_TEXT_HIGHLIGHTED, 11);
        DECLARE_COLOR_CONFIG(TITLE_TEXT_DISABLED, 12);
+       DECLARE_COLOR_CONFIG(EDIT_BG_NORMAL, 13);
+       DECLARE_COLOR_CONFIG(EDIT_BG_PRESSED, 14);
+       DECLARE_COLOR_CONFIG(EDIT_BG_HIGHLIGHTED, 15);
+       DECLARE_COLOR_CONFIG(EDIT_BG_DISABLED, 16);
+       DECLARE_COLOR_CONFIG(EDIT_TEXT_NORMAL, 17);
+       DECLARE_COLOR_CONFIG(EDIT_TEXT_PRESSED, 18);
+       DECLARE_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, 19);
+       DECLARE_COLOR_CONFIG(EDIT_TEXT_DISABLED, 20);
+       DECLARE_COLOR_CONFIG(GUIDE_TEXT_NORMAL, 21);
 
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(BG_NORMAL_EFFECT, 2);

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index 0928266..0c99b31 100644 (file)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -4255,6 +4255,42 @@ ConfigParser::GetColorKeyTable(void)
                        const char* key ="TOKENEDIT::TITLE_TEXT_DISABLED";
                        __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::TITLE_TEXT_DISABLED_COLOR);
                }
+               {
+                       const char* key ="TOKENEDIT::EDIT_BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_BG_NORMAL_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_BG_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_BG_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_BG_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_BG_HIGHLIGHTED_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_BG_DISABLED_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_TEXT_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_TEXT_NORMAL_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_TEXT_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_TEXT_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_TEXT_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_TEXT_HIGHLIGHTED_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::EDIT_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::EDIT_TEXT_DISABLED_COLOR);
+               }
+               {
+                       const char* key ="TOKENEDIT::GUIDE_TEXT_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::GUIDE_TEXT_NORMAL_COLOR);
+               }
        }
        return __pColorKeyTable;
 }

diff --git a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
index 583ce4a..8234086 100644 (file)
--- a/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTokenEditConfig.cpp
@@ -36,6 +36,15 @@ START_UI_CONFIG(TOKENEDIT);
        ADD_COLOR_CONFIG(TITLE_TEXT_PRESSED, $F011L11);
        ADD_COLOR_CONFIG(TITLE_TEXT_HIGHLIGHTED, $F011L11);
        ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $F011L11);
+       ADD_COLOR_CONFIG(EDIT_BG_NORMAL, $B0215);
+       ADD_COLOR_CONFIG(EDIT_BG_PRESSED, $B0215);
+       ADD_COLOR_CONFIG(EDIT_BG_HIGHLIGHTED, $B0215);
+       ADD_COLOR_CONFIG(EDIT_BG_DISABLED, $B0215);
+       ADD_COLOR_CONFIG(EDIT_TEXT_NORMAL, $F011L1);
+       ADD_COLOR_CONFIG(EDIT_TEXT_PRESSED, $F011L1);
+       ADD_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, $F011L1);
+       ADD_COLOR_CONFIG(EDIT_TEXT_DISABLED, $F011L1);
+       ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $F051);
 
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_contacts_button_bg.#.png);
        ADD_IMAGE_CONFIG(BG_NORMAL_EFFECT, #00_contacts_button_bg_ef.#.png);