remove grid related code from layout

Change-Id: I6ebf7839941cd6c163b6f5d62c9aff8acb25e689
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

2 files changed, 23 insertions, 29 deletions

diff --git a/include/grid/grid.h b/include/grid/grid.h
index 425843c..da89cf9 100644
--- a/include/grid/grid.h
+++ b/include/grid/grid.h
@@ -46,9 +46,12 @@ struct grid_data {
 	int item_x;
 	int item_y;
 	int item_num;
+	int grid_padding;
 	struct grid_class *gclass;
 	Eina_List *(*get_item_list)(struct mediadata *md);
-	void (*item_selected)(Eina_List *list, app_media *am);
+	void (*key_down_cb)(void *data, Elm_Object_Item *it,
+				Evas_Event_Key_Down *ev);
+	void (*selected_cb)(void *data, Elm_Object_Item *it);
 };
 
 struct grid_data *get_movie_grid_data(int type);
@@ -56,21 +59,24 @@ struct grid_data *get_gallery_grid_data(int type);
 struct grid_data *get_music_grid_data(int type);
 
 #define STYLE_MOVIE_NAME "movie_item"
-#define MOVIE_NAME_PADDING 26
-#define MOVIE_NAME_ITEM_X (378 + MOVIE_NAME_PADDING)
-#define MOVIE_NAME_ITEM_Y (294 + MOVIE_NAME_PADDING)
+#define MOVIE_NAME_ITEM_PADDING 26
+#define MOVIE_NAME_ITEM_X (378 + MOVIE_NAME_ITEM_PADDING)
+#define MOVIE_NAME_ITEM_Y (294 + MOVIE_NAME_ITEM_PADDING)
 #define MOVIE_NAME_ITEM_NUM 2
+#define MOVIE_NAME_GRID_PADDING (62 - MOVIE_NAME_ITEM_PADDING)
 
 #define STYLE_GALLERY_EVENT "gallery_item"
-#define GALLERY_EVENT_PADDING 6
-#define GALLERY_EVENT_ITEM_X (200 + GALLERY_EVENT_PADDING)
-#define GALLERY_EVENT_ITEM_Y (200 + GALLERY_EVENT_PADDING)
+#define GALLERY_EVENT_ITEM_PADDING 6
+#define GALLERY_EVENT_ITEM_X (200 + GALLERY_EVENT_ITEM_PADDING)
+#define GALLERY_EVENT_ITEM_Y (200 + GALLERY_EVENT_ITEM_PADDING)
 #define GALLERY_EVENT_ITEM_NUM 3
+#define GALLERY_EVENT_GRID_PADDING (62 - GALLERY_EVENT_ITEM_PADDING)
 
 #define STYLE_MUSIC_SONG "song_item"
-#define MUSIC_SONG_PADDING 26
-#define MUSIC_SONG_ITEM_X (488 + MUSIC_SONG_PADDING)
-#define MUSIC_SONG_ITEM_Y (134 + MUSIC_SONG_PADDING)
+#define MUSIC_SONG_ITEM_PADDING 26
+#define MUSIC_SONG_ITEM_X (488 + MUSIC_SONG_ITEM_PADDING)
+#define MUSIC_SONG_ITEM_Y (134 + MUSIC_SONG_ITEM_PADDING)
 #define MUSIC_SONG_ITEM_NUM 4
+#define MUSIC_SONG_GRID_PADDING (62 - MUSIC_SONG_ITEM_PADDING)
 
 #endif /* __AIR_MEDIAHUB_GRID_H__ */
diff --git a/include/util/listmgr.h b/include/util/listmgr.h
index f90bb0b..f3bd96e 100644
--- a/include/util/listmgr.h
+++ b/include/util/listmgr.h
@@ -19,35 +19,22 @@
 
 struct listmgr;
 
-struct play_info_ops {
+struct play_info_data {
 	bool (*draw)(void *data, Evas_Object *base);
 	bool (*update)(void *data, Evas_Object *base);
 
 	void (*selected_cb)(void *data, Evas_Object *obj);
-	void *ops_data;
-};
-
-struct grid_ops {
-	struct grid_class *gclass;
-
-	void (*key_down_cb)(void *data, Elm_Object_Item *it,
-				Evas_Event_Key_Down *ev);
-	void (*selected_cb)(void *data, Elm_Object_Item *it);
-	void *ops_data;
+	void *cb_data;
 };
 
 struct listmgr_data {
 	Evas_Object *menu_btn;
 	Evas_Object *view_btn;
 
-	int grid_item_x;
-	int grid_item_y;
-	int grid_num_item;
-
-	int box_padding;
+	struct play_info_data *pdata;
 
-	struct play_info_ops *pops;
-	struct grid_ops *gops;
+	struct grid_data *gdata;
+	void *grid_cb_data;
 };
 
 struct listmgr *listmgr_create(Evas_Object *base, void *data);
@@ -55,7 +42,8 @@ void listmgr_destroy(struct listmgr *listmgr);
 
 bool listmgr_draw_list_area(struct listmgr *lmgr);
 bool listmgr_update_content_item(struct listmgr *lmgr);
-bool listmgr_update_content_list(struct listmgr *lmgr, Eina_List *list);
+bool listmgr_update_content_list(struct listmgr *lmgr, Eina_List *list,
+			struct grid_data *gdata);
 bool listmgr_update_play_info(struct listmgr *lmgr, app_media_info *info);
 
 bool listmgr_focus_content_list(struct listmgr *lmgr, const char *id);