[TSAM-6501] Change scanning label to textblock

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

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 7496c9b..38ff7dc 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.192
+Version:       1.0.193
 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 1b4ddf0..72538eb 100755 (executable)
--- a/sources/wearable/res/wearable-circle/edje/wifi.edc
+++ b/sources/wearable/res/wearable-circle/edje/wifi.edc
@@ -52,6 +52,10 @@ collections {
                style { name: "check_text_in_password_layout";
                        base: "font=Tizen:style=Regular font_size=37 align=left color=#FFFFFF color_class=AT014 text_class=AT014";
                }
+               style { name: "progressbar_layout_style";
+                       base: "font=Tizen:style=Regular font_size=32 color=#F9F9F9FF align=center ellipsis=1.0 text_class=label";
+               }
+
        }
        group {
                name: "ap_signal_image_layout";
@@ -539,22 +543,38 @@ collections {
                        }
                        part {
                                name: "elm.text.progressbar";
-                               type: SWALLOW;
+                               type: TEXTBLOCK;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
                                        fixed: 1 1;
-                                       align: 0.5 0.0;
                                        rel1 {
-                                               relative: -0.7 0.8;
-                                               to_x: "content_bg";
-                                               to_y: "content_bg";
-                                       }
-                                       rel2 {
                                                relative: 0.0 1.0;
-                                               to_x: "right_padding";
+                                               to_x: "base";
                                                to_y: "middle_padding";
                                        }
+                                       rel2 {
+                                               relative: 1.0 0.0;
+                                               to_x: "base";
+                                               to_y: "bottom_padding";
+                                       }
+                                       text {
+                                               style: "progressbar_layout_style";
+                                               min: 1 1;
+                                       }
+                               }
+                       }
+                       part {
+                               name: "bottom_padding";
+                               type: SPACER;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: 0 88;
+                                       rel1.to: "base";
+                                       rel1.relative: 0.0 1.0;
+                                       align: 0.5 1.0;
+                                       fixed: 0 1;
                                }
                        }
                }

diff --git a/sources/wearable/src/wearable-circle/view/popup_scanning.c b/sources/wearable/src/wearable-circle/view/popup_scanning.c
index bb7ccfe..bea8d4f 100755 (executable)
--- a/sources/wearable/src/wearable-circle/view/popup_scanning.c
+++ b/sources/wearable/src/wearable-circle/view/popup_scanning.c
@@ -66,18 +66,6 @@ static Evas_Object *_create_popup(popup_scanning_object *self, Evas_Object *pare
        return popup;
 }
 
-static Evas_Object *_create_scanning_label(Evas_Object *parent)
-{
-       Evas_Object *label = elm_label_add(parent);
-       WIFI_RET_VAL_IF_FAIL(label, NULL);
-
-       elm_object_style_set(label, "popup/default");
-       elm_label_line_wrap_set(label, ELM_WRAP_MIXED);
-       elm_object_text_set(label, STR_SCANNING);
-
-       return label;
-}
-
 static Evas_Object *_create_scanning_progressbar(Evas_Object *parent)
 {
        Evas_Object *progressbar = NULL;
@@ -87,7 +75,7 @@ static Evas_Object *_create_scanning_progressbar(Evas_Object *parent)
                WIFI_LOG_ERR("progressbar create is failed.");
                return NULL;
        }
-       elm_object_style_set(progressbar, "process/small");
+       elm_object_style_set(progressbar, "process/popup/small");
        evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);
        evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_progressbar_pulse(progressbar, EINA_TRUE);
@@ -98,7 +86,6 @@ static Evas_Object *_create_scanning_progressbar(Evas_Object *parent)
 static Evas_Object *_create_scanning(popup_scanning_object *self, Evas_Object *parent)
 {
        Evas_Object *scanning;
-       Evas_Object *scanning_label;
        Evas_Object *scanning_progressbar;
 
        scanning = create_layout_use_edj_file(parent, CUSTOM_GROUP_SCANNING);
@@ -107,22 +94,14 @@ static Evas_Object *_create_scanning(popup_scanning_object *self, Evas_Object *p
                return NULL;
        }
 
-       scanning_label = _create_scanning_label(scanning);
-       if (!scanning_label) {
-               WIFI_LOG_ERR("_create_scanning_label is failed.");
-               evas_object_del(scanning);
-               return NULL;
-       }
-       elm_object_part_content_set(scanning, "elm.text.progressbar", scanning_label);
-
        scanning_progressbar = _create_scanning_progressbar(scanning);
        if (!scanning_progressbar) {
                WIFI_LOG_ERR("_create_scanning_progressbar is failed.");
-               evas_object_del(scanning_label);
                evas_object_del(scanning);
                return NULL;
        }
        elm_object_part_content_set(scanning, "elm.swallow.content", scanning_progressbar);
+       elm_object_part_text_set(scanning, "elm.text.progressbar", STR_SCANNING);
 
        return scanning;
 }