[UI] Pincode layout improvement

Change-Id: I440334c9744e6df283cb80189729325e1d39a97d
Signed-off-by: Piotr Pruski <p.pruski@samsung.com>

diff --git a/res/view/system/pin.edc b/res/view/system/pin.edc
index adbe7bb..0b9fed0 100644 (file)
--- a/res/view/system/pin.edc
+++ b/res/view/system/pin.edc
@@ -20,13 +20,14 @@
 #define THIS_LAYOUT_WIDTH (740.0)
 
 #define INFORMATION_TXT_HEIGHT (32.0 / THIS_LAYOUT_HEIGHT)
-#define DIGIT_ENTRY_HEIGHT (68.0 / THIS_LAYOUT_HEIGHT)
+#define DIGIT_ENTRY_HEIGHT (58.0 / THIS_LAYOUT_HEIGHT)
 #define DIGIT_ENTRY_WIDTH (68.0 / THIS_LAYOUT_WIDTH)
-#define DIGIT_ENTRY_SPACING_X (2.0 / THIS_LAYOUT_WIDTH)
+#define DIGIT_ENTRY_SPACING_X (20.0 / THIS_LAYOUT_WIDTH)
 #define DIGIT_ENTRY_SPACING_Y (2.0 / THIS_LAYOUT_HEIGHT)
 
-#define PIN_DIGIT_Y1 (((32.0 + 154.0 / 2.0) / THIS_LAYOUT_HEIGHT) - DIGIT_ENTRY_HEIGHT / 2.0)
+#define PIN_DIGIT_Y1 ((((32.0 + 154.0 / 2.0) / THIS_LAYOUT_HEIGHT) - DIGIT_ENTRY_HEIGHT / 2.0 + 0.1) + 0.08)
 #define PIN_DIGIT_Y2 (PIN_DIGIT_Y1 + DIGIT_ENTRY_HEIGHT)
+#define WARN_Y (PIN_DIGIT_Y2 + 0.3)
 #define PIN_DIGIT_1_X1 (0.5 - 2.0 * (DIGIT_ENTRY_WIDTH) - 3 * DIGIT_ENTRY_SPACING_X)
 #define PIN_DIGIT_1_X2 (0.5 - DIGIT_ENTRY_WIDTH - 3 * DIGIT_ENTRY_SPACING_X)
 #define PIN_DIGIT_2_X1 (0.5 - DIGIT_ENTRY_WIDTH - DIGIT_ENTRY_SPACING_X)
@@ -51,7 +52,7 @@ group
                        {
                                state: "default" 0.0;
                                color: 104 104 104 255;
-                               rel1.relative: 0.0 0.0;
+                               rel1.relative: 0.0 0.15;
                                rel2.relative: 1.0 INFORMATION_TXT_HEIGHT;
                                text
                                {
@@ -62,7 +63,6 @@ group
                                }
                        }
                }
-
                part
                {
                        type: RECT;
@@ -70,7 +70,8 @@ group
                        description
                        {
                                state: "default" 0.0;
-                               color: 0 0 0 255;
+                               color: 188 188 188 255;
+                               visible: 0;
                                rel1.relative: (PIN_DIGIT_1_X1 - DIGIT_ENTRY_SPACING_X) (PIN_DIGIT_Y1 - DIGIT_ENTRY_SPACING_Y);
                                rel2.relative: (PIN_DIGIT_4_X2 + DIGIT_ENTRY_SPACING_X) (PIN_DIGIT_Y2 + DIGIT_ENTRY_SPACING_Y);
                        }
@@ -82,6 +83,22 @@ group
                        description
                        {
                                state: "default" 0.0;
+                               min: 78.0 78.0;
+                               color: 188 188 188 255;
+                               rel1.to: PART_ENTRY_1;
+                               rel2.to: PART_ENTRY_1;
+                               rel1.relative: 0.0 0.0;
+                               rel2.relative: 1.0 1.0;
+                       }
+               }
+               part
+               {
+                       type: RECT;
+                       scale: 1;
+                       description
+                       {
+                               state: "default" 0.0;
+                               min: 68.0 68.0;
                                color: 255 255 255 255;
                                rel1.to: PART_ENTRY_1;
                                rel2.to: PART_ENTRY_1;
@@ -111,6 +128,22 @@ group
                        description
                        {
                                state: "default" 0.0;
+                               min: 78.0 78.0;
+                               color: 188 188 188 255;
+                               rel1.to: PART_ENTRY_2;
+                               rel2.to: PART_ENTRY_2;
+                               rel1.relative: 0.0 0.0;
+                               rel2.relative: 1.0 1.0;
+                       }
+               }
+               part
+               {
+                       type: RECT;
+                       scale: 1;
+                       description
+                       {
+                               state: "default" 0.0;
+                               min: 68.0 68.0;
                                color: 255 255 255 255;
                                rel1.to: PART_ENTRY_2;
                                rel2.to: PART_ENTRY_2;
@@ -140,6 +173,22 @@ group
                        description
                        {
                                state: "default" 0.0;
+                               min: 78.0 78.0;
+                               color: 188 188 188 255;
+                               rel1.to: PART_ENTRY_3;
+                               rel2.to: PART_ENTRY_3;
+                               rel1.relative: 0.0 0.0;
+                               rel2.relative: 1.0 1.0;
+                       }
+               }
+               part
+               {
+                       type: RECT;
+                       scale: 1;
+                       description
+                       {
+                               state: "default" 0.0;
+                               min: 68.0 68.0;
                                color: 255 255 255 255;
                                rel1.to: PART_ENTRY_3;
                                rel2.to: PART_ENTRY_3;
@@ -169,6 +218,22 @@ group
                        description
                        {
                                state: "default" 0.0;
+                               min: 78.0 78.0;
+                               color: 188 188 188 255;
+                               rel1.to: PART_ENTRY_4;
+                               rel2.to: PART_ENTRY_4;
+                               rel1.relative: 0.0 0.0;
+                               rel2.relative: 1.0 1.0;
+                       }
+               }
+               part
+               {
+                       type: RECT;
+                       scale: 1;
+                       description
+                       {
+                               state: "default" 0.0;
+                               min: 68.0 68.0;
                                color: 255 255 255 255;
                                rel1.to: PART_ENTRY_4;
                                rel2.to: PART_ENTRY_4;
@@ -191,7 +256,6 @@ group
                                rel2.relative: PIN_DIGIT_4_X2 PIN_DIGIT_Y2;
                        }
                }
-
                part
                {
                        name: "warn";
@@ -201,7 +265,7 @@ group
                        {
                                state: "default" 0.0;
                                color: 255 0 0 255;
-                               rel1.relative: 0.0 PIN_DIGIT_Y2;
+                               rel1.relative: 0.0 WARN_Y;
                                rel2.relative: 1.0 1.0;
                                text
                                {

diff --git a/src/common/utils.c b/src/common/utils.c
index 61d5530..ed7df1d 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -316,6 +316,7 @@ Evas_Object *utils_add_entry(Evas_Object *parent, const char *part,
                elm_entry_text_style_user_push(entry, text_style);
 
        if (is_password) {
+               elm_object_style_set(entry, "input.field.pin");
                elm_entry_password_set(entry, EINA_TRUE);
                elm_config_password_show_last_set(EINA_FALSE);
        }