musicplayer: modify play icon

Change-Id: Ia2b079afa852632d68fa65f38fe46440ff523ba4
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/view/mplayer.h b/include/view/mplayer.h
index 988daf9..94d9897 100644 (file)
--- a/include/view/mplayer.h
+++ b/include/view/mplayer.h
@@ -61,7 +61,7 @@
 #define IMAGE_MUSIC_SHUFFLE_DIS_NORMAL "btn_music_contr_shuffle_dis.png"
 #define IMAGE_MUSIC_REPEAT_FOCUS "btn_music_contr_repeat_foc.png"
 #define IMAGE_MUSIC_REPEAT_NORMAL "btn_music_contr_repeat_nor.png"
-#define IMAGE_MUSIC_LIST_PLAY "ic_music_list_play.png"
-#define IMAGE_MUSIC_LIST_PLAY_FOC "ic_music_list_play_foc.png"
+#define IMAGE_MUSIC_LIST_PLAY "ic_mini_player_play_nor.png"
+#define IMAGE_MUSIC_LIST_PLAY_FOC "ic_mini_player_play_foc.png"
 
 #endif

diff --git a/res/edc/images/ic_mini_player_play_foc.png b/res/edc/images/ic_mini_player_play_foc.png
new file mode 100644 (file)
index 0000000..bf5d08e
Binary files /dev/null and b/res/edc/images/ic_mini_player_play_foc.png differ

diff --git a/res/edc/images/ic_mini_player_play_nor.png b/res/edc/images/ic_mini_player_play_nor.png
new file mode 100644 (file)
index 0000000..c060830
Binary files /dev/null and b/res/edc/images/ic_mini_player_play_nor.png differ

diff --git a/res/edc/images/ic_music_list_play.png b/res/edc/images/ic_music_list_play.png
deleted file mode 100644 (file)
index 4bcf815..0000000
Binary files a/res/edc/images/ic_music_list_play.png and /dev/null differ

diff --git a/res/edc/images/ic_music_list_play_foc.png b/res/edc/images/ic_music_list_play_foc.png
deleted file mode 100644 (file)
index cced494..0000000
Binary files a/res/edc/images/ic_music_list_play_foc.png and /dev/null differ

diff --git a/res/edc/widgets/genlist.edc b/res/edc/widgets/genlist.edc
index c93f86d..3e035dc 100644 (file)
--- a/res/edc/widgets/genlist.edc
+++ b/res/edc/widgets/genlist.edc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LIST_TRANSITION_TIME 0.30
+#define LIST_TRANSITION_TIME 0.35
 
 group {
        name: "elm/genlist/item/music_list/default";
@@ -84,7 +84,7 @@ group {
                        description {
                                state: "default" 0.1;
                                inherit: "default" 0.0;
-                               min: 40 140;
+                               min: 54 140;
                        }
                }
                part {
@@ -93,7 +93,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 40 40;
+                               min: 54 54;
                                rel1 {
                                        to: "image_bg";
                                        relative: 0.5 0.5;
@@ -109,7 +109,6 @@ group {
                        description {
                                state: "default" 0.1;
                                inherit: "default" 0.0;
-                               min: 40 40;
                                fixed: 1 1;
                                image.normal: IMAGE_MUSIC_LIST_PLAY;
                                visible: 1;
@@ -117,7 +116,6 @@ group {
                        description {
                                state: "focused" 0.1;
                                inherit: "default" 0.0;
-                               min: 40 40;
                                fixed: 1 1;
                                image.normal: IMAGE_MUSIC_LIST_PLAY_FOC;
                                visible: 1;
@@ -143,7 +141,7 @@ group {
                        description {
                                state: "default" 0.1;
                                inherit: "default" 0.0;
-                               min: 28 140;
+                               min: 18 140;
                        }
                }
                part {

diff --git a/src/view/mplayer.c b/src/view/mplayer.c
index a548f46..64348ab 100644 (file)
--- a/src/view/mplayer.c
+++ b/src/view/mplayer.c
@@ -494,27 +494,24 @@ static void _list_item_del(void *data, Evas_Object *obj)
 static char *_list_text_get(void *data, Evas_Object *obj, const char *part)
 {
        struct _list_data *ld;
-       app_media *am;
        app_media_info *mi;
-       Elm_Object_Item *item;
+       int index;
        char buf[1024];
 
        if (!data)
                return NULL;
 
        ld = data;
-       am = ld->am;
-       item = ld->item;
+       index = elm_genlist_item_index_get(ld->item);
 
-       mi = app_media_get_info(am);
+       mi = app_media_get_info(ld->am);
        if (!mi) {
                _ERR("failed to get media info");
                return NULL;
        }
 
        if (!strcmp(part, PART_ELM_TEXT_TITLE)) {
-               snprintf(buf, sizeof(buf), "%02d. %s",
-                               elm_genlist_item_index_get(item), mi->title);
+               snprintf(buf, sizeof(buf), "%02d. %s", index, mi->title);
        } else if (!strcmp(part, PART_ELM_TEXT_ARTIST)) {
                snprintf(buf, sizeof(buf), "%s / %s",
                                mi->audio->artist, mi->audio->album);