[TSAM-5621] Fix WPS popup issues

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

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index e709448..8243dad 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.183
+Version:       1.0.184
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/wearable/res/wearable-circle/edje/wifi.edc b/sources/wearable/res/wearable-circle/edje/wifi.edc
index c5c33a3..007b534 100755 (executable)
--- a/sources/wearable/res/wearable-circle/edje/wifi.edc
+++ b/sources/wearable/res/wearable-circle/edje/wifi.edc
@@ -253,44 +253,84 @@ collections {
                                }
                        }
                        part {
-                               name: "elm.swallow.percent_label";
-                               type: SWALLOW;
-                               scale: 1;
+                               name: "elm.image";
+                               type: IMAGE;
+                               scale : 1;
                                description {
+                                       color: 8 56 94 255;
                                        state: "default" 0.0;
-                                       min: 0 32;
-                                       fixed: 0 1;
-                                       align: 0.5 0.0;
+                                       min: 0 50;
+                                       fixed : 1 1;
+                                       align: 0.0 0.0;
+                                       visible: 1;
+                                       image.normal: "wifi_percent_bg.png";
                                        rel1 {
-                                               to: "top_padding";
-                                               relative: 0.0 1.0;
+                                               to: "base";
+                                               relative: 0.0 0.0;
                                        }
                                        rel2 {
-                                               to: "top_padding";
-                                               relative: 1.0 1.0;
+                                               to: "base";
+                                               relative: 1.0 0.0;
                                        }
                                }
                        }
                        part {
-                               name: "elm.image";
-                               type: IMAGE;
-                               scale : 1;
+                               name: "top_left_padding";
+                               type: SPACER;
+                               scale: 1;
                                description {
-                                       color_class: AO017;
                                        state: "default" 0.0;
-                                       min: 0 50;
-                                       fixed : 1 1;
+                                       min: 145 0;
+                                       fixed: 1 0;
                                        align: 0.0 0.0;
-                                       visible: 1;
-                                       image.normal: "wifi_percent_bg.png";
                                        rel1 {
                                                to: "base";
                                                relative: 0.0 0.0;
                                        }
                                        rel2 {
                                                to: "base";
+                                               relative: 0.0 1.0;
+                                       }
+                               }
+                       }
+                       part {
+                               name: "top_right_padding";
+                               type: SPACER;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: 145 0;
+                                       fixed: 1 0;
+                                       align: 1.0 0.0;
+                                       rel1 {
+                                               to: "base";
                                                relative: 1.0 0.0;
                                        }
+                                       rel2 {
+                                               to: "base";
+                                               relative: 1.0 1.0;
+                                       }
+                               }
+                       }
+                       part {
+                               name: "elm.swallow.percent_label";
+                               type: SWALLOW;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: 0 32;
+                                       fixed: 0 1;
+                                       align: 0.0 0.0;
+                                       rel1 {
+                                               relative: 1.0 1.0;
+                                               to_x: "top_left_padding";
+                                               to_y: "top_padding";
+                                       }
+                                       rel2 {
+                                               relative: 0.0 1.0;
+                                               to_x: "top_right_padding";
+                                               to_y: "top_padding";
+                                       }
                                }
                        }
                        part {

diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c
index 55be13a..fc12919 100755 (executable)
--- a/sources/wearable/src/wearable-circle/app_main.c
+++ b/sources/wearable/src/wearable-circle/app_main.c
@@ -1043,8 +1043,6 @@ static char *__scan_menu_ap_item_text_get_cb(void *data, Evas_Object *obj, const
 
        WIFI_RET_VAL_IF_FAIL(ap_obj != NULL, NULL);
 
-       WIFI_LOG_ERR("part (%s)", part);
-
        if (!g_strcmp0(part, "elm.text")) {
                gchar *ssid, *markup_ssid;
                ssid = wifi_manager_ap_get_ssid(ap_obj);

diff --git a/sources/wearable/src/wearable-circle/view/layout_main.c b/sources/wearable/src/wearable-circle/view/layout_main.c
index 9d5633f..68f767d 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_main.c
+++ b/sources/wearable/src/wearable-circle/view/layout_main.c
@@ -74,6 +74,7 @@ static gboolean _create_menu_itc_array(layout_main_object *obj,
        if (!menu_item_array[MAIN_MENU_SCAN]) {
                elm_genlist_item_class_free(menu_item_array[MAIN_MENU_POWER]);
        }
+
        return TRUE;
 }
 

diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_method.c b/sources/wearable/src/wearable-circle/view/layout_wps_method.c
index 1d218d8..3207ce7 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_wps_method.c
+++ b/sources/wearable/src/wearable-circle/view/layout_wps_method.c
@@ -76,6 +76,7 @@ static Evas_Object *_create_initialized_menu_list(layout_wps_method_object *self
        Elm_Genlist_Item_Class *menu_title_itc = NULL;
        Elm_Genlist_Item_Class *menu_wps_button_itc = NULL;
        Elm_Genlist_Item_Class *menu_wps_pin_itc = NULL;
+       Elm_Genlist_Item_Class *menu_empty_itc = NULL;
 
        if (!menu_list) {
                WIFI_LOG_ERR("menu_list create is failed.");
@@ -107,6 +108,15 @@ static Evas_Object *_create_initialized_menu_list(layout_wps_method_object *self
                evas_object_del(menu_list);
                return NULL;
        }
+       menu_empty_itc = create_genlist_itc("1text", NULL, NULL, NULL, NULL);
+       if (!menu_empty_itc) {
+               WIFI_LOG_ERR("menu wps pin itc create failed.");
+               elm_genlist_item_class_free(menu_title_itc);
+               elm_genlist_item_class_free(menu_wps_button_itc);
+               elm_genlist_item_class_free(menu_wps_pin_itc);
+               evas_object_del(menu_list);
+               return NULL;
+       }
        elm_genlist_item_append(menu_list, menu_title_itc, NULL,
                                NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_append(menu_list, menu_wps_button_itc, menu_data,
@@ -116,10 +126,14 @@ static Evas_Object *_create_initialized_menu_list(layout_wps_method_object *self
        elm_genlist_item_append(menu_list, menu_wps_pin_itc, menu_data,
                                NULL, ELM_GENLIST_ITEM_NONE,
                                self->menu_cb[WPS_METHOD_MENU_WPS_PIN].tap,
+
                                self->menu_cb[WPS_METHOD_MENU_WPS_PIN].data);
+       elm_genlist_item_append(menu_list, menu_empty_itc, menu_data,
+                               NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_class_free(menu_title_itc);
        elm_genlist_item_class_free(menu_wps_button_itc);
        elm_genlist_item_class_free(menu_wps_pin_itc);
+       elm_genlist_item_class_free(menu_empty_itc);
        return menu_list;
 }
 

diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c
index d197674..067c5ac 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c
+++ b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c
@@ -103,10 +103,10 @@ static Evas_Object *_create_popup(layout_wps_progress_object *self, Evas_Object
        Evas_Object *popup = view_base_add_popup_for_circle(self->base, parent);
        WIFI_RET_VAL_IF_FAIL(popup != NULL, NULL);
 
-       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK,
-                                      __popup_hide_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, 
+                       self->destroy_cb.func, self->destroy_cb.data);
        evas_object_smart_callback_add(popup, "dismissed",
-                                      self->destroy_cb.func, self->destroy_cb.data);
+                       self->destroy_cb.func, self->destroy_cb.data);
        return popup;
 }
 
@@ -372,6 +372,9 @@ void layout_wps_progress_dismiss(layout_wps_progress_object *self)
        WIFI_RET_IF_FAIL(self->popup != NULL);
 
        elm_popup_dismiss(self->popup);
+
+       /* TODO: It will be removed */
+       layout_wps_progress_destroy(self);
 }
 
 void layout_wps_progress_activate_rotary_event(layout_wps_progress_object *self)