[TSAM-5309, TSAM-5303] Resolve some problems

- Add dummy genlist item to avoid overlap
- Exits the main loop of application when main layout is deleted.

Change-Id: Ic2da6e294a353b1a50f57e771a5244849dce9d0d
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 39bd87e..054b612 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.178
+Version:       1.0.179
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/wearable/inc/wearable-circle/view/layout_ap_info.h b/sources/wearable/inc/wearable-circle/view/layout_ap_info.h
index 1c54cef..477f02c 100755 (executable)
--- a/sources/wearable/inc/wearable-circle/view/layout_ap_info.h
+++ b/sources/wearable/inc/wearable-circle/view/layout_ap_info.h
@@ -32,7 +32,8 @@ typedef enum {
        AP_INFO_MENU_PASSWORD,
        AP_INFO_MENU_STATIC,
        AP_INFO_MENU_PROXY,
-       AP_INFO_MENU_SIZE
+       AP_INFO_MENU_EMPTY,
+       AP_INFO_MENU_SIZE,
 } ap_info_menu_type;
 
 typedef struct _layout_ap_info_object layout_ap_info_object;

diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c
index bb8a98c..fe6b420 100755 (executable)
--- a/sources/wearable/src/wearable-circle/app_main.c
+++ b/sources/wearable/src/wearable-circle/app_main.c
@@ -3518,6 +3518,10 @@ static layout_ap_info_object *_ap_info_create(app_object *app_obj, wifi_ap_objec
                                   NULL, NULL,
                                   __ap_info_menu_proxy_tap_cb, app_obj);
 
+       /* Add empty item to avoid overlap */
+       layout_ap_info_set_menu_cb(ap_info_obj, AP_INFO_MENU_EMPTY,
+                                  NULL, NULL, NULL, NULL, NULL, NULL);
+
        layout_ap_info_set_tap_connect_button_cb(ap_info_obj,
                                                 __ap_info_tap_connect_button_cb, app_obj);
 
@@ -3700,7 +3704,7 @@ static void __main_del_cb(void *data, Evas *e,
                          Evas_Object *obj, void *event_info)
 {
        __WIFI_FUNC_ENTER__;
-
+       app_efl_exit();
 }
 
 static char *__main_menu_power_text_get_cb(void *data, Evas_Object *obj, const char *part)

diff --git a/sources/wearable/src/wearable-circle/view/layout_ap_info.c b/sources/wearable/src/wearable-circle/view/layout_ap_info.c
index a4b7a7b..dc36177 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_ap_info.c
+++ b/sources/wearable/src/wearable-circle/view/layout_ap_info.c
@@ -154,6 +154,11 @@ static void _append_menu(layout_ap_info_object *self, ap_info_menu_type type,
                                         self->menu_cb[type].text_get, self->menu_cb[type].content_get, NULL, NULL);
                break;
 
+       case AP_INFO_MENU_EMPTY:
+               /* Empty item */
+               itc = create_genlist_itc("1text", NULL, NULL, NULL, NULL);
+               break;
+
        default:
                return;
        }
@@ -240,6 +245,7 @@ void layout_ap_info_open_show(layout_ap_info_object *self, void *menu_data)
        _append_menu(self, AP_INFO_MENU_TITLE, menu_data);
        _append_menu(self, AP_INFO_MENU_STATIC, menu_data);
        _append_menu(self, AP_INFO_MENU_PROXY, menu_data);
+       _append_menu(self, AP_INFO_MENU_EMPTY, menu_data);
        self->naviframe_item = view_base_naviframe_push(self->base,
                                                        self->layout, self->del_cb.func, self->del_cb.data);
        if (!self->naviframe_item) {
@@ -258,6 +264,7 @@ void layout_ap_info_wps_show(layout_ap_info_object *self, void *menu_data)
        _append_menu(self, AP_INFO_MENU_WPS, menu_data);
        _append_menu(self, AP_INFO_MENU_STATIC, menu_data);
        _append_menu(self, AP_INFO_MENU_PROXY, menu_data);
+       _append_menu(self, AP_INFO_MENU_EMPTY, menu_data);
        self->naviframe_item = view_base_naviframe_push(self->base,
                                                        self->layout, self->del_cb.func, self->del_cb.data);
        if (!self->naviframe_item) {
@@ -276,6 +283,7 @@ void layout_ap_info_eap_show(layout_ap_info_object *self, void *menu_data)
        _append_menu(self, AP_INFO_MENU_EAP, menu_data);
        _append_menu(self, AP_INFO_MENU_STATIC, menu_data);
        _append_menu(self, AP_INFO_MENU_PROXY, menu_data);
+       _append_menu(self, AP_INFO_MENU_EMPTY, menu_data);
        self->naviframe_item = view_base_naviframe_push(self->base,
                                                        self->layout, self->del_cb.func, self->del_cb.data);
        if (!self->naviframe_item) {
@@ -294,6 +302,7 @@ void layout_ap_info_security_show(layout_ap_info_object *self, void *menu_data)
        _append_menu(self, AP_INFO_MENU_PASSWORD, menu_data);
        _append_menu(self, AP_INFO_MENU_STATIC, menu_data);
        _append_menu(self, AP_INFO_MENU_PROXY, menu_data);
+       _append_menu(self, AP_INFO_MENU_EMPTY, menu_data);
        self->naviframe_item = view_base_naviframe_push(self->base,
                                                        self->layout, self->del_cb.func, self->del_cb.data);
        if (!self->naviframe_item) {

diff --git a/sources/wearable/src/wearable-circle/view/layout_scan.c b/sources/wearable/src/wearable-circle/view/layout_scan.c
index c0c0fe2..97ecd90 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_scan.c
+++ b/sources/wearable/src/wearable-circle/view/layout_scan.c
@@ -281,6 +281,8 @@ static gboolean _ap_list_update_ap_items(layout_scan_object *self)
                        _ap_list_append_ap_item(self, wifi_ap_itc, l->data);
                }
        }
+       /* Add empty item to avoid overlap */
+       _ap_list_append_ap_item(self, wifi_ap_itc, NULL);
        elm_genlist_item_class_free(wifi_ap_itc);
 
        WIFI_LOG_INFO("ap list update items count %d.", elm_genlist_items_count(self->ap_list) - 1);