From 5f18fd4be1ca401025ee526eae1bb2e08b76d78d Mon Sep 17 00:00:00 2001 From: Woochan Lee Date: Wed, 1 Jun 2016 19:25:45 +0900 Subject: [PATCH] Define CAPIs. Change-Id: I21c4dcb3d6a3540bc98258175f2357cf658af4e1 --- src/include/efl/mobile/c/ui_app.h | 2 + src/include/efl/mobile/c/ui_menu.h | 9 +++ src/include/efl/mobile/c/ui_popup.h | 8 ++ src/include/efl/mobile/c/ui_view.h | 37 ++++++--- src/include/efl/mobile/c/ui_viewmgr.h | 12 +++ src/lib/efl/mobile/c/ui_app.cpp | 6 ++ src/lib/efl/mobile/c/ui_menu.cpp | 48 +++++++++++ src/lib/efl/mobile/c/ui_popup.cpp | 42 ++++++++++ src/lib/efl/mobile/c/ui_view.cpp | 110 +++++++++++++++++++++++++- src/lib/efl/mobile/c/ui_viewmgr.cpp | 66 ++++++++++++++++ 10 files changed, 330 insertions(+), 10 deletions(-) diff --git a/src/include/efl/mobile/c/ui_app.h b/src/include/efl/mobile/c/ui_app.h index 8083f64..50d38f3 100644 --- a/src/include/efl/mobile/c/ui_app.h +++ b/src/include/efl/mobile/c/ui_app.h @@ -10,6 +10,8 @@ extern "C" { bool ui_app_init(const char *pkg, const char *locale_dir); int ui_app_run(int argc, char **argv, ui_app_lifecycle_callback_s *event_callback, void *data); ui_viewmgr *ui_app_viewmgr_get(); + //Is it needed? + ui_app *ui_app_app_get(); #ifdef __cplusplus } #endif diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h index 0c6a5ae..ae567bb 100644 --- a/src/include/efl/mobile/c/ui_menu.h +++ b/src/include/efl/mobile/c/ui_menu.h @@ -8,6 +8,15 @@ namespace efl_viewmananger extern "C" { #endif bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup); + 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); + //Is it needed? + Evas_Object *ui_menu_base_get(ui_menu *menu); + int ui_menu_degree_get(ui_menu *menu); + Elm_Ctxpopup ui_menu_content_get(ui_menu *menu); + ui_view *ui_menu_view_get(ui_menu *menu); #ifdef __cplusplus } #endif diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h index 338c4eb..660547e 100644 --- a/src/include/efl/mobile/c/ui_popup.h +++ b/src/include/efl/mobile/c/ui_popup.h @@ -9,8 +9,16 @@ extern "C" { #endif ui_popup *ui_popup_create(ui_view *view); bool ui_popup_content_set(ui_popup *popup, Elm_Popup *elm_popup); + Elm_Popup *ui_popup_content_unset(ui_popup *popup); bool ui_popup_activate(ui_popup *popup); + bool ui_popup_deactivate(ui_popup *popup); void ui_popup_del(ui_popup *popup); + bool ui_popup_activate_get(ui_popup *popup); + //Is it needed? + Evas_Object *ui_popup_base_get(ui_popup *popup); + int ui_popup_degree_get(ui_popup *popup); + Elm_Popup ui_popup_content_get(ui_popup *popup); + ui_view *ui_popup_view_get(ui_popup *popup); #ifdef __cplusplus } #endif diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h index 9d0176e..a9b0e06 100644 --- a/src/include/efl/mobile/c/ui_view.h +++ b/src/include/efl/mobile/c/ui_view.h @@ -41,23 +41,42 @@ extern "C" { ui_view_event_menu_cb menu; } ui_view_event_callback_s; - ui_view* ui_standard_view_create(const char *name); - ui_view* ui_view_create(const char *name); - bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data); - Evas_Object* ui_view_base_get(ui_view *view); - bool ui_view_content_set(ui_view *view, Evas_Object *content); + ui_view *ui_standard_view_create(const char *name); bool ui_standard_view_content_set(ui_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn, Evas_Object *title_right_btn); bool ui_standard_view_title_badge_set(ui_view *view, const char *badge_text); - void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator); + bool ui_standard_view_sub_title_set(ui_view *view, const char *text); + bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn); + bool ui_standard_view_title_left_btn_set(ui_view *view, Evas_Object *title_left_btn); + bool ui_standard_view_title_set(ui_view *view, const char *text); bool ui_standard_view_toolbar_set(ui_view *view, Elm_Toolbar *toolbar); - void ui_view_removable_content(ui_view *view, bool remove); + bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim); + Elm_Button ui_standard_view_title_right_btn_unset(ui_view *view); + Elm_Button ui_standard_view_title_left_btn_unset(ui_view *view); + Elm_toolbar ui_standard_view_toolbar_unset(ui_view *view); + Elm_Button ui_standard_view_title_right_btn_get(ui_view *view); + Elm_Button ui_standard_view_title_left_btn_get(ui_view *view); + Elm_toolbar ui_standard_view_toolbar_get(ui_view *view); + + ui_view *ui_view_create(const char *name); + bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data); + Evas_Object* ui_view_base_get(ui_view *view); + bool ui_view_content_set(ui_view *view, Evas_Object *content); + Evas_Object *ui_view_content_unset(ui_view *view); + void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator); + void ui_view_removable_content_set(ui_view *view, bool remove); bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *event_callback, void *data); int ui_view_degree_get(ui_view *view); - bool ui_standard_view_title_right_btn_set(ui_view *view, Evas_Object *title_right_btn); bool ui_view_transition_style_set(ui_view *view, const char *style); - bool ui_standard_view_title_visible_set(ui_view *view, bool visible, bool anim); + ui_menu *ui_view_menu_get(ui_view *view); + bool ui_view_name_set(ui_view *view, const char *name); + const char *ui_view_transition_style_get(ui_view *view); + const char *ui_view_name_get(ui_view *view); + Evas_Object *ui_view_content_get(ui_view *view); + ui_view_state ui_view_state_get(ui_view *view); + bool ui_view_removable_content_get(ui_view *view); + ui_view_indicator ui_view_indicator_get(ui_view *view); #ifdef __cplusplus } diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h index 610ff8c..e48a211 100644 --- a/src/include/efl/mobile/c/ui_viewmgr.h +++ b/src/include/efl/mobile/c/ui_viewmgr.h @@ -6,9 +6,21 @@ using namespace efl_viewmananger; #ifdef __cplusplus extern "C" { #endif + ui_view *ui_viewmgr_view_push_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_view *before); + ui_view *ui_viewmgr_view_push_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *after); ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view); bool ui_viewmgr_view_pop(ui_viewmgr *viewmgr); + bool ui_viewmgr_activate(ui_viewmgr *viewmgr); bool ui_viewmgr_deactivate(ui_viewmgr *viewmgr); + Elm_Win ui_viewmgr_window_get(ui_viewmgr *viewmgr); + Elm_Conformant ui_viewmgr_conformant_get(ui_viewmgr *viewmgr); + ui_view *ui_viewmgr_last_view_get(ui_viewmgr *viewmgr); + ui_view *ui_viewmgr_view_get(ui_viewmgr *viewmgr, int idx); + Evas_Object *ui_viewmgr_base_get(ui_viewmgr *viewmgr); + unsigned int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr); + //Is it needed? + bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr); + ui_viewmgr *ui_viewmgr_viewmgr_get(); //TODO #define UI_VIEWMGR_DEACTIVATE() (ui_viewmgr_deactivate(ui_app_viewmgr_get())) diff --git a/src/lib/efl/mobile/c/ui_app.cpp b/src/lib/efl/mobile/c/ui_app.cpp index 7020224..6e6bb97 100644 --- a/src/lib/efl/mobile/c/ui_app.cpp +++ b/src/lib/efl/mobile/c/ui_app.cpp @@ -98,4 +98,10 @@ extern "C" { { return app->get_viewmgr(); } + + ui_app *ui_app_app_get() + { + //TODO + return NULL; + } } diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp index 742a235..7ebfeca 100644 --- a/src/lib/efl/mobile/c/ui_menu.cpp +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -14,5 +14,53 @@ extern "C" { return menu->set_content(ctxpopup); } + + Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu) + { + //TODO + return NULL; + } + + bool ui_menu_activate(ui_menu *menu) + { + //TODO + return 1; + } + + bool ui_menu_deactivate(ui_menu *menu) + { + //TODO + return 1; + } + + bool ui_menu_activate_get(ui_menu *menu) + { + //TODO + return 1; + } + + Evas_Object *ui_menu_base_get(ui_menu *menu) + { + //TODO + return NULL; + } + + int ui_menu_degree_get(ui_menu *menu) + { + //TODO + return 0; + } + + Elm_Ctxpopup ui_menu_content_get(ui_menu *menu) + { + //TODO + return NULL; + } + + ui_view *ui_menu_view_get(ui_menu *menu) + { + //TODO + return NULL; + } } diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp index f278382..bae909e 100644 --- a/src/lib/efl/mobile/c/ui_popup.cpp +++ b/src/lib/efl/mobile/c/ui_popup.cpp @@ -26,6 +26,12 @@ extern "C" { return popup->set_content(elm_popup); } + Elm_Popup *ui_popup_content_unset(ui_popup *popup) + { + //TODO + return NULL; + } + bool ui_popup_activate(ui_popup *popup) { if (!popup) @@ -37,6 +43,12 @@ extern "C" { return popup->activate(); } + bool ui_popup_deactivate(ui_popup *popup) + { + //TODO + return 1; + } + void ui_popup_del(ui_popup *popup) { if (!popup) @@ -47,4 +59,34 @@ extern "C" { delete(popup); } + + bool ui_popup_activate_get(ui_popup *popup) + { + //TODO + return 1; + } + + Evas_Object *ui_popup_base_get(ui_popup *popup) + { + //TODO + return NULL; + } + + int ui_popup_degree_get(ui_popup *popup) + { + //TODO + return 1; + } + + Elm_Popup ui_popup_content_get(ui_popup *popup) + { + //TODO + return NULL; + } + + ui_view *ui_popup_view_get(ui_popup *popup) + { + //TODO + return NULL; + } } diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp index 6c2cb4b..1525805 100644 --- a/src/lib/efl/mobile/c/ui_view.cpp +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -240,6 +240,12 @@ extern "C" { return capi_view->set_content(content); } + Evas_Object *ui_view_content_unset(ui_view *view) + { + //TODO + return NULL; + } + bool ui_standard_view_content_set(ui_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn, Evas_Object *title_right_btn) @@ -268,6 +274,24 @@ extern "C" { return capi_view->set_title_badge(badge_text); } + bool ui_standard_view_sub_title_set(ui_view *view, const char *text) + { + //TODO + return 1; + } + + bool ui_standard_view_title_left_btn_set(ui_view *view, Evas_Object *title_left_btn) + { + //TODO + return 1; + } + + bool ui_standard_view_title_set(ui_view *view, const char *text) + { + //TODO + return 1; + } + void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator) { if (!view) @@ -294,7 +318,7 @@ extern "C" { return capi_view->set_toolbar(toolbar); } - void ui_view_removable_content(ui_view *view, bool remove) + void ui_view_removable_content_set(ui_view *view, bool remove) { if (!view) { @@ -385,4 +409,88 @@ extern "C" { return capi_view->set_title_visible(visible, anim); } + + Elm_Button ui_standard_view_title_right_btn_unset(ui_view *view) + { + //TODO + return NULL; + } + + Elm_Button ui_standard_view_title_left_btn_unset(ui_view *view) + { + //TODO + return NULL; + } + + Elm_toolbar ui_standard_view_toolbar_unset(ui_view *view) + { + //TODO + return NULL; + } + + Elm_Button ui_standard_view_title_right_btn_get(ui_view *view) + { + //TODO + return NULL; + } + + Elm_Button ui_standard_view_title_left_btn_get(ui_view *view) + { + //TODO + return NULL; + } + + Elm_toolbar ui_standard_view_toolbar_get(ui_view *view) + { + //TODO + return NULL; + } + + ui_menu *ui_view_menu_get(ui_view *view) + { + //TODO + return NULL; + } + + bool ui_view_name_set(ui_view *view, const char *name) + { + //TODO + return 1; + } + + const char *ui_view_transition_style_get(ui_view *view) + { + //TODO + return NULL; + } + + const char *ui_view_name_get(ui_view *view) + { + //TODO + return NULL; + } + + Evas_Object *ui_view_content_get(ui_view *view) + { + //TODO + return NULL; + } + + ui_view_state ui_view_state_get(ui_view *view) + { + //TODO + return 0; + } + + bool ui_view_removable_content_get(ui_view *view) + { + //TODO + return 1; + } + + ui_view_indicator ui_view_indicator_get(ui_view *view) + { + //TODO + return 0; + } } diff --git a/src/lib/efl/mobile/c/ui_viewmgr.cpp b/src/lib/efl/mobile/c/ui_viewmgr.cpp index 56b994c..b81375c 100644 --- a/src/lib/efl/mobile/c/ui_viewmgr.cpp +++ b/src/lib/efl/mobile/c/ui_viewmgr.cpp @@ -4,6 +4,18 @@ using namespace efl_viewmanager; extern "C" { + ui_view *ui_viewmgr_view_push_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_view *before) + { + //TODO + return NULL; + } + + ui_view *ui_viewmgr_view_push_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *after) + { + //TODO + return NULL; + } + ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view) { return static_cast(viewmgr->push_view(view)); @@ -14,8 +26,62 @@ extern "C" { return viewmgr->pop_view(); } + bool ui_viewmgr_activate(ui_viewmgr *viewmgr) + { + //TODO + return 1; + } + bool ui_viewmgr_deactivate(ui_viewmgr *viewmgr) { return viewmgr->deactivate(); } + + Elm_Win ui_viewmgr_window_get(ui_viewmgr *viewmgr) + { + //TODO + return NULL; + } + + Elm_Conformant ui_viewmgr_conformant_get(ui_viewmgr *viewmgr) + { + //TODO + return NULL; + } + + ui_view *ui_viewmgr_last_view_get(ui_viewmgr *viewmgr) + { + //TODO + return NULL; + } + + ui_view *ui_viewmgr_view_get(ui_viewmgr *viewmgr, int idx) + { + //TODO + return NULL; + } + + Evas_Object *ui_viewmgr_base_get(ui_viewmgr *viewmgr) + { + //TODO + return NULL; + } + + unsigned int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr) + { + //TODO + return 1; + } + + bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr) + { + //TODO + return 1; + } + + ui_viewmgr *ui_viewmgr_viewmgr_get() + { + //TODO + return NULL; + } } -- 2.34.1