Resolved Issue [TM-160] & [TM-162]search list and checkbox not displaying properly

Change-Id: I5914cffb9db6e5f01e8ce742e6ee115d63876c19
Signed-off-by: Shubham Kumar <shubham.srib@samsung.com>

diff --git a/src/widget/mp-album-detail-list.c b/src/widget/mp-album-detail-list.c
index e4fbfa8..13d2230 100755 (executable)
--- a/src/widget/mp-album-detail-list.c
+++ b/src/widget/mp-album-detail-list.c
@@ -160,7 +160,7 @@ _mp_album_detail_list_icon_get(void *data, Evas_Object * obj, const char *part)
 
        if (list->edit_mode) {
                // if edit mode
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        // swallow checkbox or radio button
                        Evas_Object *content = NULL;
                        Evas_Object *icon = NULL;
@@ -172,9 +172,6 @@ _mp_album_detail_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_smart_callback_add(icon, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(icon, &item->checked);
 
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", icon);
-
                        return content;
                }
        }

diff --git a/src/widget/mp-album-list.c b/src/widget/mp-album-list.c
index feefb92..54e8623 100755 (executable)
--- a/src/widget/mp-album-list.c
+++ b/src/widget/mp-album-list.c
@@ -169,15 +169,13 @@ _mp_album_list_icon_get(void *data, Evas_Object * obj, const char *part)
 
        if (list->edit_mode) {
                // if edit mode
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        // swallow checkbox or radio button
                        check = elm_check_add(obj);
                        elm_object_style_set(check, "default");
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", check);
                        return content;
                }
        }

diff --git a/src/widget/mp-artist-detail-list.c b/src/widget/mp-artist-detail-list.c
index db088d2..7746c01 100755 (executable)
--- a/src/widget/mp-artist-detail-list.c
+++ b/src/widget/mp-artist-detail-list.c
@@ -135,7 +135,7 @@ _mp_artist_detail_list_album_icon_get(void *data, Evas_Object * obj, const char
                return content;
        }
        if (list->edit_mode) {
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        content = elm_layout_add(obj);
 
                        icon = elm_check_add(obj);
@@ -144,9 +144,6 @@ _mp_artist_detail_list_album_icon_get(void *data, Evas_Object * obj, const char
                        elm_check_state_pointer_set(icon, &item->checked);
                        evas_object_smart_callback_add(icon, "changed", _mp_artist_detail_list_check_changed_cb, item);
 
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", icon);
-
                        return content;
                }
        }
@@ -315,9 +312,6 @@ _mp_artist_detail_list_track_icon_get(void *data, Evas_Object * obj, const char
                        elm_check_state_pointer_set(icon, &item->checked);
                        evas_object_smart_callback_add(icon, "changed", _mp_artist_detail_list_check_changed_cb, item);
 
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", icon);
-
                        return content;
                }
        }

diff --git a/src/widget/mp-artist-list.c b/src/widget/mp-artist-list.c
index 41c7b3d..e27dc4e 100755 (executable)
--- a/src/widget/mp-artist-list.c
+++ b/src/widget/mp-artist-list.c
@@ -192,15 +192,13 @@ _mp_artist_list_icon_get(void *data, Evas_Object *obj, const char *part)
 
        Evas_Object *check = NULL;
        if (list->edit_mode) {
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        content = elm_layout_add(obj);
                        check = elm_check_add(obj);
                        elm_object_style_set(check, "default");
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", check);
 
                        return content;
                }

diff --git a/src/widget/mp-search-list.c b/src/widget/mp-search-list.c
index 7ee7e96..13e49d4 100755 (executable)
--- a/src/widget/mp-search-list.c
+++ b/src/widget/mp-search-list.c
@@ -95,20 +95,20 @@ _mp_search_track_list_label_get(void *data, Evas_Object * obj, const char *part)
        MP_CHECK_NULL(list);
        MP_CHECK_NULL(part);
 
