Add title text in tap n pay view 33/92533/1 accepted/tizen/3.0/mobile/20161028.143249 accepted/tizen/3.0/wearable/20161028.150900 accepted/tizen/common/20161017.170343 accepted/tizen/mobile/20161018.021105 accepted/tizen/wearable/20161018.021126 submit/tizen/20161017.090923 submit/tizen_3.0/20161028.062323 submit/tizen_3.0/20161028.092423
authorJihoon Jung <jh8801.jung@samsung.com>
Mon, 17 Oct 2016 09:02:44 +0000 (18:02 +0900)
committerJihoon Jung <jh8801.jung@samsung.com>
Mon, 17 Oct 2016 09:03:25 +0000 (18:03 +0900)
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I5e8eaead2e48cebb2dd1af56b1cea352f5f62883

wearable/app/data/edc/nfc-setting-app.edc
wearable/app/src/nsa-view-tap-n-pay.c

index ca863c1..a02a890 100644 (file)
@@ -5,15 +5,15 @@
 #define TITLE_FONT_SIZE 39
 #define HELP_TEXT_SIZE_W 232
 #define HELP_TEXT_SIZE_H 30
-#define HELP_FONT_SIZE 30
-#define LR_PADDING_SIZE 33
+#define HELP_FONT_SIZE 25
+#define LR_PADDING_SIZE 46
 #define DESC_LR_PADDING_SIZE 64
-#define IMAGE_SIZE_W 294
+#define IMAGE_SIZE_W 270
 #define IMAGE_SIZE_H 122
 #define IMAGE_PADDING_H 20
 #define TITLE_LR_PADDING_SIZE 67
-#define TITLE_TOP_PADDING_SIZE 30
-#define TITLE_BOTTOM_PADDING_SIZE 7
+#define TITLE_TOP_PADDING_SIZE 50
+#define TITLE_BOTTOM_PADDING_SIZE 20
 
 #define STYLE_TAG_MATCH \
       tag:  "match" "+ color=#ffffff color_class=T0212";
index ac6c46e..0ccfa2b 100755 (executable)
@@ -83,6 +83,7 @@ static Evas_Object *__create_no_contents_ly(void *data)
 {
        appdata *ad = data;
        Evas_Object *sc, *ly, *image, *circle_obj;
+       Evas_Object *label;
 
        retv_if(ad == NULL, NULL);
 
@@ -109,6 +110,16 @@ static Evas_Object *__create_no_contents_ly(void *data)
        elm_object_part_content_set(ly, "elm.swallow.icon", image);
 
        elm_object_part_text_set(ly, "elm.text", IDS_NO_INSTALLED_PAYMENT_APPS);
+
+       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(label, 226);
+       elm_object_text_set(label, "<font=Tizen:style=Medium font_size=30 color=#0094ffff align=center text_class=tizen>Tap and pay</font>");
+       elm_object_part_content_set(ly, "elm.text.title", label);
+
+       evas_object_show(label);
        evas_object_show(ly);
 
        /* content set */
@@ -465,7 +476,7 @@ static Evas_Object *__create_tap_and_pay_list(void *data)
                ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
        eext_rotary_object_event_activated_set(circle_obj, EINA_TRUE);
 
-       evas_object_show(genlist);\r
+       evas_object_show(genlist);
 
        return genlist;
 }
@@ -489,7 +500,7 @@ bool _nsa_view_tap_n_pay_create(void *data)
 
        retv_if(layout == NULL, false);
 
-       elm_naviframe_item_push(ad->navi_frame, NULL, NULL, NULL, layout, "empty");
+       elm_naviframe_item_push(ad->navi_frame, "TAP", NULL, NULL, layout, "empty");
        ad->current_view = V_TAP_N_PAY;
 
        return true;