Change app type (UI -> service) 73/43573/1 accepted/tizen/mobile/20150710.080448 accepted/tizen/tv/20150710.080505 accepted/tizen/wearable/20150710.080526 submit/tizen/20150710.072434
authorYongjin Kim <youth.kim@samsung.com>
Fri, 10 Jul 2015 07:21:54 +0000 (16:21 +0900)
committerYongjin Kim <youth.kim@samsung.com>
Fri, 10 Jul 2015 07:21:54 +0000 (16:21 +0900)
Change-Id: I42ca2ba6e6ad37f73764d2cb26089bdd3895d4a4
Signed-off-by: Yongjin Kim <youth.kim@samsung.com>
CMakeLists.txt
org.tizen.service-plugin-sample.xml
packaging/org.tizen.service-plugin-sample.spec
src/service_plugin_sample.c

index 294cf52f4f4ffdb79b425c5e8b8ea6b9a0ab6009..a743ed291627047071e83f82f3c3d6ee0fb43f63 100644 (file)
@@ -14,13 +14,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/include/
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
-       capi-system-system-settings
-       elementary
-       efl-extension
-       evas
+       appcore-agent
+       aul
+       eina
        ecore
-       ecore-input
-       capi-appfw-application
        dlog
        service-adaptor
 )
index 1675419e0300b543315a2e2cec445f1d6f4681e3..eb79e13a1515adfc6529fda3d826faffa309f801 100644 (file)
@@ -3,7 +3,7 @@
        <label>service plugin sample</label>
        <author email="samsung.kim@samsung.com" href="www.samsung.com">Samsung Kim</author>
        <description>helloworld</description>
-       <ui-application appid="org.tizen.service-plugin-sample" exec="/usr/apps/org.tizen.service-plugin-sample/bin/service-plugin-sample" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+       <ui-application appid="org.tizen.service-plugin-sample" exec="/usr/apps/org.tizen.service-plugin-sample/bin/service-plugin-sample" nodisplay="true" multiple="false" type="capp" taskmanage="false">
                <icon>org.tizen.service-plugin-sample.png</icon>
                <label>service plugin sample</label>
                <label xml:lang="en-us">plugin sample</label>
index 5e3e53607fed832dd73e80267d9ab23964342313..171cc9c5fb04ff8400f737e1c1c46e7b16c91ee1 100644 (file)
@@ -7,16 +7,19 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires:  pkgconfig(appcore-agent)
 BuildRequires:  pkgconfig(capi-system-system-settings)
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(capi-appfw-package-manager)
+BuildRequires:  pkgconfig(capi-appfw-service-application)
 BuildRequires:  pkgconfig(efl-extension)
-BuildRequires:  pkgconfig(appcore-efl)
+BuildRequires:  pkgconfig(appcore-agent)
+BuildRequires:  pkgconfig(eina)
+BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(appsvc)
-BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(service-adaptor)
 BuildRequires:  cmake
-BuildRequires:  edje-bin
 #BuildRequires:  service-adaptor-devel
 
 %description
index b6ecf08e8970c547b7c6472fc5609968d5fa6b36..0d63df11d71322e87197d5bb90be251d1efc6a75 100644 (file)
  * limitations under the License.
  */
 
-#include <app.h>
-#include <Elementary.h>
-#include <system_settings.h>
-#include <efl_extension.h>
+#include <service_app.h>
 #include <dlog.h>
 
 #include "service_plugin_sample.h"
 #include "service_provider.h"
 
-typedef struct appdata {
-       Evas_Object *win;
-       Evas_Object *conform;
-       Evas_Object *label;
-} appdata_s;
-
 service_provider_h service_provider = NULL;
 
 service_adaptor_error_e _connect()
@@ -61,65 +52,12 @@ service_adaptor_error_e _cloud_remove_file(const char *cloud_path)
        return SERVICE_ADAPTOR_ERROR_NONE;
 }
 
