main.c: refactoring.

1 files changed, 189 insertions, 119 deletions

diff --git a/source/3-final/src/main.c b/source/3-final/src/main.c
index 74f00fa..fe9bc16 100644
--- a/source/3-final/src/main.c
+++ b/source/3-final/src/main.c
@@ -3,98 +3,34 @@
 #define PACKAGE_BIN_DIR "/usr/local/bin"
 #define PACKAGE_DATA_DIR "/usr/local/share/sample"
 
-Evas_Object *
-create_button(Evas_Object *parent)
-{
-   Evas_Object *btn;
-   btn = elm_button_add(parent);
-   evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_show(btn);
-
-   return btn;
-}
+Evas_Object *create_button(Evas_Object *parent);
+Evas_Object *create_image(Evas_Object *parent, char *path, char *group);
+void btn_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info);
+void btn_clicked(void *data, Evas_Object *obj, void *event_info);
+void _left_arrow_clicked_cb(void *data, Evas_Object *obj, void *info);
+void _right_arrow_clicked_cb(void *data, Evas_Object *obj, void *info);
+void _btn_effect(Evas_Object *obj);
 
 Evas_Object *
-create_image(Evas_Object *parent, char *path, char *group)
-{
-   Evas_Object *img;
-   img = elm_image_add(parent);
-   elm_image_file_set(img, path, group);
-   evas_object_show(img);
-
-   return img;
-}
-
-void
-_btn_effect(Evas_Object *obj)
-{
-   evas_object_raise(obj);
-
-   Elm_Transit *transit = elm_transit_add();
-   elm_transit_object_add(transit, obj);
-   elm_transit_duration_set(transit, 0.25);
-   elm_transit_auto_reverse_set(transit, EINA_TRUE);
-   elm_transit_effect_zoom_add(transit, 1.0, 1.25);
-   //elm_transit_smooth_set(transit, EINA_FALSE); // EFL 1.8
-   elm_transit_go(transit);
-}
-
-void
-btn_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-   _btn_effect(obj);
-}
-
-void
-btn_clicked(void *data, Evas_Object *obj, void *event_info)
+create_win()
 {
-   _btn_effect(obj);
-}
+   Evas_Object *win = NULL;
 
