Change nfc ug for tts

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: Ie2880ce1eb8bd9d3cda9f14b75a8ce12fc70425f

diff --git a/packaging/ug-nfc-efl.spec b/packaging/ug-nfc-efl.spec
index 204efae..5ee2809 100644 (file)
--- a/packaging/ug-nfc-efl.spec
+++ b/packaging/ug-nfc-efl.spec
@@ -16,7 +16,7 @@ ExcludeArch: %{arm} %ix86 x86_64
 
 Name:       ug-nfc-efl
 Summary:    NFC Setting UI
-Version:    3.1.5
+Version:    3.1.6
 Release:    0
 Group:      App/Network
 License:    Flora-1.1

diff --git a/wearable/app/data/edc/nfc-setting-app.edc b/wearable/app/data/edc/nfc-setting-app.edc
index a02a890..7bb38e0 100644 (file)
--- a/wearable/app/data/edc/nfc-setting-app.edc
+++ b/wearable/app/data/edc/nfc-setting-app.edc
@@ -3,11 +3,11 @@
 #define TITLE_TEXT_SIZE_W 226
 #define TITLE_TEXT_SIZE_H 39
 #define TITLE_FONT_SIZE 39
-#define HELP_TEXT_SIZE_W 232
+#define HELP_TEXT_SIZE_W 226
 #define HELP_TEXT_SIZE_H 30
 #define HELP_FONT_SIZE 25
 #define LR_PADDING_SIZE 46
-#define DESC_LR_PADDING_SIZE 64
+#define DESC_LR_PADDING_SIZE 67
 #define IMAGE_SIZE_W 270
 #define IMAGE_SIZE_H 122
 #define IMAGE_PADDING_H 20
@@ -248,11 +248,11 @@ collections {
                        }
 
                        part { name: "elm.text";
-                               type: TEXTBLOCK;
+                               type: SWALLOW;
                                description { state: "default" 0.0;
                                        min: HELP_TEXT_SIZE_W HELP_TEXT_SIZE_H;
-                                       max: HELP_TEXT_SIZE_W -1;
-                                       fixed: 1 0;
+                                       max: HELP_TEXT_SIZE_W HELP_TEXT_SIZE_H;
+                                       fixed: 1 1;
                                        rel1 {
                                                to_x: "desc_left_padding";
                                                to_y: "image_bottom_padding";
@@ -260,17 +260,11 @@ collections {
                                        }
                                        rel2 {
                                                to_x: "desc_right_padding";
-                                               to_y: "bg";
+                                               to_y: "image_bottom_padding";
                                                relative: 0.0 1.0;
-                                               offset: 0 760;
-                                       }
-                                       align: 0.5 0.0;
-                                       color_class: "AT017";
-                                       text {
-                                               style: "nocontent_style";
-                                               min: 0 1;
-                                               max: 0 1;
                                        }
+                                       fixed: 0 1;
+                                       align: 0.5 0;
                                }
                        }
                }

diff --git a/wearable/app/src/nsa-main.c b/wearable/app/src/nsa-main.c
index 91b03c9..482cf04 100755 (executable)
--- a/wearable/app/src/nsa-main.c
+++ b/wearable/app/src/nsa-main.c
@@ -35,8 +35,6 @@ static void __back_clicked_cb(void *data, Evas_Object *obj, void *event_info)
        elm_naviframe_item_pop(ad->navi_frame);
 
        if (ad->current_view == V_TAP_N_PAY && ad->op_type != NSA_OP_TAP_N_PAY) {
-               Evas_Object *circle_obj;
-
                /* release Tap & Pay view */
                if (ad->payment_wallet_list != NULL) {
                        int i;

diff --git a/wearable/app/src/nsa-view-tap-n-pay.c b/wearable/app/src/nsa-view-tap-n-pay.c
index 1ef7560..d144887 100755 (executable)
--- a/wearable/app/src/nsa-view-tap-n-pay.c
+++ b/wearable/app/src/nsa-view-tap-n-pay.c
@@ -83,8 +83,10 @@ static Evas_Object *__create_no_contents_ly(void *data)
 {
        appdata *ad = data;
        Evas_Object *sc, *ly, *image, *circle_obj;
-       Evas_Object *label;
-       char title[256];
+       Evas_Object *title_label;
+       Evas_Object *desc_label;
+       char title_text[256];
+       char desc_text[256];
 
        retv_if(ad == NULL, NULL);
 
@@ -110,19 +112,24 @@ static Evas_Object *__create_no_contents_ly(void *data)
        elm_image_file_set(image, IMAGES_PATH"/b_setting_payment_help_image.png", NULL);
        elm_object_part_content_set(ly, "elm.swallow.icon", image);
 
-       elm_object_part_text_set(ly, "elm.text", IDS_NO_INSTALLED_PAYMENT_APPS);
+       title_label = elm_label_add(ly);
+       evas_object_size_hint_weight_set(title_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(title_label, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       label = elm_label_add(ly);
-       evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_label_wrap_width_set(title_label, 226);
+       snprintf(title_text, 256, "<font=Tizen:style=Medium font_size=30 color=#0094ffff align=center text_class=tizen>%s</font>", IDS_TAP_AND_PAY);
+       elm_object_text_set(title_label, title_text);
+       elm_object_part_content_set(ly, "elm.text.title", title_label);
 
-       elm_label_wrap_width_set(label, 226);
-       snprintf(title, 256, "<font=Tizen:style=Medium font_size=30 color=#0094ffff align=center text_class=tizen>%s</font>", IDS_TAP_AND_PAY);
-       elm_object_text_set(label, title);
-       elm_object_part_content_set(ly, "elm.text.title", label);
+       desc_label = elm_label_add(ly);
+       evas_object_size_hint_weight_set(desc_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(desc_label, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-       evas_object_show(label);
-       evas_object_show(ly);
+       elm_label_wrap_width_set(desc_label, 226);
+       elm_label_line_wrap_set(desc_label, ELM_WRAP_MIXED);
+       snprintf(desc_text, 256, "<font=Tizen:style=Medium font_size=25 align=center text_class=tizen>%s</font>", IDS_NO_INSTALLED_PAYMENT_APPS);
+       elm_object_text_set(desc_label, desc_text);
+       elm_object_part_content_set(ly, "elm.text", desc_label);
 
        /* content set */
        elm_object_content_set(sc, ly);