-static void win_delete_request_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       ui_app_exit();
-}
-
-static void win_back_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       appdata_s *ad = data;
-       /* Let window go to hide state. */
-       elm_win_lower(ad->win);
-}
-
-static void create_base_gui(appdata_s *ad)
-{
-       /* Window */
-       ad->win = elm_win_util_standard_add(PACKAGE, PACKAGE);
-       elm_win_autodel_set(ad->win, EINA_TRUE);
-
-       if (elm_win_wm_rotation_supported_get(ad->win))
-       {
-               int rots[4] = { 0, 90, 180, 270 };
-               elm_win_wm_rotation_available_rotations_set(ad->win, (const int *)(&rots), 4);
-       }
-
-       evas_object_smart_callback_add(ad->win, "delete,request", win_delete_request_cb, NULL);
-       eext_object_event_callback_add(ad->win, EEXT_CALLBACK_BACK, win_back_cb, ad);
-
-       /* Conformant */
-       ad->conform = elm_conformant_add(ad->win);
-       elm_win_indicator_mode_set(ad->win, ELM_WIN_INDICATOR_SHOW);
-       elm_win_indicator_opacity_set(ad->win, ELM_WIN_INDICATOR_OPAQUE);
-       evas_object_size_hint_weight_set(ad->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_win_resize_object_add(ad->win, ad->conform);
-       evas_object_show(ad->conform);
-
-       /* Label*/
-       ad->label = elm_label_add(ad->conform);
-       elm_object_text_set(ad->label, "<align=center>Hello EFL</align>");
-       evas_object_size_hint_weight_set(ad->label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_object_content_set(ad->conform, ad->label);
-
-       /* Show window after base gui is set up */
-       evas_object_show(ad->win);
-}
-
-static bool app_create(void *data)
+static bool service_app_create(void *data)
 {
-       /* Hook to take necessary actions before main event loop starts
-          Initialize UI resources and application's data
-          If this function returns true, the main loop of application starts
-          If this function returns false, the application is terminated */
-       appdata_s *ad = data;
-
-       create_base_gui(ad);
-
        return true;
 }
 
-static void app_control(app_control_h app_control, void *data)
+static void service_app_control(app_control_h app_control, void *data)
 {
        SLOGI("app_control");
 
@@ -127,55 +65,41 @@ static void app_control(app_control_h app_control, void *data)
        service_provider_message(service_provider, app_control, data);
 }
 
-static void app_pause(void *data)
-{
-       /* Take necessary actions when application becomes invisible. */
-}
-
-static void app_resume(void *data)
-{
-       /* Take necessary actions when application becomes visible. */
-}
-
-static void app_terminate(void *data)
+static void service_app_terminate(void *data)
 {
        /* Release all resources. */
 }
 
-static void ui_app_lang_changed(app_event_info_h event_info, void *user_data)
+static void service_app_lang_changed(app_event_info_h event_info, void *user_data)
 {
        /*APP_EVENT_LANGUAGE_CHANGED*/
-//     char *locale = NULL;
-//     system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &locale);
-//     elm_language_set(locale);
-//     free(locale);
        return;
 }
 
-static void ui_app_orient_changed(app_event_info_h event_info, void *user_data)
+static void service_app_orient_changed(app_event_info_h event_info, void *user_data)
 {
        /*APP_EVENT_DEVICE_ORIENTATION_CHANGED*/
        return;
 }
 
-static void ui_app_region_changed(app_event_info_h event_info, void *user_data)
+static void service_app_region_changed(app_event_info_h event_info, void *user_data)
 {
        /*APP_EVENT_REGION_FORMAT_CHANGED*/
 }
 
-static void ui_app_low_battery(app_event_info_h event_info, void *user_data)
+static void service_app_low_battery(app_event_info_h event_info, void *user_data)
 {
        /*APP_EVENT_LOW_BATTERY*/
 }
 
-static void ui_app_low_memory(app_event_info_h event_info, void *user_data)
+static void service_app_low_memory(app_event_info_h event_info, void *user_data)
 {
        /*APP_EVENT_LOW_MEMORY*/
 }
 
 int main(int argc, char *argv[])
 {
-       appdata_s ad = {0,};
+       char ad[50] = {0,};
        int ret = 0;
 
        /*Service Plugin Client*/
@@ -196,23 +120,20 @@ int main(int argc, char *argv[])
        service_provider_set_storage_provider(service_provider, storage_provider);
        /*Service Plugin Client*/
 
-       ui_app_lifecycle_callback_s event_callback = {0,};
+       service_app_lifecycle_callback_s event_callback = {0,};
        app_event_handler_h handlers[5] = {NULL, };
 
-       event_callback.create = app_create;
-       event_callback.terminate = app_terminate;
-       event_callback.pause = app_pause;
-       event_callback.resume = app_resume;
-       event_callback.app_control = app_control;
+       event_callback.create = service_app_create;
+       event_callback.terminate = service_app_terminate;
+       event_callback.app_control = service_app_control;
 
-       ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, ui_app_low_battery, &ad);
-       ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, ui_app_low_memory, &ad);
-       ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, ui_app_orient_changed, &ad);
-       ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, ui_app_lang_changed, &ad);
-       ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, ui_app_region_changed, &ad);
-       ui_app_remove_event_handler(handlers[APP_EVENT_LOW_MEMORY]);
+       service_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, service_app_low_battery, &ad);
+       service_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, service_app_low_memory, &ad);
+       service_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, service_app_orient_changed, &ad);
+       service_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, service_app_lang_changed, &ad);
+       service_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, service_app_region_changed, &ad);
 
-       ret = ui_app_main(argc, argv, &event_callback, &ad);
+       ret = service_app_main(argc, argv, &event_callback, &ad);
        if (ret != APP_ERROR_NONE)
        {
                SLOGE(LOG_TAG, "app_main() is failed. err = %d", ret);