-void
-toolbar_it_cb(void *data, Evas_Object *obj, void *event_info)
-{
-   Elm_Object_Item *it = event_info;
-   printf("%s\n", elm_object_item_text_get(it));
-   Evas_Object *layout = data;
-   if (!layout) return;
-   elm_layout_text_set(layout, "elm.text.news", elm_object_item_text_get(it));
-}
-
-void
-_left_arrow_clicked_cb(void *data, Evas_Object *obj, void *info)
-{
-   Evas_Object *layout = data;
-   if (!layout) return;
-   elm_layout_signal_emit(layout, "elm,state,arrow,hide" , "elm");
-}
-
-void
-_right_arrow_clicked_cb(void *data, Evas_Object *obj, void *info)
-{
-   Evas_Object *layout = data;
-   if (!layout) return;
-   elm_layout_signal_emit(layout, "elm,state,arrow,show" , "elm");
-}
-
-void
-init()
-{
-   Evas_Object *win, *layout, *table, *toolbar, *btn, *img, *label;
-   char buf[PATH_MAX], buf2[256];
-   int i, j;
-   Evas_Coord padding_size;
-
-   //Create a Window
-   //win = elm_win_util_standard_add(elm_app_name_get(), elm_app_name_get()); // EFL 1.8
-   win = elm_win_util_standard_add("sample", "Sample");
+   win = elm_win_util_standard_add(elm_app_name_get(), elm_app_name_get());
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
    elm_win_autodel_set(win, EINA_TRUE);
    evas_object_resize(win, 720, 400);
    evas_object_show(win);
 
-   //Create a Layout
+   return win;
+}
+
+Evas_Object *
+create_layout(Evas_Object *win)
+{
+   Evas_Object *layout = NULL;
+   char buf[PATH_MAX];
+
    layout = elm_layout_add(win);
    snprintf(buf, sizeof(buf), "%s/edj/layout.edj", elm_app_data_dir_get());
    elm_layout_file_set(layout, buf, "main");
@@ -102,60 +38,85 @@ init()
    elm_win_resize_object_add(win, layout);
    evas_object_show(layout);
 
-   //Create Top Contents
+   return layout;
+}
+
+void
+create_top_contents(Evas_Object *layout)
+{
+   Evas_Object *table = NULL, *btn = NULL, *img = NULL, *label = NULL;
+   int i =0;
+   char buf[PATH_MAX], buf2[PATH_MAX];
+
    table = elm_table_add(layout);
 
    for (i = 0; i < 5; i++)
-     {
-        btn = create_button(table);
-        snprintf(buf, sizeof(buf), "%s/edj/layout.edj", elm_app_data_dir_get());
-        snprintf(buf2, sizeof(buf2), "icon%d", i);
-        img = create_image(btn, buf, buf2);
-        elm_object_content_set(btn, img);
+         {
+                btn = create_button(table);
+                snprintf(buf, sizeof(buf), "%s/edj/layout.edj", elm_app_data_dir_get());
+                snprintf(buf2, sizeof(buf2), "icon%d", i);
+                img = create_image(btn, buf, buf2);
+                elm_object_content_set(btn, img);
 
-        elm_table_pack(table, btn, i, 0, 1, 1);
+                elm_table_pack(table, btn, i, 0, 1, 1);
 
-        label = elm_label_add(table);
-        snprintf(buf2, sizeof(buf2), "<color=#ffffff>item%d</color>", i);
-        elm_object_text_set(label, buf2);
-        evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set(label, 0.5, 0.5);
-        evas_object_show(label);
+                label = elm_label_add(table);
+                snprintf(buf2, sizeof(buf2), "<color=#ffffff>item%d</color>", i);
+                elm_object_text_set(label, buf2);
+                evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                evas_object_size_hint_align_set(label, 0.5, 0.5);
+                evas_object_show(label);
 
-        elm_table_pack(table, label, i, 1, 1, 1);
-     }
+                elm_table_pack(table, label, i, 1, 1, 1);
+         }
 
    elm_object_part_content_set(layout, "elm.swallow.top", table);
    evas_object_show(table);
 
-   //Create Middle Contents
+}
+
+void
+create_middle_contents(Evas_Object *layout)
+{
+   Evas_Object *table = NULL, *btn = NULL, *img = NULL;
+   Evas_Coord padding_size = 0;
+   int i = 0, j = 0;
+   char buf[PATH_MAX];
+
    table = elm_table_add(layout);
    padding_size = 7 * elm_config_scale_get();
    elm_table_padding_set(table, padding_size, padding_size);
 
    for (i = 0; i < 3; i++)
-     {
-        for (j = 0; j < 6; j++)
-          {
-             btn = create_button(table);
-
-             // elm_button "clicked" smart callback
-             //evas_object_smart_callback_add(btn, "clicked", btn_clicked, NULL);
-
-             // evas object mouse in callback
-             evas_object_event_callback_add(btn, EVAS_CALLBACK_MOUSE_IN, btn_mouse_in, NULL);
-             snprintf(buf, sizeof(buf), "%s/images/%d.jpg", elm_app_data_dir_get(), ((i * 6) + j));
-             img = create_image(btn, buf, NULL);
-             elm_object_content_set(btn, img);
-             elm_table_pack(table, btn, j, i, 1, 1);
-          }
-     }
+         {
+                for (j = 0; j < 6; j++)
+                  {
+                         btn = create_button(table);
+
+                         // elm_button "clicked" smart callback
+                         //evas_object_smart_callback_add(btn, "clicked", btn_clicked, NULL);
+
+                         // evas object mouse in callback
+                         evas_object_event_callback_add(btn, EVAS_CALLBACK_MOUSE_IN, btn_mouse_in, NULL);
+                         snprintf(buf, sizeof(buf), "%s/images/%d.jpg", elm_app_data_dir_get(), ((i * 6) + j));
+                         img = create_image(btn, buf, NULL);
+                         elm_object_content_set(btn, img);
+                         elm_table_pack(table, btn, j, i, 1, 1);
+                  }
+         }
 
    elm_object_part_content_set(layout, "elm.swallow.middle", table);
    evas_object_show(table);
+}
+
+void
+create_arrows(Evas_Object *layout)
+{
+   Evas_Object *btn = NULL, *img = NULL;
+   char buf[PATH_MAX];
 
    //Create a Left arrow
-   btn = create_button(table);
+   btn = create_button(layout);
    snprintf(buf, sizeof(buf), "%s/edj/layout.edj", elm_app_data_dir_get());
    img = create_image(btn, buf, "left_arrow");
    elm_object_content_set(btn, img);
@@ -164,15 +125,30 @@ init()
    evas_object_smart_callback_add(btn, "clicked", _left_arrow_clicked_cb, layout);
 
    //Create a Right arrow
-   btn = create_button(table);
+   btn = create_button(layout);
    snprintf(buf, sizeof(buf), "%s/edj/layout.edj", elm_app_data_dir_get());
    img = create_image(btn, buf, "right_arrow");
    elm_object_content_set(btn, img);
    elm_object_part_content_set(layout, "elm.swallow.right_arrow", btn);
    evas_object_show(btn);
    evas_object_smart_callback_add(btn, "clicked", _right_arrow_clicked_cb, layout);
+}
+
+void
+toolbar_it_cb(void *data, Evas_Object *obj, void *event_info)
+{
+   Elm_Object_Item *it = event_info;
+   printf("%s\n", elm_object_item_text_get(it));
+   Evas_Object *layout = data;
+   if (!layout) return;
+   elm_layout_text_set(layout, "elm.text.news", elm_object_item_text_get(it));
+}
+
+void
+create_bottom_contents(Evas_Object *layout)
+{
+   Evas_Object *toolbar = NULL;
 
-   //Create Bottom Contents
    toolbar = elm_toolbar_add(layout);
    elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
    //elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE); // EFL 1.8
@@ -189,6 +165,100 @@ init()
    evas_object_show(toolbar);
 }
 
