[TBT][SRC and Binary][NSD source and binary updated due to ui issue]

Signed-off-by: Amlan Chowdhury <amlan.c@samsung.com>
Change-Id: I40cc708010df158b09a6ade7e1bd304512a6884b

diff --git a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index ea08c4a7c28466def644e3cea24298c526567f6d..cc0f140c383e019a52569ee34e11f45996a868db 100644 (file)
Binary files a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
index d3e8c93750fd110a63dc4f2ae15cb80e8d49379d..4b11a9977f6ba2146ab83f0da63401657fdc7674 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ

diff --git a/tbtcoreapp/src/view/tbt-camera-view.c b/tbtcoreapp/src/view/tbt-camera-view.c
index c3836aba7b60315ce9a483e78121c29964e6868f..c742a28c893f41e8f092a17452228c04e53471b3 100644 (file)
--- a/tbtcoreapp/src/view/tbt-camera-view.c
+++ b/tbtcoreapp/src/view/tbt-camera-view.c
@@ -111,6 +111,7 @@ static void _record_status_cb(unsigned long long elapsed_time, unsigned long lon
 static void _camera_face_detected_cb(camera_detected_face_s *faces, int count, void *user_data);
 char* get_camera_error(int error_code);
 char* get_recorder_error(int error_code);
+char* get_recorder_state(int state);
 
 static void create_render_rect_and_bg(camera_view *this);
 static void destroy_render_rect_and_bg(camera_view *this);
@@ -690,7 +691,8 @@ static void start_video_recorder(camera_view *view)
                recorder_state_e state;
                result = recorder_get_state(view->recorder, &state);
                RETM_IF(result != RECORDER_ERROR_NONE, "recorder_get_state fail > Error = %s", get_recorder_error(result));
-               DBG("State is %d", state);
+               RETM_IF(state != RECORDER_STATE_READY, "recorder_get_state fail > State = %s", get_recorder_state(result));
+
                result = recorder_start(view->recorder);
                RETM_IF(result != RECORDER_ERROR_NONE, "recorder_start fail > Error = %s", get_recorder_error(result));
        }
@@ -1337,6 +1339,35 @@ switch (error_code)
        return error;
 }
 