-       if (!strcmp(part, "elm.text.main.left.top")) {
+       if (!strcmp(part, "elm.text")) {
                char *title = NULL;
 
                mp_media_info_get_title(track,  &title);
 
                mp_retv_if(!title, NULL);
-               if (!strcmp(part, "elm.text.main.left.top")) {
+               if (!strcmp(part, "elm.text")) {
                        bool res = false;
                        char *markup_name = (char *)mp_util_search_markup_keyword(title, list->filter_str, &res);
                        return (res) ? g_strdup(markup_name) : elm_entry_utf8_to_markup(title);
                } else {
                        return g_strdup(title);
                }
-       } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
+       } else if (!strcmp(part, "elm.text.sub")) {
                char *artist = NULL;
 
                mp_media_info_get_artist(track, &artist);
@@ -128,7 +128,7 @@ _mp_search_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
        mp_media_info_h track = item_data->handle;
        mp_retvm_if(!track, NULL, "data is null");
 
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *content = NULL;
                content = elm_layout_add(obj);
                char *thumbpath = NULL;
@@ -244,14 +244,14 @@ _mp_search_album_list_label_get(void *data, Evas_Object * obj, const char *part)
        MP_CHECK_NULL(list);
        MP_CHECK_NULL(part);
 
-       if (!strcmp(part, "elm.text.main.left.top")) {
+       if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
                }
 
-               if (!strcmp(part, "elm.text.main.left.top")) {
+               if (!strcmp(part, "elm.text")) {
                        bool res = false;
                        char *markup_name = (char *)mp_util_search_markup_keyword(name, list->filter_str, &res);
                        return (res) ? g_strdup(markup_name) : elm_entry_utf8_to_markup(name);
@@ -259,7 +259,7 @@ _mp_search_album_list_label_get(void *data, Evas_Object * obj, const char *part)
                        return g_strdup(name);
                }
 
-       } else if (!strcmp(part, "elm.text.sub.left.bottom")) {
+       } else if (!strcmp(part, "elm.text.sub")) {
                ret = mp_media_info_group_get_sub_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
@@ -284,7 +284,7 @@ _mp_search_album_list_icon_get(void *data, Evas_Object * obj, const char *part)
        mp_retv_if(svc_item == NULL, NULL);
        MP_CHECK_NULL(part);
 
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *content = NULL;
                content = elm_layout_add(obj);
                Evas_Object *icon = NULL;
@@ -354,13 +354,13 @@ _mp_search_artist_list_label_get(void *data, Evas_Object * obj, const char *part
        MP_CHECK_NULL(list);
        MP_CHECK_NULL(part);
 
-       if (!strcmp(part, "elm.text.main.left.top")) {
+       if (!strcmp(part, "elm.text")) {
                ret = mp_media_info_group_get_main_info(svc_item, &name);
                mp_retvm_if((ret != 0), NULL, "Fail to get value");
                if (!name || !strlen(name)) {
                        name = GET_SYS_STR("IDS_COM_BODY_UNKNOWN");
                }
-               if (!strcmp(part, "elm.text.main.left.top")) {
+               if (!strcmp(part, "elm.text")) {
                        bool res = false;
                        char *markup_name = (char *)mp_util_search_markup_keyword(name, list->filter_str, &res);
                        return (res) ? g_strdup(markup_name) : elm_entry_utf8_to_markup(name);
@@ -381,7 +381,7 @@ _mp_search_artist_list_icon_get(void *data, Evas_Object * obj, const char *part)
        mp_media_info_h svc_item = item_data->handle;
        mp_retv_if(svc_item == NULL, NULL);
 
-       if (!strcmp(part, "elm.icon.1")) {
+       if (!strcmp(part, "elm.swallow.icon")) {
                Evas_Object *content = NULL;
                content = elm_layout_add(obj);
                char *thumb_name = NULL;
@@ -441,7 +441,7 @@ _mp_search_list_gl_label_get_title(void *data, Evas_Object * obj, const char *pa
        startfunc;
        char *text = NULL;
 
-       if (!strcmp(part, "elm.text.main")) {
+       if (!strcmp(part, "elm.text")) {
                text = GET_STR(data);
                return g_strdup(text);
        }
@@ -465,9 +465,7 @@ static void _mp_search_list_set_itc(void *thiz)
        if (!list->itc_track) {
                list->itc_track = elm_genlist_item_class_new();
                MP_CHECK(list->itc_track);
-               //list->itc_track->item_style =  "music/2line.top";//"music/2text.1icon.tb";
-               list->itc_track->item_style =  "2line.top";//"music/2text.1icon.tb";
-               //list->itc_track->item_style =  "1linenew.top";//"music/2text.1icon.tb";
+               list->itc_track->item_style =  "type1";
                list->itc_track->func.text_get = _mp_search_track_list_label_get;
                list->itc_track->func.content_get = _mp_search_track_list_icon_get;
                list->itc_track->func.del = _mp_search_list_item_del;
@@ -475,8 +473,7 @@ static void _mp_search_list_set_itc(void *thiz)
        if (!list->itc_album) {
                list->itc_album = elm_genlist_item_class_new();
                MP_CHECK(list->itc_album);
-               //list->itc_album->item_style =  "music/2line.top";//"music/2text.1icon.tb";
-               list->itc_album->item_style =  "2line.top";//"music/2text.1icon.tb";
+               list->itc_album->item_style =  "type1";
                list->itc_album->func.text_get = _mp_search_album_list_label_get;
                list->itc_album->func.content_get = _mp_search_album_list_icon_get;
                list->itc_album->func.del = _mp_search_list_item_del;
@@ -484,7 +481,7 @@ static void _mp_search_list_set_itc(void *thiz)
        if (!list->itc_artist) {
                list->itc_artist = elm_genlist_item_class_new();
                MP_CHECK(list->itc_artist);
-               list->itc_artist->item_style = "2line.top";//"music/1text.1icon.2.tb";
+               list->itc_artist->item_style = "type1";
                list->itc_artist->func.text_get = _mp_search_artist_list_label_get;
                list->itc_artist->func.content_get = _mp_search_artist_list_icon_get;
                list->itc_artist->func.del = _mp_search_list_item_del;
@@ -492,7 +489,7 @@ static void _mp_search_list_set_itc(void *thiz)
        if (!list->itc_group_title) {
                list->itc_group_title = elm_genlist_item_class_new();
                MP_CHECK(list->itc_group_title);
-               list->itc_group_title->item_style = "groupindex";//"music/groupindex";
+               list->itc_group_title->item_style = "groupindex";
                list->itc_group_title->func.text_get = _mp_search_list_gl_label_get_title;
        }
 }

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index 7b78199..4f9485e 100644 (file)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -210,7 +210,7 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
 
        if (list->edit_mode) {
                // if edit mode
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        // swallow checkbox or radio button
 
                        check = elm_check_add(obj);
@@ -218,23 +218,19 @@ _mp_track_list_icon_get(void *data, Evas_Object * obj, const char *part)
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        evas_object_smart_callback_add(check, "changed", mp_common_view_check_changed_cb, NULL);
                        elm_check_state_pointer_set(check, &item->checked);
-                       elm_layout_theme_set(content, "layout", "list/C/type.2", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", check);
 
                        return content;
                }
        }
 
        if (list->reorderable) {
-               if (!strcmp(part, "elm.icon.2")) {
+               if (!strcmp(part, "elm.swallow.end")) {
                        Evas_Object *thumbnail = NULL;
                        thumbnail = elm_image_add(obj);
                        elm_image_file_set(thumbnail, IMAGE_EDJ_NAME, MP_LITE_REORDER_ICON);
                        evas_object_color_set(thumbnail, 8, 8, 8, 204);
                        evas_object_size_hint_align_set(thumbnail, EVAS_HINT_FILL, EVAS_HINT_FILL);
                        evas_object_size_hint_weight_set(thumbnail, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                       elm_layout_theme_set(content, "layout", "list/C/type.1", "default");
-                       elm_layout_content_set(content, "elm.swallow.content", thumbnail);
 
                        return content;
                }