[TIZENIOT-2075] Fixed issue regarding not able to delete items from "Favorites" folder

Change-Id: I9354e71c0b8248d810c08a717cc48bdf26a1f6cc
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/res/edje/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
index e25c8f9acbc641cba76de4b40a4a18e2efcf375e..8a302c8f50a6262feea3f9bebdb002be86ff57cb 100755 (executable)
--- a/res/edje/gl-gengrid-item-thumbview.edc
+++ b/res/edje/gl-gengrid-item-thumbview.edc
@@ -156,7 +156,7 @@ group {
                                visible: 1;
                                rel1{relative: 0.01 0.02;}
                                rel2{relative: 0.915 0.98;}
-                               color: 255 255 255 255;
+                               color: 255 255 255 0;
                        }
                }
                part {

diff --git a/res/edje/images/No_thumbnail_2.png b/res/edje/images/No_thumbnail_2.png
index 7dc6539b853d7561b27e6be1fc53322ddef6413d..9f69243ad325d0fb3c55f38b1dc5de9d576711e7 100755 (executable)
Binary files a/res/edje/images/No_thumbnail_2.png and b/res/edje/images/No_thumbnail_2.png differ

diff --git a/res/edje/images/No_thumbnail_video.png b/res/edje/images/No_thumbnail_video.png
index 8535370039a77036f6027a09ae02e57990a3b67d..fb9ca3c3606824cb5bdc71e2d6a10ad2fbe6e2f8 100755 (executable)
Binary files a/res/edje/images/No_thumbnail_video.png and b/res/edje/images/No_thumbnail_video.png differ

diff --git a/src/2dview/gl-thumbs.c b/src/2dview/gl-thumbs.c
index 4ae3b96abedde97b4389dc17bb805e20e9661a45..9d67d63ead1600202609060c2cb6a8ac38b0ce81 100755 (executable)
--- a/src/2dview/gl-thumbs.c
+++ b/src/2dview/gl-thumbs.c
@@ -298,7 +298,7 @@ static void __gl_thumbs_check_changed(void *data, Evas_Object * obj,
        if (checked) {
                if (strcmp(gitem->album->cluster->uuid, GL_ALBUM_FAVOURITE_ID) ==
                        0) {
-                       Eina_List *sel_list1 = ad->selinfo.fav_elist;
+                       Eina_List *sel_list1 = ad->selinfo.elist;
                        bool flag = _gl_check_item_already_selected(ad->selinfo.elist, gitem);
                        if (flag) {
                                if (gitem->item->type == MEDIA_CONTENT_TYPE_IMAGE) {
@@ -310,11 +310,11 @@ static void __gl_thumbs_check_changed(void *data, Evas_Object * obj,
                                gitem->checked = !checked;
                        } else {
                                sel_list1 = eina_list_append(sel_list1, gitem);
-                               ad->selinfo.fav_elist = sel_list1;
+                               ad->selinfo.elist = sel_list1;
                                gitem->album->elist = eina_list_append(gitem->album->elist, gitem);
                        }
                } else {
-                       bool flag = _gl_check_item_already_selected(ad->selinfo.fav_elist, gitem);
+                       bool flag = _gl_check_item_already_selected(ad->selinfo.elist, gitem);
                        if (flag) {
                                if (gitem->item->type == MEDIA_CONTENT_TYPE_IMAGE) {
                                        _gl_notify_create_notiinfo(GL_STR_IMAGE_ALREADY_SELECTED_IN_OTHER_ALBUM);
@@ -334,7 +334,7 @@ static void __gl_thumbs_check_changed(void *data, Evas_Object * obj,
                gl_sdbg("Remove:%s", gitem->item->file_url);
                if (strcmp(gitem->album->cluster->uuid, GL_ALBUM_FAVOURITE_ID) ==
                        0) {
-                       _gl_data_selected_fav_list_remove(ad, gitem);
+                       _gl_data_selected_list_remove(ad, gitem);
                } else {
                        _gl_data_selected_list_remove(ad, gitem);
                }

diff --git a/src/data/gl-data.c b/src/data/gl-data.c
index d1b66d4f88da5390c16e39916c3707c59a2032c6..882389e1d82338ab73801448e2e51e2988623c6e 100755 (executable)
--- a/src/data/gl-data.c
+++ b/src/data/gl-data.c
@@ -1393,7 +1393,14 @@ int _gl_data_selected_list_finalize(void *data)
                }
        }
 
+       EINA_LIST_FREE(ad->selinfo.fav_elist, gitem) {
+               if (gitem) {
+                       gitem->checked = false;
+               }
+       }
+
        ad->selinfo.elist = NULL;
+       ad->selinfo.fav_elist = NULL;
        ad->selinfo.images_cnt = 0;
        ad->selinfo.disable_hide_cnt = 0;
        gl_dbg("Selected list freed");
@@ -1414,10 +1421,15 @@ int _gl_data_clear_selected_info(void *data)
                return -1;
        }
 
+       if(ad->selinfo.fav_elist) {
+               eina_list_free(ad->selinfo.fav_elist);
+       }
+
        eina_list_free(ad->selinfo.elist);
        gl_dbg("eina free selected list");
 
        ad->selinfo.elist = NULL;
+       ad->selinfo.fav_elist = NULL;
        ad->selinfo.images_cnt = 0;
        ad->selinfo.disable_hide_cnt = 0;
        return 0;