+char* get_recorder_state(int state)
+{
+       char* error = NULL;
+
+       switch (state)
+       {
+
+                       case RECORDER_STATE_NONE:
+                               error = "RECORDER_STATE_NONE";
+                               break;
+                       case RECORDER_STATE_CREATED:
+                               error = "RECORDER_STATE_CREATED";
+                               break;
+                       case RECORDER_STATE_READY:
+                               error = "RECORDER_STATE_READY";
+                               break;
+                       case RECORDER_STATE_RECORDING:
+                               error = "RECORDER_STATE_RECORDING";
+                               break;
+                       case RECORDER_STATE_PAUSED:
+                               error = "RECORDER_STATE_PAUSED";
+                               break;
+                       default:
+                               error = "Unknown State";
+       }
+       return error;
+
+}
+
 
 /**
  * @function           check_device_property

diff --git a/tbtcoreapp/src/view/tbt-nsd-dns-sd-view.c b/tbtcoreapp/src/view/tbt-nsd-dns-sd-view.c
index 84bd2163010eb713d61cc96f04256512103d2c98..d11a7ab36cf3c14c2280dc3e4a0014b383681299 100644 (file)
--- a/tbtcoreapp/src/view/tbt-nsd-dns-sd-view.c
+++ b/tbtcoreapp/src/view/tbt-nsd-dns-sd-view.c
@@ -161,8 +161,8 @@ nsd_dnssd_view *nsd_dnssd_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Ob
     this->view = calloc(1, sizeof(common_view));
     RETVM_IF(!this->view, NULL, "calloc failed");
 
-    tbt_info->layout_group = "nsd_dnssd_viewer";
-    tbt_info->layout_file = get_edje_path("nsd_viewer.edj");
+    tbt_info->layout_group = "4_part_cnt_cnt_btn_btn";
+    tbt_info->layout_file = get_edje_path("4_part_cnt1.25_cnt1.5_btn_btn.edj");
 
     common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
 
@@ -178,7 +178,7 @@ nsd_dnssd_view *nsd_dnssd_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Ob
 #endif
 
        evas_object_data_set(this->list, "view_data", this);
-       elm_object_part_content_set(this->view->layout, "nsd_dnssd_view", this->list);
+       elm_object_part_content_set(this->view->layout, "1cnt", this->list);
 
 #ifdef USE_GENLIST
        this->info_list = elm_genlist_add(this->view->layout);
@@ -189,18 +189,36 @@ nsd_dnssd_view *nsd_dnssd_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Ob
 #endif
 
        evas_object_data_set(this->info_list, "view_data", this);
-       elm_object_part_content_set(this->view->layout, "nsd_dnssd_info_view", this->info_list);
+       elm_object_part_content_set(this->view->layout, "1cnt_2cnt", this->info_list);
 
 
        if(this->view->tbt_info->apptype == TBT_APP_NSD_DNS_SD_LOCAL)
        {
-               this->btn_browse_service = ui_utils_push_button_add(this, this->view->layout, "Browse Service", _on_browse_btn_clickded_cb);
-               elm_object_part_content_set(this->view->layout, "nsd_dnssd_btn_view", this->btn_browse_service);
+               //this->btn_browse_service = ui_utils_push_button_add(this, this->view->layout, "Browse Service", _on_browse_btn_clickded_cb);
+               //elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", this->btn_browse_service);
+               Evas_Object *table = elm_table_add(this->view->layout);
+               evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_show(table);
+
+               this->btn_browse_service = ui_utils_push_button_add(this, table, "Browse Service", _on_browse_btn_clickded_cb);
+               elm_table_pack(table, this->btn_browse_service, 0, 0, 1, 1);
+               elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", table);
+               elm_object_text_set(this->btn_browse_service, ui_utils_text_add("Browse Service", NULL));
        }
        else if(this->view->tbt_info->apptype == TBT_APP_NSD_DNS_SD_REMOTE)
        {
-               this->btn_add_text_record = ui_utils_push_button_add(this, this->view->layout, "Add Record", _on_add_record_btn_clickded_cb);
-               elm_object_part_content_set(this->view->layout, "nsd_dnssd_btn_view", this->btn_add_text_record);
+               //this->btn_add_text_record = ui_utils_push_button_add(this, this->view->layout, "Add Record", _on_add_record_btn_clickded_cb);
+               //elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", this->btn_add_text_record);
+               Evas_Object *table = elm_table_add(this->view->layout);
+               evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_show(table);
+
+               this->btn_add_text_record = ui_utils_push_button_add(this, table, "Add Record", _on_add_record_btn_clickded_cb);
+               elm_table_pack(table, this->btn_add_text_record, 0, 0, 1, 1);
+               elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", table);
+               elm_object_text_set(this->btn_add_text_record, ui_utils_text_add("Add Record", NULL));
        }
 
        evas_object_show(this->list);

diff --git a/tbtcoreapp/src/view/tbt-nsd-ssdp-view.c b/tbtcoreapp/src/view/tbt-nsd-ssdp-view.c
index 5c1cfa7096efa143a3441acc95e42982bdfc5ffa..a096b10e961e761f2f5e33edf2dba6ba1795c2e7 100644 (file)
--- a/tbtcoreapp/src/view/tbt-nsd-ssdp-view.c
+++ b/tbtcoreapp/src/view/tbt-nsd-ssdp-view.c
@@ -87,33 +87,53 @@ nsd_ssdp_view *nsd_ssdp_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Obje
     this->view = calloc(1, sizeof(common_view));
     RETVM_IF(!this->view, NULL, "calloc failed");
 
-    tbt_info->layout_group = "nsd_ssdp_viewer";
-    tbt_info->layout_file = get_edje_path("nsd_viewer.edj");
+    tbt_info->layout_group = "4_part_cnt_cnt_btn_btn";
+    tbt_info->layout_file = get_edje_path("4_part_cnt1.25_cnt1.5_btn_btn.edj");
 
     common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
 
        RETVM_IF(NULL == this->view, NULL, "navi is null");
 
+
        this->list = elm_list_add(this->view->layout);
        RETVM_IF(!this->list, NULL, "elm_list_add failed");
        evas_object_data_set(this->list, "view_data", this);
-       elm_object_part_content_set(this->view->layout, "nsd_ssdp_view", this->list);
+       elm_object_part_content_set(this->view->layout, "1cnt", this->list);
 
        this->info_list = elm_list_add(this->view->layout);
        RETVM_IF(!this->info_list, NULL, "elm_list_add failed");
        evas_object_data_set(this->info_list, "view_data", this);
-       elm_object_part_content_set(this->view->layout, "nsd_ssdp_info_view", this->info_list);
+       elm_object_part_content_set(this->view->layout, "1cnt_2cnt", this->info_list);
 
 
        if(this->view->tbt_info->apptype == TBT_APP_NSD_SSDP_LOCAL)
        {
-               this->btn_browse_service = ui_utils_push_button_add(this, this->view->layout, "Browse Service", _on_browse_btn_clickded_cb);
-               elm_object_part_content_set(this->view->layout, "nsd_ssdp_btn_view", this->btn_browse_service);
+               //this->btn_browse_service = ui_utils_push_button_add(this, this->view->layout, "Browse Service", _on_browse_btn_clickded_cb);
+               //elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", this->btn_browse_service);
+               Evas_Object *table = elm_table_add(this->view->layout);
+               evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_show(table);
+
+               this->btn_browse_service = ui_utils_push_button_add(this, table, "Browse Service", _on_browse_btn_clickded_cb);
+               elm_table_pack(table, this->btn_browse_service, 0, 0, 1, 1);
+               elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", table);
+               elm_object_text_set(this->btn_browse_service, ui_utils_text_add("Browse Service", NULL));
+
        }
        else if(this->view->tbt_info->apptype == TBT_APP_NSD_SSDP_REMOTE)
        {
-               this->btn_add_text_record = ui_utils_push_button_add(this, this->view->layout, "Add Service", _on_add_record_btn_clickded_cb);
-               elm_object_part_content_set(this->view->layout, "nsd_ssdp_btn_view", this->btn_add_text_record);
+               //this->btn_add_text_record = ui_utils_push_button_add(this, this->view->layout, "Add Service", _on_add_record_btn_clickded_cb);
+               //elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", this->btn_add_text_record);
+               Evas_Object *table = elm_table_add(this->view->layout);
+               evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_show(table);
+
+               this->btn_add_text_record = ui_utils_push_button_add(this, table, "Add Service", _on_add_record_btn_clickded_cb);
+               elm_table_pack(table, this->btn_add_text_record, 0, 0, 1, 1);
+               elm_object_part_content_set(this->view->layout, "1cnt_2cnt_3btn", table);
+               elm_object_text_set(this->btn_add_text_record, ui_utils_text_add("Add Service", NULL));
        }
 
        evas_object_show(this->list);