From: Hermet Park Date: Wed, 15 Jun 2016 07:53:55 +0000 (+0900) Subject: examples/c: clean up code after review. X-Git-Tag: submit/tizen/20160617.075742~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F84%2F74684%2F3;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git examples/c: clean up code after review. Change-Id: I4104bba25a16a4d335c97dfa814a1361192bde66 --- diff --git a/src/examples/efl/c/page1.cpp b/src/examples/efl/c/page1.cpp index 2ebb6ca..1a262dc 100644 --- a/src/examples/efl/c/page1.cpp +++ b/src/examples/efl/c/page1.cpp @@ -36,6 +36,7 @@ view1_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -43,6 +44,7 @@ view1_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Basic View", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -62,6 +64,7 @@ create_page1() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_standard_view_create("page1"); if (!view) { @@ -69,8 +72,8 @@ create_page1() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view1_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set() is failed. err = %d", ret); diff --git a/src/examples/efl/c/page10.cpp b/src/examples/efl/c/page10.cpp index a3dcfcc..018dd1f 100644 --- a/src/examples/efl/c/page10.cpp +++ b/src/examples/efl/c/page10.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -view10_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { UI_VIEWMGR_VIEW_POP(); } static void -view10_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { create_page11(); } @@ -32,57 +32,75 @@ view10_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view10_rotate_cb(ui_view *view, int degree, void *data) { - Evas_Object *base_layout = ui_view_base_get(view); + Evas_Object *content = NULL; + Evas_Object *base = NULL; - if (degree == 0 || degree == 180) + //Get a base object from view. + base = ui_view_base_get(view); + if (!base) { - Evas_Object *content = create_content(base_layout, "ViewMgr Demo
Rotation", - view10_prev_btn_clicked_cb, view10_next_btn_clicked_cb); + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); + return false; + } - ui_standard_view_content_set(view, content, "Page10", NULL, NULL, NULL); + //Check orientation manually to create a content. + + //Portrait + if (degree == 0 || degree == 180) + { + content = create_content(base, "ViewMgr Demo
Rotation", prev_btn_clicked_cb, next_btn_clicked_cb); + if (!content) return false; ui_view_indicator_set(view, UI_VIEW_INDICATOR_DEFAULT); } + //Landscape else { - Evas_Object *content = create_landscape_content(base_layout, "ViewMgr Demo
Rotation", - view10_prev_btn_clicked_cb, view10_next_btn_clicked_cb); - - ui_standard_view_content_set(view, content, "Page10", NULL, NULL, NULL); + content = create_landscape_content(base, "ViewMgr Demo
Rotation", prev_btn_clicked_cb, next_btn_clicked_cb); + if (!content) return false; ui_view_indicator_set(view, UI_VIEW_INDICATOR_OPTIMAL); } + ui_standard_view_content_set(view, content, "Page10", NULL, NULL, NULL); + return true; } static bool view10_load_cb(ui_view *view, void *data) { - view10_rotate_cb(view, ui_view_degree_get(view), data); - - return true; + return view10_rotate_cb(view, ui_view_degree_get(view), data); } void create_page10() { + int ret = 0; + ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; ui_view_event_callback_s event_callback = {0, }; - lifecycle_callback.load = view10_load_cb; - event_callback.rotate = view10_rotate_cb; - - ui_view *view = ui_standard_view_create("page10"); + //Create a view. + view = ui_standard_view_create("page10"); + if (!view) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view"); + return; + } - int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL); - if (ret != 0) + //Set View Life-Cycle callbacks. + lifecycle_callback.load = view10_load_cb; + if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); + ui_view_destroy(view); + return; } - ret = ui_view_event_callbacks_set(view, &event_callback, NULL); - if (ret != 0) + //Set Rotation Event callbacks. + event_callback.rotate = view10_rotate_cb; + if (!(ret = ui_view_event_callbacks_set(view, &event_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_event_callback_set is failed. err = %d", ret); } UI_VIEWMGR_VIEW_PUSH(view); diff --git a/src/examples/efl/c/page11.cpp b/src/examples/efl/c/page11.cpp index 347cc5b..c936c9e 100644 --- a/src/examples/efl/c/page11.cpp +++ b/src/examples/efl/c/page11.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -view11_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { UI_VIEWMGR_VIEW_POP(); } static void -view11_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { create_page12(); } @@ -32,27 +32,60 @@ view11_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view11_load_cb(ui_view *view, void *data) { - Evas_Object *base_layout = ui_view_base_get(view); + Evas_Object *content = NULL; + Evas_Object *base = NULL; - Evas_Object *content = create_content(base_layout, "ViewMgr Demo
Menu Popup", - view11_prev_btn_clicked_cb, view11_next_btn_clicked_cb); + //Get a base object from view. + base = ui_view_base_get(view); + if (!base) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); + return false; + } + + //Create and set a main content. + content = create_content(base, "ViewMgr Demo
Menu Popup", prev_btn_clicked_cb, next_btn_clicked_cb); + if (!content) return false; - ui_standard_view_content_set(view, content, "Page11", NULL, NULL, NULL); + if (!ui_standard_view_content_set(view, content, "Page11", NULL, NULL, NULL)) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); + return false; + } return true; } -static void ctxpopup_item_select_cb(void *data, Evas_Object *obj, void *event_info) +static void +ctxpopup_item_select_cb(void *data, Evas_Object *obj, void *event_info) { - Elm_Object_Item *it = static_cast(event_info); - elm_ctxpopup_dismiss(obj); + Elm_Object_Item *it = (Elm_Object_Item *) event_info; LOGE("Item (%s) is selected", elm_object_item_text_get(it)); + elm_ctxpopup_dismiss(obj); } static bool view11_menu_cb(ui_menu *menu, void *data) { - Elm_Ctxpopup *ctxpopup = elm_ctxpopup_add(ui_menu_base_get(menu)); + Evas_Object *base = NULL; + Elm_Ctxpopup *ctxpopup = NULL; + + //Get a base object from menu. + base = ui_menu_base_get(menu); + if (!base) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a menu base object"); + return false; + } + + //Create and set a ctxpopup as a menu. + ctxpopup = elm_ctxpopup_add(base); + if (!ctxpopup) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a ctxpopup."); + return false; + } + elm_ctxpopup_item_append(ctxpopup, "Phone calls", NULL, ctxpopup_item_select_cb, NULL); elm_ctxpopup_item_append(ctxpopup, "Favorites", NULL, ctxpopup_item_select_cb, NULL); elm_ctxpopup_item_append(ctxpopup, "Search", NULL, ctxpopup_item_select_cb, NULL); @@ -71,24 +104,33 @@ view11_menu_cb(ui_menu *menu, void *data) void create_page11() { + int ret = 0; + ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; ui_view_event_callback_s event_callback = {0, }; - lifecycle_callback.load = view11_load_cb; - event_callback.menu = view11_menu_cb; - - ui_view *view = ui_standard_view_create("page11"); + //Create a view. + view = ui_standard_view_create("page11"); + if (!view) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view"); + return; + } - int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL); - if (ret != 0) + //Set View Life-Cycle callbacks. + lifecycle_callback.load = view11_load_cb; + if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); + ui_view_destroy(view); + return; } - ret = ui_view_event_callbacks_set(view, &event_callback, NULL); - if (ret != 0) + //Set Menu Event callbacks. + event_callback.menu = view11_menu_cb; + if (!(ret = ui_view_event_callbacks_set(view, &event_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_event_callback_set is failed. err = %d", ret); } UI_VIEWMGR_VIEW_PUSH(view); diff --git a/src/examples/efl/c/page12.cpp b/src/examples/efl/c/page12.cpp index a69afd6..6ef26cf 100644 --- a/src/examples/efl/c/page12.cpp +++ b/src/examples/efl/c/page12.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -view12_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { UI_VIEWMGR_VIEW_POP(); } static void -view12_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { create_page13(); } @@ -47,44 +47,77 @@ popup_dismissed_cb(void *data, Evas_Object *obj, void *event_info) //FIXME: remove dismissed callback because this callback is called twice. //It seems this is an efl or popup error, not this ui_popup nor example. evas_object_smart_callback_del(obj, "dismissed", popup_dismissed_cb); - ui_popup *popup = static_cast(data); - //Is It right? - ui_popup_del(popup); + //Destroy ui_popup + ui_popup *popup = (ui_popup *) data; + ui_popup_destroy(popup); } static void view12_btn_clicked(void *data, Evas_Object *obj, void *event_info) { - ui_view *view = static_cast(data); + ui_view *view = NULL; + ui_popup *popup = NULL; + Evas_Object *base = NULL; + Elm_Popup *content = NULL; - //Create popup. - //FIXME: is overlay a proper name? - ui_popup *popup = ui_popup_create(view); + view = (ui_view *) data; - Elm_Popup *elm_popup = elm_popup_add(ui_view_base_get(view)); - elm_object_text_set(elm_popup, "This popup has only text which is set via desc set function, (This popup gets hidden when user clicks outside) here timeout of 3 sec is set."); - elm_popup_timeout_set(elm_popup, 3.0); - evas_object_smart_callback_add(elm_popup, "dismissed", popup_dismissed_cb, popup); - evas_object_smart_callback_add(elm_popup, "block,clicked", popup_block_clicked_cb, NULL); - evas_object_smart_callback_add(elm_popup, "timeout", popup_timeout_cb, NULL); + //Create a popup. + if (!(popup = ui_popup_create(view))) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a ui_popup"); + return; + } - ui_popup_content_set(popup, elm_popup); + //Get a base object from popup. + base = ui_popup_base_get(popup); + if (!base) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); + return; + } + + //Create a popup object. + if (!(content = elm_popup_add(base))) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a popup object"); + return; + } + elm_object_text_set(content, "This popup has only text which is set via desc set function, (This popup gets hidden when user clicks outside) here timeout of 3 sec is set."); + elm_popup_timeout_set(content, 3.0); + evas_object_smart_callback_add(content, "dismissed", popup_dismissed_cb, popup); + evas_object_smart_callback_add(content, "block,clicked", popup_block_clicked_cb, NULL); + evas_object_smart_callback_add(content, "timeout", popup_timeout_cb, NULL); + + //Set elm popup as a ui_popup content. + ui_popup_content_set(popup, content); ui_popup_activate(popup); } static bool view12_load_cb(ui_view *view, void *data) { - Evas_Object *base_layout = ui_view_base_get(view); + Evas_Object *content = NULL; + Evas_Object *base = NULL; + Elm_Button *right_btn = NULL; - Evas_Object *content = create_content(base_layout, "ViewMgr Demo
Popup", - view12_prev_btn_clicked_cb, view12_next_btn_clicked_cb); + //Get a base object from view. + base = ui_view_base_get(view); + if (!base) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); + return false; + } + + //Create and set a main content. + content = create_content(base, "ViewMgr Demo
Popup", prev_btn_clicked_cb, next_btn_clicked_cb); + if (!content) return false; ui_standard_view_content_set(view, content, "Page12", NULL, NULL, NULL); //Title Right button - Elm_Button *right_btn = elm_button_add(base_layout); + right_btn = elm_button_add(base); elm_object_text_set(right_btn, "popup"); evas_object_smart_callback_add(right_btn, "clicked", view12_btn_clicked, view); @@ -96,15 +129,25 @@ view12_load_cb(ui_view *view, void *data) void create_page12() { + int ret = 0; + ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; - lifecycle_callback.load = view12_load_cb; - ui_view *view = ui_standard_view_create("page12"); + //Create a view + view = ui_standard_view_create("page12"); + if (!view) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view"); + return; + } - int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL); - if (ret != 0) + //Set View Life-Cycle callbacks. + lifecycle_callback.load = view12_load_cb; + if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); + ui_view_destroy(view); + return; } UI_VIEWMGR_VIEW_PUSH(view); diff --git a/src/examples/efl/c/page2.cpp b/src/examples/efl/c/page2.cpp index 1459f8f..a07c208 100644 --- a/src/examples/efl/c/page2.cpp +++ b/src/examples/efl/c/page2.cpp @@ -35,6 +35,7 @@ view2_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -42,6 +43,7 @@ view2_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Title Buttons", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -69,6 +71,7 @@ create_page2() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_standard_view_create("page2"); if (!view) { @@ -76,6 +79,7 @@ create_page2() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view2_load_cb; if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { diff --git a/src/examples/efl/c/page3.cpp b/src/examples/efl/c/page3.cpp index f2bfc38..dbe86dc 100644 --- a/src/examples/efl/c/page3.cpp +++ b/src/examples/efl/c/page3.cpp @@ -35,6 +35,7 @@ view3_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -42,6 +43,7 @@ view3_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Subtitle", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -61,6 +63,7 @@ create_page3() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_standard_view_create("page3"); if (!view) { @@ -68,6 +71,7 @@ create_page3() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view3_load_cb; if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { diff --git a/src/examples/efl/c/page4.cpp b/src/examples/efl/c/page4.cpp index e72c703..58a4921 100644 --- a/src/examples/efl/c/page4.cpp +++ b/src/examples/efl/c/page4.cpp @@ -35,6 +35,7 @@ view4_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -42,6 +43,7 @@ view4_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Title Badge", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -63,6 +65,7 @@ create_page4() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_standard_view_create("page4"); if (!view) { @@ -70,6 +73,7 @@ create_page4() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view4_load_cb; if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { diff --git a/src/examples/efl/c/page5.cpp b/src/examples/efl/c/page5.cpp index d96cf10..caffd36 100644 --- a/src/examples/efl/c/page5.cpp +++ b/src/examples/efl/c/page5.cpp @@ -35,6 +35,7 @@ view5_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -42,6 +43,7 @@ view5_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Full View", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -62,6 +64,7 @@ create_page5() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_view_create("page5"); if (!view) { @@ -69,6 +72,7 @@ create_page5() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view5_load_cb; if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { diff --git a/src/examples/efl/c/page6.cpp b/src/examples/efl/c/page6.cpp index 46e300f..934d5f0 100644 --- a/src/examples/efl/c/page6.cpp +++ b/src/examples/efl/c/page6.cpp @@ -35,6 +35,7 @@ view6_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -42,6 +43,7 @@ view6_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Toolbar", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -64,6 +66,7 @@ create_page6() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_standard_view_create("page6"); if (!view) { @@ -71,6 +74,7 @@ create_page6() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view6_load_cb; if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { diff --git a/src/examples/efl/c/page7.cpp b/src/examples/efl/c/page7.cpp index f114ca9..35c9fa7 100644 --- a/src/examples/efl/c/page7.cpp +++ b/src/examples/efl/c/page7.cpp @@ -35,6 +35,7 @@ view7_load_cb(ui_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -42,6 +43,7 @@ view7_load_cb(ui_view *view, void *data) return false; } + //Create and set a main content. content = create_content(base, "ViewMgr Demo
Navigationbar",prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; @@ -64,6 +66,7 @@ create_page7() ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; + //Create a view. view = ui_standard_view_create("page7"); if (!view) { @@ -71,6 +74,7 @@ create_page7() return; } + //Set View Life-Cycle callbacks. lifecycle_callback.load = view7_load_cb; if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { diff --git a/src/examples/efl/c/page8.cpp b/src/examples/efl/c/page8.cpp index c264b09..6a76f98 100644 --- a/src/examples/efl/c/page8.cpp +++ b/src/examples/efl/c/page8.cpp @@ -36,6 +36,7 @@ create_page8() Evas_Object *base = NULL; Evas_Object *content = NULL; + //Create a view. view = ui_standard_view_create("page8"); if (!view) { @@ -43,6 +44,7 @@ create_page8() return; } + //Get a base object from view. base = ui_view_base_get(view); if (!base) { @@ -51,6 +53,7 @@ create_page8() return; } + //Create and set a main content in advance. content = create_content(base, "ViewMgr Demo
Content Preload", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) { diff --git a/src/examples/efl/c/page9.cpp b/src/examples/efl/c/page9.cpp index 2af3c77..7e14f08 100644 --- a/src/examples/efl/c/page9.cpp +++ b/src/examples/efl/c/page9.cpp @@ -18,13 +18,13 @@ #include "main.h" static void -view9_prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { UI_VIEWMGR_VIEW_POP(); } static void -view9_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) +next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { create_page10(); } @@ -32,12 +32,27 @@ view9_next_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) static bool view9_portrait_cb(ui_view *view, void *data) { - Evas_Object *base_layout = ui_view_base_get(view); + Evas_Object *content = NULL; + Evas_Object *base = NULL; - Evas_Object *content = create_content(base_layout, "ViewMgr Demo
Portrait/Landscape", - view9_prev_btn_clicked_cb, view9_next_btn_clicked_cb); + //Get a base object from view. + base = ui_view_base_get(view); + if (!base) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); + return false; + } + + //Create and set a main content. + content = create_content(base, "ViewMgr Demo
Portrait/Landscape", prev_btn_clicked_cb, next_btn_clicked_cb); + if (!content) return false; + + if (!ui_standard_view_content_set(view, content, "Page9", NULL, NULL, NULL)) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); + return false; + } - ui_standard_view_content_set(view, content, "Page9", NULL, NULL, NULL); ui_view_indicator_set(view, UI_VIEW_INDICATOR_DEFAULT); return true; @@ -46,12 +61,25 @@ view9_portrait_cb(ui_view *view, void *data) static bool view9_landscape_cb(ui_view *view, void *data) { - Evas_Object *base_layout = ui_view_base_get(view); + Evas_Object *content = NULL; + Evas_Object *base = NULL; + + base = ui_view_base_get(view); + if (!base) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); + return false; + } - Evas_Object *content = create_landscape_content(base_layout, "ViewMgr Demo
Portrait/Landscape", - view9_prev_btn_clicked_cb, view9_next_btn_clicked_cb); + content = create_landscape_content(base, "ViewMgr Demo
Portrait/Landscape", prev_btn_clicked_cb, next_btn_clicked_cb); + if (!content) return false; + + if (!ui_standard_view_content_set(view, content, "Page9", NULL, NULL, NULL)) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); + return false; + } - ui_standard_view_content_set(view, content, "Page9", NULL, NULL, NULL); ui_view_indicator_set(view, UI_VIEW_INDICATOR_OPTIMAL); return true; @@ -60,37 +88,48 @@ view9_landscape_cb(ui_view *view, void *data) static bool view9_load_cb(ui_view *view, void *data) { + //FIXME: Change below code to more convenient and clear way. if (ui_view_degree_get(view) == 90 || ui_view_degree_get(view) == 270) - view9_landscape_cb(view, data); + { + return view9_landscape_cb(view, data); + } else - view9_portrait_cb(view, data); - - return true; + { + return view9_portrait_cb(view, data); + } } void create_page9() { + int ret = 0; + ui_view *view = NULL; ui_view_lifecycle_callback_s lifecycle_callback = {0, }; ui_view_event_callback_s event_callback = {0, }; - lifecycle_callback.load = view9_load_cb; - - event_callback.portrait = view9_portrait_cb; - event_callback.landscape = view9_landscape_cb; - - ui_view *view = ui_standard_view_create("page9"); + //Create a view. + view = ui_standard_view_create("page9"); + if (!view) + { + dlog_print(DLOG_ERROR, LOG_TAG, "failed to create a view"); + return; + } - int ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL); - if (ret != 0) + //Set View Life-Cycle callbacks. + lifecycle_callback.load = view9_load_cb; + if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); + ui_view_destroy(view); + return; } - ret = ui_view_event_callbacks_set(view, &event_callback, NULL); - if (ret != 0) + //Set Portrait/Landscape Event callbacks. + event_callback.portrait = view9_portrait_cb; + event_callback.landscape = view9_landscape_cb; + if (!(ret = ui_view_event_callbacks_set(view, &event_callback, NULL))) { - //TODO + dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_event_callback_set is failed. err = %d", ret); } UI_VIEWMGR_VIEW_PUSH(view); diff --git a/src/examples/efl/cpp/page11.h b/src/examples/efl/cpp/page11.h index b752d40..579b050 100644 --- a/src/examples/efl/cpp/page11.h +++ b/src/examples/efl/cpp/page11.h @@ -22,8 +22,8 @@ static void ctxpopup_item_select_cb(void *data, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = static_cast(event_info); - elm_ctxpopup_dismiss(obj); LOGE("Item (%s) is selected", elm_object_item_text_get(it)); + elm_ctxpopup_dismiss(obj); } class page11: public ui_standard_view diff --git a/src/examples/efl/cpp/page12.h b/src/examples/efl/cpp/page12.h index cbe11f1..ffc991e 100644 --- a/src/examples/efl/cpp/page12.h +++ b/src/examples/efl/cpp/page12.h @@ -71,8 +71,8 @@ public: void create_popup() { - //FIXME: is overlay a proper name? ui_popup *popup = new ui_popup(this); + if (!popup) return; Elm_Popup *obj = elm_popup_add(popup->get_base()); elm_object_text_set(obj, "This popup has only text which is set via desc set function, (This popup gets hidden when user clicks outside) here timeout of 3 sec is set."); diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h index 4f576b4..5ff3a48 100644 --- a/src/include/efl/mobile/c/ui_menu.h +++ b/src/include/efl/mobile/c/ui_menu.h @@ -10,7 +10,7 @@ Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu); Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu); bool ui_menu_activate(ui_menu *menu); bool ui_menu_deactivate(ui_menu *menu); -bool ui_menu_activate_get(ui_menu *menu); +bool ui_menu_activated_get(ui_menu *menu); Evas_Object *ui_menu_base_get(ui_menu *menu); int ui_menu_degree_get(ui_menu *menu); ui_view *ui_menu_view_get(ui_menu *menu); diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h index 2e23916..a031097 100644 --- a/src/include/efl/mobile/c/ui_popup.h +++ b/src/include/efl/mobile/c/ui_popup.h @@ -6,20 +6,15 @@ extern "C" { #endif ui_popup *ui_popup_create(ui_view *view); -void ui_popup_del(ui_popup *popup); - -bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup); +void ui_popup_destroy(ui_popup *popup); +bool ui_popup_content_set(ui_popup *popup, Elm_Popup *content); Elm_Popup *ui_popup_content_get(ui_popup *popup); Elm_Popup *ui_popup_content_unset(ui_popup *popup); - bool ui_popup_activate(ui_popup *popup); bool ui_popup_deactivate(ui_popup *popup); -bool ui_popup_activate_get(ui_popup *popup); - +bool ui_popup_activated_get(ui_popup *popup); Evas_Object *ui_popup_base_get(ui_popup *popup); - int ui_popup_degree_get(ui_popup *popup); - ui_view *ui_popup_view_get(ui_popup *popup); #ifdef __cplusplus diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp index 247da8d..c72b9d7 100644 --- a/src/lib/efl/mobile/c/ui_menu.cpp +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -3,105 +3,101 @@ using namespace efl_viewmanager; -extern "C" { - - bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup) +bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup) +{ + if (!menu) { - if (!menu) - { - LOGE("Invalid Menu"); - return false; - } - - return menu->set_content(ctxpopup); + LOGE("Invalid ui_menu"); + return false; } - Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return NULL; - } + return menu->set_content(ctxpopup); +} - return menu->get_content(); +Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return NULL; } - Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return NULL; - } + return menu->get_content(); +} - return menu->unset_content(); +Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return NULL; } - bool ui_menu_activate(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return false; - } + return menu->unset_content(); +} - return menu->activate(); +bool ui_menu_activate(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return false; } - bool ui_menu_deactivate(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return false; - } + return menu->activate(); +} - return menu->deactivate(); +bool ui_menu_deactivate(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return false; } - bool ui_menu_activate_get(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return false; - } + return menu->deactivate(); +} - return menu->is_activated(); +bool ui_menu_activated_get(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return false; } - Evas_Object *ui_menu_base_get(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return NULL; - } + return menu->is_activated(); +} - return menu->get_base(); +Evas_Object *ui_menu_base_get(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return NULL; } - int ui_menu_degree_get(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return -1; - } + return menu->get_base(); +} - return menu->get_degree(); +int ui_menu_degree_get(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return -1; } - ui_view *ui_menu_view_get(ui_menu *menu) - { - if (!menu) - { - LOGE("Invalid Menu"); - return NULL; - } + return menu->get_degree(); +} - return static_cast(menu->get_view()); +ui_view *ui_menu_view_get(ui_menu *menu) +{ + if (!menu) + { + LOGE("Invalid ui_menu"); + return NULL; } -} + return dynamic_cast(menu->get_view()); +} diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp index e7ea5ec..6ab5388 100644 --- a/src/lib/efl/mobile/c/ui_popup.cpp +++ b/src/lib/efl/mobile/c/ui_popup.cpp @@ -3,125 +3,107 @@ using namespace efl_viewmanager; -extern "C" { - ui_popup *ui_popup_create(ui_view *view) - { - return new ui_popup(view); - } +ui_popup *ui_popup_create(ui_view *view) +{ + return new ui_popup(view); +} - void ui_popup_del(ui_popup *popup) +void ui_popup_destroy(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return; - } - - delete(popup); + LOGE("Invalid ui_popup"); + return; } + delete(popup); +} - bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup) +bool ui_popup_content_set(ui_popup *popup, Elm_Popup *content) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return false; - } - - if (!elm_popup) - { - LOGE("Invalid elm_popup"); - return false; - } - - return popup->set_content(elm_popup); + LOGE("Invalid ui_popup"); + return false; } + return popup->set_content(content); +} - Elm_Popup *ui_popup_content_get(ui_popup *popup) +Elm_Popup *ui_popup_content_get(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return NULL; - } - - return popup->get_content(); + LOGE("Invalid ui_popup"); + return NULL; } + return popup->get_content(); +} - Elm_Popup *ui_popup_content_unset(ui_popup *popup) +Elm_Popup *ui_popup_content_unset(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return NULL; - } - - return popup->unset_content(); + LOGE("Invalid ui_popup"); + return NULL; } + return popup->unset_content(); +} - bool ui_popup_activate(ui_popup *popup) +bool ui_popup_activate(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return false; - } - - return popup->activate(); + LOGE("Invalid ui_popup"); + return false; } + return popup->activate(); +} - bool ui_popup_deactivate(ui_popup *popup) +bool ui_popup_deactivate(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return false; - } - - return popup->deactivate(); + LOGE("Invalid ui_popup"); + return false; } + return popup->deactivate(); +} - bool ui_popup_activate_get(ui_popup *popup) +bool ui_popup_activate_get(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return false; - } - - return popup->is_activated(); + LOGE("Invalid ui_popup"); + return false; } + return popup->is_activated(); +} - Evas_Object *ui_popup_base_get(ui_popup *popup) +Evas_Object *ui_popup_base_get(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return NULL; - } - - return popup->get_base(); + LOGE("Invalid ui_popup"); + return NULL; } + return popup->get_base(); +} - int ui_popup_degree_get(ui_popup *popup) +int ui_popup_degree_get(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return -1; - } - - return popup->get_degree(); + LOGE("Invalid ui_popup"); + return -1; } + return popup->get_degree(); +} - ui_view *ui_popup_view_get(ui_popup *popup) +ui_view *ui_popup_view_get(ui_popup *popup) +{ + if (!popup) { - if (!popup) - { - LOGE("Invalid popup"); - return NULL; - } - - return static_cast(popup->get_view()); + LOGE("Invalid ui_popup"); + return NULL; } + return dynamic_cast(popup->get_view()); }