Fix genlist style

[apps/native/ug-wifi-efl.git] / sources / ui-gadget / viewers-layout / wifi_viewer_list.c

diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c
index e72731b..5cb79af 100755 (executable)
--- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c
+++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c
@@ -86,30 +86,26 @@ char* ConvertRGBAtoHex(int r, int g, int b, int a)
 static char* _gl_listview_text_get(void *data, Evas_Object *obj, const char *part)
 {
        char* det = NULL;
-       char* buf =NULL;
-       int r = 0, g = 0, b = 0, a = 0;
+       char* buf = NULL;
 
        ug_genlist_data_t* gdata = (ug_genlist_data_t*) data;
        retvm_if(NULL == gdata || NULL == gdata->device_info, NULL);
 
        assertm_if(NULL == gdata->device_info->ssid, "NULL!!");
 
-       if (!strncmp(part, "elm.text.main.left.top", strlen(part))) {
+       if (!strcmp("elm.text", part)) {
                det = evas_textblock_text_utf8_to_markup(NULL,
                                gdata->device_info->ssid);
                assertm_if(NULL == det, "NULL!!");
                if (VIEWER_ITEM_RADIO_MODE_CONNECTED == gdata->radio_mode) {
-                       edje_color_class_get("T024S",&r, &g, &b, &a,
-                               NULL, NULL, NULL, NULL,
-                               NULL, NULL, NULL, NULL);
                        buf = g_strdup_printf("<color=#%s>%s</color>",
-                               ConvertRGBAtoHex(r, g, b, a), det);
+                               ConvertRGBAtoHex(2, 61, 132, 255), det);
 
                        g_free(det);
                        return buf;
                }
-       } else if (!strncmp(part, "elm.text.sub.left.bottom", strlen(part)) &&
-                       gdata->device_info->ap_status_txt != NULL) {
+       } 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!!");
@@ -124,17 +120,13 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const
 
        Evas_Object *icon = NULL;
        Evas_Object *btn = NULL;
-       Evas_Object *ic = NULL;
 
        if (gdata->device_info->ap_image_path == NULL) {
                /* if there is no ap_image_path (NO AP Found situation) */
                DEBUG_LOG(UG_NAME_ERR, "Fatal: Image path is NULL");
 
-       } else if (!g_strcmp0(part, "elm.icon.1")) {
-               ic = elm_layout_add(obj);
-               elm_layout_theme_set(ic, "layout", "list/B/type.3", "default");
-
-               icon = elm_image_add(ic);
+       } else if (!strcmp("elm.swallow.icon", part)) {
+               icon = elm_image_add(obj);
                retvm_if(NULL == icon, NULL);
 
                /* for strength */
@@ -144,24 +136,18 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const
                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));
 
-               evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               elm_layout_content_set(ic, "elm.swallow.content", icon);
-
-       } else if (!g_strcmp0(part, "elm.icon.2")) {
+       } else if (!strcmp("elm.swallow.end", part)) {
                if (VIEWER_ITEM_RADIO_MODE_CONNECTING == gdata->radio_mode ||
                                VIEWER_ITEM_RADIO_MODE_CONFIGURATION == gdata->radio_mode) {
-                       ic = elm_layout_add(obj);
-                       elm_layout_theme_set(ic, "layout", "list/C/type.2", "default");
 
-                       icon = elm_progressbar_add(ic);
+                       icon = elm_progressbar_add(obj);
 
                        elm_object_style_set(icon, "process_medium");
                        evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, 0.5);
                        evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                        elm_progressbar_pulse(icon, TRUE);
-                       elm_layout_content_set(ic, "elm.swallow.content", icon);
                        evas_object_propagate_events_set(icon, EINA_FALSE);
 
                } else {
@@ -178,7 +164,7 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const
                        return btn;
                }
        }
-       return ic;
+       return icon;
 }
 
 static void _gl_listview_del(void *data, Evas_Object *obj)
@@ -200,7 +186,7 @@ static void _gl_listview_del(void *data, Evas_Object *obj)
 static char *_gl_text_available_networks_get(void *data, Evas_Object *obj,
                const char *part)
 {
-       if (g_strcmp0(part, "elm.text.main") == 0)
+       if (!strcmp("elm.text", part))
                return g_strdup(sc(PACKAGE, I18N_TYPE_Available_networks));
 
        return NULL;
@@ -948,13 +934,13 @@ Evas_Object* viewer_list_create(Evas_Object *win)
        evas_object_size_hint_weight_set(viewer_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(viewer_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       itc.item_style = "2line.top";
+       itc.item_style = WIFI_GENLIST_2LINE_TOP_TEXT_ICON_STYLE;
        itc.func.text_get = _gl_listview_text_get;
        itc.func.content_get = _gl_listview_content_get;
        itc.func.state_get = NULL;
        itc.func.del = _gl_listview_del;
 
-       no_wifi_device_itc.item_style = "1line";
+       no_wifi_device_itc.item_style = WIFI_GENLIST_1LINE_TEXT_STYLE;
        no_wifi_device_itc.func.text_get = _gl_listview_text_get;
        no_wifi_device_itc.func.content_get = NULL;
        no_wifi_device_itc.func.state_get = NULL;
@@ -996,7 +982,7 @@ void viewer_list_title_item_set(Elm_Object_Item *item_header)
        }
 
        memset(&grouptitle_itc, 0, sizeof(grouptitle_itc));
-       grouptitle_itc.item_style = "groupindex";
+       grouptitle_itc.item_style = WIFI_GENLIST_GROUP_INDEX_STYLE;
        grouptitle_itc.func.text_get = _gl_text_available_networks_get;
        grouptitle_itc.func.content_get = _gl_content_scanning_icon_get;