+void
+init(void)
+{
+   Evas_Object *win = NULL, *layout = NULL;
+   Evas_Object *table = NULL, *toolbar = NULL;
+   Evas_Object *btn = NULL, *img = NULL, *label = NULL;
+   int i = 0, j = 0;
+
+   //Create a Window
+   win = create_win();
+
+   //Create a Layout
+   layout = create_layout(win);
+
+   //Create Top Contents
+   create_top_contents(layout);
+
+   //Create Middle Contents
+   create_middle_contents(layout);
+
+   //Create Arrows
+   create_arrows(layout);
+
+   //Create Bottom Contents
+   create_bottom_contents(layout);
+}
+
+Evas_Object *
+create_button(Evas_Object *parent)
+{
+   Evas_Object *btn = NULL;
+
+   btn = elm_button_add(parent);
+   evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(btn);
+
+   return btn;
+}
+
+Evas_Object *
+create_image(Evas_Object *parent, char *path, char *group)
+{
+   Evas_Object *img = NULL;
+
+   img = elm_image_add(parent);
+   elm_image_file_set(img, path, group);
+   evas_object_show(img);
+
+   return img;
+}
+
+void
+btn_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   _btn_effect(obj);
+}
+
+void
+btn_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+   _btn_effect(obj);
+}
+
+void
+_left_arrow_clicked_cb(void *data, Evas_Object *obj, void *info)
+{
+   Evas_Object *layout = data;
+   if (!layout) return;
+   elm_layout_signal_emit(layout, "elm,state,arrow,hide" , "elm");
+}
+
+void
+_right_arrow_clicked_cb(void *data, Evas_Object *obj, void *info)
+{
+   Evas_Object *layout = data;
+   if (!layout) return;
+   elm_layout_signal_emit(layout, "elm,state,arrow,show" , "elm");
+}
+
+void
+_btn_effect(Evas_Object *obj)
+{
+   evas_object_raise(obj);
+
+   Elm_Transit *transit = elm_transit_add();
+   elm_transit_object_add(transit, obj);
+   elm_transit_duration_set(transit, 0.25);
+   elm_transit_auto_reverse_set(transit, EINA_TRUE);
+   elm_transit_effect_zoom_add(transit, 1.0, 1.25);
+   //elm_transit_smooth_set(transit, EINA_FALSE); // EFL 1.8
+   elm_transit_go(transit);
+}
+
 EAPI_MAIN int
 elm_main(int argc, char **argv)
 {