TIZENIOT-1736[Change icons in playlist view] and Resolves reorder issue

Change-Id: I3a922caabf7fd71f4052524934b9b20d7dec2be2

diff --git a/shared/res/shared_images/T02_playlist_recently_added.png b/shared/res/shared_images/T02_playlist_recently_added.png
index 1d9df9fce9b9f60ed6eedcc460a07d2df96b8e68..ed5cf03a1bc53ef0240172a4e86599a446ac0ea5 100755 (executable)
Binary files a/shared/res/shared_images/T02_playlist_recently_added.png and b/shared/res/shared_images/T02_playlist_recently_added.png differ

diff --git a/shared/res/shared_images/T02_playlist_starred.png b/shared/res/shared_images/T02_playlist_starred.png
index 7730c030a8883cadf64b77860f5391c378a296de..121d249f5bf1b4baa8756e8504f9577c46127a64 100755 (executable)
Binary files a/shared/res/shared_images/T02_playlist_starred.png and b/shared/res/shared_images/T02_playlist_starred.png differ

diff --git a/shared/res/shared_images/default_album_art_120.png b/shared/res/shared_images/default_album_art_120.png
index e8f5ffddc4d1c6edeaa8945455a9c1306f4fe223..5760c91d38c2f5281b908c1578e5b8dba02a8a1b 100755 (executable)
Binary files a/shared/res/shared_images/default_album_art_120.png and b/shared/res/shared_images/default_album_art_120.png differ

diff --git a/src/common/mp-media-info.c b/src/common/mp-media-info.c
index daefa3e0e01f3d57375b8d2cb26ccae958f11e9f..6813d2c8cf0686ae6ce6aac0b7bc71b400457384 100755 (executable)
--- a/src/common/mp-media-info.c
+++ b/src/common/mp-media-info.c
@@ -2177,9 +2177,24 @@ int mp_media_info_group_list_create(mp_media_list_h * media_list,
 
                char names[][50] = { STR_MP_RECENTLY_ADDED, STR_MP_MOST_PLAYED, STR_MP_FAVOURITES,
                                STR_MP_RECENTLY_PLAYED };
-
-               char thumb[][4096] = { THUMBNAIL_RECENTLY_ADDED, THUMBNAIL_MOST_PLAYED, THUMBNAIL_QUICK_LIST,
-                               THUMBNAIL_RECENTLY_PLAYED };
+               char thumbnail_recently_added[1024] = { 0 };
+               char thumbnail_most_played[1024] = { 0 };
+               char thumbnail_quick_list[1024] = { 0 };
+               char thumbnail_recently_played[1024] = { 0 };
+               char *shared_path = app_get_shared_resource_path();
+               if(shared_path == NULL) {
+                       ERROR_TRACE("Unable to get path for image");
+                       return 0;
+               }
+               snprintf(thumbnail_recently_added, 1024, "%s%s/%s",
+                                       shared_path,"shared_images","T02_playlist_recently_added.png");
+               snprintf(thumbnail_most_played, 1024, "%s%s/%s",
+                                       shared_path,"shared_images","T02_playlist_most_played.png");
+               snprintf(thumbnail_quick_list, 1024, "%s%s/%s",
+                                       shared_path,"shared_images","T02_playlist_starred.png");
+               snprintf(thumbnail_recently_played, 1024, "%s%s/%s",
+                                       shared_path,"shared_images","T02_playlist_recently_played.png");
+               free(shared_path);
 
                for (i = 0; i < 4; i++) {
                        media_info = calloc(1, sizeof(struct mp_media_info_s));
@@ -2192,7 +2207,17 @@ int mp_media_info_group_list_create(mp_media_list_h * media_list,
                        }
 
                        media_info->i.ginfo->main_info = g_strdup(names[i]);
-                       media_info->i.ginfo->thumb_path = g_strdup(thumb[i]);
+                       if(!strcmp(names[i], STR_MP_RECENTLY_ADDED))
+                               media_info->i.ginfo->thumb_path = g_strdup(thumbnail_recently_added);
+
+                       else if(!strcmp(names[i],STR_MP_MOST_PLAYED))
+                               media_info->i.ginfo->thumb_path = g_strdup(thumbnail_most_played);
+
+                       else if(!strcmp(names[i],STR_MP_FAVOURITES))
+                               media_info->i.ginfo->thumb_path = g_strdup(thumbnail_quick_list);
+
+                       else
+                               media_info->i.ginfo->thumb_path = g_strdup(thumbnail_recently_played);
                        media_info->s.group_type = group_type;
                        (*media_list)->list =
                                g_list_append((*media_list)->list, media_info);

diff --git a/src/view/mp-edit-view.c b/src/view/mp-edit-view.c
index 64e26c0075c489b0995a5d71357afeb625610fec..8f64796bc78b2c3abae1ae01a81c03bd5c3c2f76 100755 (executable)
--- a/src/view/mp-edit-view.c
+++ b/src/view/mp-edit-view.c
@@ -55,14 +55,16 @@ int _mp_edit_view_update(void *thiz)
        MpEditView_t *view = thiz;
        MP_CHECK_VAL(view, -1);
 
+       if (view->list_mode != MP_EDIT_VIEW_REORDER) {
+               mp_list_set_edit(view->content_to_show, EINA_TRUE);
+       }
+       mp_list_update(view->content_to_show);
        if (view->list_mode == MP_EDIT_VIEW_REORDER) {
                view->reorder = false;
                mp_list_set_edit(view->content_to_show, EINA_FALSE);
                mp_list_set_reorder(view->content_to_show, EINA_TRUE);
-       } else {
-               mp_list_set_edit(view->content_to_show, EINA_TRUE);
        }
-       mp_list_update(view->content_to_show);
+
        unsigned int count =
                mp_list_get_editable_count((MpList_t *) view->content_to_show,
                                                                   MP_LIST_EDIT_TYPE_NORMAL);
@@ -707,4 +709,4 @@ int mp_edit_view_destory(MpEditView_t * view)
        MP_CHECK_VAL(view, -1);
 
        return 0;
-}
+}
\ No newline at end of file