From 7302de136096ae1c66fcf731e1ccfc89ad622734 Mon Sep 17 00:00:00 2001 From: Abhishek Sansanwal Date: Tue, 27 Jun 2017 17:19:58 +0530 Subject: [PATCH] Changed retry popup button style to match UI spec and fixed height,width Description: Changed yes and no buttons on retry popup to match the UI specification of height and width and also fixed padding according to the guide. Signed-off-by: Abhishek Sansanwal Change-Id: I85d897217fcb8efdc7d0aba1d41ed1c3f32ac31b --- res/layout/network.edc | 94 +++++++--------------------------------- src/view/network/view_wireless.c | 4 +- 2 files changed, 17 insertions(+), 81 deletions(-) diff --git a/res/layout/network.edc b/res/layout/network.edc index 82d6f36..252ed90 100644 --- a/res/layout/network.edc +++ b/res/layout/network.edc @@ -48,7 +48,7 @@ group { type, RECT; scale, 1; description { - min, 500 388; + min, 650 250; state, "default" 0.0; visible, 0; } @@ -88,7 +88,7 @@ group { fixed, 0 1; color, COLOR_TEXT_POPUP; text { - align, 0.1 0.0; + align, 0.5 0.0; font, FONT_LIGHT; size, 24; } @@ -128,7 +128,7 @@ group { fixed, 0 1; color, COLOR_TEXT_POPUP; text { - align, 0.1 0.0; + align, 0.5 0.0; font, FONT_LIGHT; size, 24; } @@ -169,7 +169,7 @@ group { fixed, 0 1; color, COLOR_TEXT_POPUP; text { - align, 0.15 0.0; + align, 0.5 0.0; font, FONT_LIGHT; size, 24; } @@ -183,100 +183,36 @@ group { scale, 1; description { state, "default" 0.0; - min, 460 58; + min, 460 64; rel1 { - to, "padding.content1"; + to, "part.text.content3"; relative, 0.5 1.0; } rel2 { - to, "padding.content1"; + to, "part.text.content3"; relative, 0.5 1.0; } align, 0.5 0.0; fixed, 1 1; } } - - part { - name, "padding.error_msg.top"; - type, SPACER; - scale, 1; - description { - state, "default" 0.0; - align, 0.0 0.0; - fixed, 0 1; - min, 0 20; - rel1 { - relative, 0.0 1.0; - to, "padding.passcode.area"; - } - rel2 { - to, "padding.passcode.area"; - } - } - } - - part { - name, "part.error_msg"; - type, TEXT; - scale, 1; - description { - state, "default" 0.0; - align, 0.0 0.0; - fixed, 0 1; - min, 0 24; - color, 240 62 62 255; - rel1 { - relative, 0.0 1.0; - to, "padding.error_msg.top"; - } - rel2 { - to, "padding.error_msg.top"; - } - text { - text, ""; - font, FONT_LIGHT; - size, 24; - } - } - } - - part { - name, "padding.error_msg.bottom"; - type, SPACER; - scale, 1; - description { - state, "default" 0.0; - align, 0.0 0.0; - fixed, 0 1; - min, 0 20; - rel1 { - relative, 0.0 1.0; - to, "part.error_msg"; - } - rel2 { - to, "part.error_msg"; - } - } - } - part { name, "part.popup.bottom.no"; type, SWALLOW; scale, 1; description { state, "default" 0.0; - align, 0.0 0.0; + align, 1.0 0.0; fixed, 0 1; - min, 0 50; + min, 300 50; color: 0 255 0 255; rel1 { relative, 0.0 1.0; - to, "padding.error_msg.bottom"; + to, "padding.passcode.area"; } rel2 { relative, 0.475 1.0; - to, "padding.error_msg.bottom"; + to, "padding.passcode.area"; } } } @@ -291,14 +227,14 @@ color: 0 255 0 255; align, 0.0 0.0; fixed, 0 1; color: 255 0 0 255; - min, 0 50; + min, 300 50; visible: 1; rel1 { - relative, 0.525 1.0; - to, "padding.error_msg.bottom"; + relative, 0.525 1.0; + to, "padding.passcode.area"; } rel2 { - to, "padding.error_msg.bottom"; + to, "padding.passcode.area"; } } } diff --git a/src/view/network/view_wireless.c b/src/view/network/view_wireless.c index c9aebee..d6752e7 100644 --- a/src/view/network/view_wireless.c +++ b/src/view/network/view_wireless.c @@ -121,7 +121,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) //elm_object_content_set(_content_network_popup, ly); - btn1 = utils_add_button(ly, "part.popup.bottom.no", STYLE_DISABLE_BTN, "No"); + btn1 = utils_add_button(ly, "part.popup.bottom.no", NULL, "No"); if (!btn1) { _ERR("Add button failed."); evas_object_del(wifi_popup); @@ -130,7 +130,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) //evas_object_smart_callback_add(btn1, "clicked", _clicked_cb, wifi_popup); inputmgr_add_callback(btn1, EO_NO, &handler, priv); - btn2 = utils_add_button(ly, "part.popup.bottom.yes", STYLE_DISABLE_BTN, "Yes"); + btn2 = utils_add_button(ly, "part.popup.bottom.yes", NULL, "Yes"); if (!btn2) { _ERR("Add button failed."); evas_object_del(wifi_popup); -- 2.7.4