From e8d123f4ade453c63303813230ea700cf5a9e42e Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Thu, 22 Aug 2019 17:20:38 +0900 Subject: [PATCH] Implement OOBE view #3 - Add a item to find hidden AP - Change font size for OOBE - Move password check box - Change a parent object of popup Change-Id: I022e9a94a0a244bc6e8d43faff124db6c9223e20 --- resources/images/find_hidden_network.png | Bin 0 -> 1196 bytes sources/libraries/Common/common_eap_connect.c | 2 +- sources/libraries/Common/common_pswd_popup.c | 3 +- sources/libraries/Common/include/common.h | 6 ++ sources/libraries/Common/include/common_utils.h | 1 + sources/ui-gadget/edcs/custom_editfield.edc | 1 + sources/ui-gadget/viewers-layout/viewer_manager.c | 12 ++- .../ui-gadget/viewers-layout/wifi_viewer_list.c | 101 ++++++++++++++++++--- 8 files changed, 108 insertions(+), 18 deletions(-) create mode 100644 resources/images/find_hidden_network.png diff --git a/resources/images/find_hidden_network.png b/resources/images/find_hidden_network.png new file mode 100644 index 0000000000000000000000000000000000000000..175656cddd6c3c5f8d2324961f41764abd9e8b9c GIT binary patch literal 1196 zcmbVMTWAzl7#@u&aUsx)FDcdxBjOf1mowSf*%`8CcW1J3tsB>M#eJ)1XU=AaWadm} zPTWn<(pG4jmLjwPDSgm_Pd=0=EeL{w`l1hBf>bTV;;Yw3i+O0z>?QUg_|Sp*&wtK* z-~a#TzszE3a$+#{evDz5!NP8{OxHcpJMb2jTW?>PrOOZ*uaX0}PMR=4OxDIV#1>pQ zg~|xp^Rw5{D8ux5PNhn!#l5(ZIq2>CN%`l^5EgxFbh_E#@<#=iC#l_1U>)2`T zkW!S2zJVIf?u7sySeUF>3)7Znb7Q;M(UwjPxQIZu<<5Aa-b!4k|di6P1VMe0OayUBBw}7QUy7X z9g%uA*5d*-p9EPmDd!9ofN?cvNSdaahMY>tvT7uH+=3Sp=vk=e*P(v9T;+{i-3SmQ zIH+Je)9Zjz0}~uJu+JJsRPh8GKje5eZiXL5CF%Ao zC!iy8^t+|+>3H2OnAu9}kEefv*p2&7vjXO$XiYtitle; + //popup_btn_data.sub_title_txt = popup_info->sec_type popup_btn_data.btn1_cb = popup_info->cancel_cb; popup_btn_data.btn1_data = popup_info->cb_data; popup_btn_data.btn1_txt = "IDS_WIFI_SK_CANCEL"; diff --git a/sources/libraries/Common/include/common.h b/sources/libraries/Common/include/common.h index 3740a76..d0b4dd5 100755 --- a/sources/libraries/Common/include/common.h +++ b/sources/libraries/Common/include/common.h @@ -97,6 +97,12 @@ extern "C" /* Icon Size*/ #define DEFAULT_BG_SIZE 60 #define DEFAULT_BUTTON_CIRCLE_SIZE 40 +#define DEFAULT_OOBE_BUTTON_CIRCLE_SIZE 20 + +/* Font Size */ +#define SMALL_FONT_SIZE 28 +#define MID_FONT_SIZE 30 +#define BIG_FONT_SIZE 32 typedef enum { UG_VIEW_DEFAULT = 0, diff --git a/sources/libraries/Common/include/common_utils.h b/sources/libraries/Common/include/common_utils.h index 517f897..e9c8bce 100755 --- a/sources/libraries/Common/include/common_utils.h +++ b/sources/libraries/Common/include/common_utils.h @@ -66,6 +66,7 @@ typedef struct { typedef struct { char *title_txt; + char *sub_title_txt; char *info_txt; Evas_Object *btn; char *btn1_txt; diff --git a/sources/ui-gadget/edcs/custom_editfield.edc b/sources/ui-gadget/edcs/custom_editfield.edc index 3472f6a..c96d2bb 100755 --- a/sources/ui-gadget/edcs/custom_editfield.edc +++ b/sources/ui-gadget/edcs/custom_editfield.edc @@ -44,6 +44,7 @@ RESOURCE_IMAGE("wifi_icon_badge_container.png"); RESOURCE_IMAGE("wifi_icon_badge_info.png"); RESOURCE_IMAGE("core_button_effect_normal.#.png"); RESOURCE_IMAGE("core_button_effect_pressed.#.png"); +RESOURCE_IMAGE("find_hidden_network.png"); base_scale: 1.8; plugins { diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c index 53e9143..a96d7e8 100755 --- a/sources/ui-gadget/viewers-layout/viewer_manager.c +++ b/sources/ui-gadget/viewers-layout/viewer_manager.c @@ -679,10 +679,12 @@ static char *_gl_wifi_onoff_text_get(void *data, Evas_Object *obj, const char *p if (!strcmp("elm.text", part)) { if (ug_type == UG_VIEW_OOBE - && manager_object->header_mode == HEADER_MODE_SEARCHING) - det = g_strdup(sc(PACKAGE, I18N_TYPE_Scanning)); - else + && manager_object->header_mode == HEADER_MODE_SEARCHING) { + det = g_strdup_printf("%s", + SMALL_FONT_SIZE, sc(PACKAGE, I18N_TYPE_Scanning)); + } else { det = g_strdup(manager_object->item_wifi_onoff_text); + } assertm_if(NULL == det, "NULL!!"); } @@ -1833,6 +1835,8 @@ static int viewer_manager_update_list_all(char *ssid) wifi_device_list = NULL; } + // Append hidden AP item + viewer_list_item_hidden_network_set(update_info.last_appended_item); INFO_LOG(UG_NAME_NORMAL, "total items added = %d", update_info.total_items_added); if (0 == update_info.total_items_added) { @@ -2195,7 +2199,7 @@ void viewer_manager_specific_scan_response_hlr( device_info.ssid = (char *)ssid; device_info.ap = ap; ug_app_state->eap_view = - create_eap_view(ug_app_state->layout_main, + create_eap_view(ug_app_state->parent_layout, ugd->win_main, ug_app_state->conformant, PACKAGE, &device_info, diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c index 4f3b7fc..7e8e286 100755 --- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c +++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c @@ -38,6 +38,7 @@ static Elm_Object_Item* last_item = NULL; static Elm_Genlist_Item_Class *itc; static Elm_Genlist_Item_Class *no_wifi_device_itc; static Elm_Genlist_Item_Class *grouptitle_itc; +static Elm_Genlist_Item_Class *last_item_itc; static Elm_Object_Item *grouptitle = NULL; extern wifi_appdata *ug_app_state; @@ -88,6 +89,7 @@ static char* _gl_listview_text_get(void *data, Evas_Object *obj, const char *par char* det = NULL; char* buf = NULL; char* convertedColor = NULL; + int ug_type; ug_genlist_data_t* gdata = (ug_genlist_data_t*) data; retvm_if(NULL == gdata || NULL == gdata->device_info, NULL); @@ -98,24 +100,35 @@ static char* _gl_listview_text_get(void *data, Evas_Object *obj, const char *par det = evas_textblock_text_utf8_to_markup(NULL, gdata->device_info->ssid); assertm_if(NULL == det, "NULL!!"); - - convertedColor = ConvertRGBAtoHex(61, 185, 204, 255); assertm_if(NULL == convertedColor, "NULL!!"); - if (VIEWER_ITEM_RADIO_MODE_CONNECTED == gdata->radio_mode) { + + ug_type = wifi_get_ug_type(); + + if (ug_type != UG_VIEW_OOBE && VIEWER_ITEM_RADIO_MODE_CONNECTED == gdata->radio_mode) { + convertedColor = ConvertRGBAtoHex(61, 185, 204, 255); buf = g_strdup_printf("%s", - convertedColor, det); + convertedColor, det); g_free(det); g_free(convertedColor); return buf; + } else if (wifi_get_ug_type() == UG_VIEW_OOBE) { + buf = g_strdup_printf("%s", + BIG_FONT_SIZE, det); + g_free(det); + return buf; } } else if (!strcmp("elm.text.sub", part) && gdata->device_info->ap_status_txt != NULL) { det = g_strdup(gdata->device_info->ap_status_txt); - assertm_if(NULL == det, "NULL!!"); + + buf = g_strdup_printf("%s", + SMALL_FONT_SIZE, det); + g_free(det); + return buf; } - g_free(convertedColor); + return det; } @@ -141,9 +154,15 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, temp_str); g_free(temp_str); - evas_object_color_set(icon, 2, 61, 132, 204); - evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE), ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE)); - + if (wifi_get_ug_type() == UG_VIEW_OOBE) { + evas_object_color_set(icon, 0, 10, 10, 204); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_OOBE_BUTTON_CIRCLE_SIZE), + ELM_SCALE_SIZE(DEFAULT_OOBE_BUTTON_CIRCLE_SIZE)); + } else { + evas_object_color_set(icon, 2, 61, 132, 204); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE), + ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE)); + } } else if (!strcmp("elm.swallow.end", part)) { if (VIEWER_ITEM_RADIO_MODE_CONNECTING == gdata->radio_mode || VIEWER_ITEM_RADIO_MODE_CONFIGURATION == gdata->radio_mode) { @@ -212,6 +231,32 @@ static Evas_Object *_gl_content_scanning_icon_get(void *data, Evas_Object *obj, return title_progressbar; } +static char *_gl_hidden_network_text_get(void *data, Evas_Object *obj, + const char *part) +{ + if (!strcmp("elm.text", part)) + return g_strdup_printf("%s", + BIG_FONT_SIZE, sc(PACKAGE, I18N_TYPE_Find_Hidden_Network)); + + return NULL; +} + +static Evas_Object *_gl_hidden_network_content_get(void *data, Evas_Object *obj, + const char *part) +{ + Evas_Object *icon = NULL; + + if (!strcmp("elm.swallow.icon", part)) { + icon = elm_image_add(obj); + retvm_if(NULL == icon, NULL); + elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, "find_hidden_network.png"); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_OOBE_BUTTON_CIRCLE_SIZE), + ELM_SCALE_SIZE(DEFAULT_OOBE_BUTTON_CIRCLE_SIZE)); + } + + return icon; +} + Elm_Object_Item* viewer_list_get_first_item(void) { return first_item; @@ -597,7 +642,7 @@ void viewer_list_wifi_reconnect(wifi_device_info_t *device_info) /* TODO: finally parameter with wifi_manager_ap_h, WPA, EAP */ ug_app_state->passpopup = create_passwd_popup( ug_app_state->conformant, - ug_app_state->layout_main, PACKAGE, &popup_info); + ug_app_state->parent_layout, PACKAGE, &popup_info); if (ug_app_state->passpopup == NULL) INFO_LOG(UG_NAME_ERR, "Fail to create password popup"); @@ -605,7 +650,7 @@ void viewer_list_wifi_reconnect(wifi_device_info_t *device_info) break; case WIFI_MANAGER_SECURITY_TYPE_EAP: ug_app_state->eap_view = create_eap_view( - ug_app_state->layout_main, ugd->win_main, + ug_app_state->parent_layout, ugd->win_main, ug_app_state->conformant, PACKAGE, device_info, viewer_manager_eap_view_deref); @@ -684,7 +729,7 @@ void viewer_list_wifi_connect(wifi_device_info_t *device_info) case WIFI_MANAGER_SECURITY_TYPE_EAP: ug_app_state->eap_view = create_eap_view( - ug_app_state->layout_main, ugd->win_main, + ug_app_state->parent_layout, ugd->win_main, ug_app_state->conformant, PACKAGE, device_info, viewer_manager_eap_view_deref); @@ -939,6 +984,14 @@ Evas_Object* viewer_list_create(Evas_Object *win) no_wifi_device_itc->func.state_get = NULL; no_wifi_device_itc->func.del = _gl_listview_del; + if (wifi_get_ug_type() == UG_VIEW_OOBE) { + last_item_itc = elm_genlist_item_class_new(); + last_item_itc->item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; + last_item_itc->func.text_get = _gl_hidden_network_text_get; + last_item_itc->func.content_get = _gl_hidden_network_content_get; + last_item_itc->func.del = NULL; + } + first_item = last_item = NULL; evas_object_smart_callback_add(viewer_list, "realized", @@ -1306,3 +1359,27 @@ Elm_Object_Item* item_get_for_ssid(const char *ssid) return it; } + +static void _hidden_network_cb(void* data, Evas_Object* obj, void* event_info) +{ + __COMMON_FUNC_ENTER__; + + view_hidden_ap_popup_create(ug_app_state->parent_layout, PACKAGE); + + __COMMON_FUNC_EXIT__; +} + +void viewer_list_item_hidden_network_set(Elm_Object_Item *item) +{ + if (item == NULL) + return; + + last_item = elm_genlist_item_append(viewer_list, + last_item_itc, NULL, item, + ELM_GENLIST_ITEM_NONE, _hidden_network_cb, NULL); + + elm_genlist_item_select_mode_set(last_item, + ELM_OBJECT_SELECT_MODE_ALWAYS); + + elm_genlist_item_update(last_item); +} -- 2.7.4