modify user edit view according to v0.4 GUI doc

- remove title divider
- remove function button layer
- locate require text under photo
- add pin code text under name

Change-Id: I4efcb5ab5c90d04399f1b910e305e8af8ed0ae85
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>

diff --git a/edje/view/useredit.edc b/edje/view/useredit.edc
index 34dc7aa..b114ac1 100644 (file)
--- a/edje/view/useredit.edc
+++ b/edje/view/useredit.edc
@@ -46,56 +46,6 @@ group {
                        }
                }
                part {
-                       name, "divider.up";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, "title";
-                                       relative, 0.0 1.0;
-                               }
-                               rel2.to, "title";
-                               min, 0 1;
-                               fixed, 0 1;
-                               align, 0.5 0.0;
-                               color, 210 219 230 255;
-                       }
-               }
-               part {
-                       name, "function.btn";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               rel1 {
-                                       to, "divider.up";
-                                       relative, 0.0 1.0;
-                               }
-                               rel2.to, "divider.up";
-                               min, 0 114;
-                               fixed, 0 1;
-                               align, 0.5 0.0;
-                               color, 221 231 242 255;
-                       }
-               }
-               part {
-                       name, "divider.down";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, "function.btn";
-                                       relative, 0.0 1.0;
-                               }
-                               rel2.to, "function.btn";
-                               min, 0 1;
-                               fixed, 0 1;
-                               align, 0.5 0.0;
-                               color, 210 219 230 255;
-                       }
-               }
-               part {
                        name, "action.btn";
                        type, RECT;
                        scale, 1;
@@ -165,7 +115,7 @@ group {
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "divider.down";
+                                       to, "title";
                                        relative, 0.0 1.0;
                                }
                                rel2 {
@@ -190,7 +140,7 @@ group {
                                        to, "contents";
                                        relative, 0.5 0.5;
                                }
-                               min, 1036 452;
+                               min, 1128 408;
                                fixed, 1 1;
                        }
                }
@@ -211,7 +161,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 1036 452;
+                               min, 1128 408;
                                visible, 0;
                        }
                }
@@ -334,6 +284,90 @@ group {
                        }
                }
                part {
+                       name, "pad.require";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, PART_USER_EDIT_CONTENTS_PHOTO;
+                                       relative, 0.0 1.0;
+                               }
+                               rel2 {
+                                       to, PART_USER_EDIT_CONTENTS_PHOTO;
+                                       relative, 0.0 1.0;
+                               }
+                               min, 0 22;
+                               fixed, 1 1;
+                               align, 0.0 0.0;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, "icon.require";
+                       type, IMAGE;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "pad.require";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2.to, "pad.require";
+                               min, 12 24;
+                               fixed, 1 1;
+                               align, 0.0 0.0;
+                               image.normal, "ic_user_require_02.png";
+                       }
+               }
+               part {
+                       name, "pad.require.text";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "icon.require";
+                                       relative, 1.0 0.0;
+                               }
+                               rel2 {
+                                       to, "icon.require";
+                                       relative, 1.0 0.0;
+                               }
+                               min, 6 0;
+                               align, 0.0 0.0;
+                               fixed, 1 1;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name, "require";
+                       type, TEXT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1 {
+                                       to, "pad.require.text";
+                                       relative, 1.0 1.0;
+                               }
+                               rel2 {
+                                       to, "pad.require.text";
+                                       relative, 1.0 1.0;
+                               }
+                               min, 294 24;
+                               fixed, 1 1;
+                               align, 0.0 0.0;
+                               text {
+                                       font, "TizenSans";
+                                       size, 24;
+                                       align, 0.0 0.5;
+                                       text, "Required fields";
+                               }
+                               color, 64 136 211 255;
+                       }
+               }
+
+               part {
                        name, "pad.profile";
                        type, RECT;
                        scale, 1;
@@ -354,7 +388,7 @@ group {
                        }
                }
                part {
-                       name, "information";
+                       name, "name";
                        type, TEXT;
                        scale, 1;
                        description {
@@ -367,30 +401,30 @@ group {
                                        to, "pad.profile";
                                        relative, 1.0 0.0;
                                }
-                               min, 180 32;
+                               min, 95 32;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
                                        font, "TizenSans";
                                        size, 32;
-                                       text, "Information";
+                                       text, "Name";
                                        align, 0.0 0.5;
                                }
                                color, 77 77 77 255;
                        }
                }
                part {
-                       name, "information.require";
+                       name, "name.require";
                        type, IMAGE;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "information";
+                                       to, "name";
                                        relative, 1.0 0.0;
                                }
                                rel2 {
-                                       to, "information";
+                                       to, "name";
                                        relative, 1.0 0.0;
                                }
                                min, 16 20;
@@ -406,11 +440,11 @@ group {
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "information";
+                                       to, "name";
                                        relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, "information";
+                                       to, "name";
                                        relative, 0.0 1.0;
                                }
                                min, 0 22;
@@ -450,190 +484,157 @@ group {
                                        to, PART_USER_EDIT_CONTENTS_NAME;
                                        relative, 0.0 1.0;
                                }
-                               min, 0 16;
+                               min, 0 32;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                visible, 0;
                        }
                }
                part {
-                       name, PART_USER_EDIT_CONTENTS_PIN;
-                       type, SWALLOW;
+                       name, "pin";
+                       type, TEXT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
                                        to, "pad.pin";
-                                       relative, 1.0 1.0;
-                               }
-                               rel2.to, "pad.pin";
-                               min, 436 64;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                       }
-               }
-               part {
-                       name, "pad.lock";
-                       type, RECT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, PART_USER_EDIT_CONTENTS_PIN;
                                        relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, PART_USER_EDIT_CONTENTS_PIN;
+                                       to, "pad.pin";
                                        relative, 0.0 1.0;
                                }
-                               min, 0 32;
-                               fixed, 1 1;
-                               align, 0.0 0.0;
-                               visible, 0;
-                       }
-               }
-               part {
-                       name, "lock";
-                       type, TEXT;
-                       scale, 1;
-                       description {
-                               state, "default" 0.0;
-                               rel1 {
-                                       to, "pad.lock";
-                                       relative, 1.0 1.0;
-                               }
-                               rel2.to, "pad.lock";
                                min, 436 32;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                text {
+                                       text, "Pin code";
                                        font, "TizenSans";
                                        size, 32;
-                                       text, "Privacy lock";
                                        align, 0.0 0.5;
                                }
                                color, 77 77 77 255;
                        }
                }
                part {
-                       name, "pad.lock.down";
+                       name, "pad.pin.down";
                        type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "lock";
+                                       to, "pin";
                                        relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, "lock";
+                                       to, "pin";
                                        relative, 0.0 1.0;
                                }
                                min, 0 22;
-                               fixed, 1 1;
                                align, 0.0 0.0;
+                               fixed, 1 1;
                                visible, 0;
                        }
                }
                part {
-                       name, PART_USER_EDIT_CONTENTS_LOCK;
+                       name, PART_USER_EDIT_CONTENTS_PIN;
                        type, SWALLOW;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "pad.lock.down";
+                                       to, "pad.pin.down";
                                        relative, 1.0 1.0;
                                }
-                               rel2.to, "pad.lock.down";
-                               min, 104 54;
+                               rel2 {
+                                       to, "pad.pin.down";
+                                       relative, 1.0 1.0;
+                               }
+                               min, 436 64;
                                fixed, 1 1;
                                align, 0.0 0.0;
                        }
                }
                part {
-                       name, "pad.require";
+                       name, "pad.lock";
                        type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, PART_USER_EDIT_CONTENTS_LOCK;
+                                       to, PART_USER_EDIT_CONTENTS_PIN;
                                        relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, PART_USER_EDIT_CONTENTS_LOCK;
+                                       to, PART_USER_EDIT_CONTENTS_PIN;
                                        relative, 0.0 1.0;
                                }
-                               min, 0 22;
+                               min, 0 32;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                visible, 0;
                        }
                }
                part {
-                       name, "icon.require";
-                       type, IMAGE;
+                       name, "lock";
+                       type, TEXT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "pad.require";
+                                       to, "pad.lock";
                                        relative, 1.0 1.0;
                                }
-                               rel2.to, "pad.require";
-                               min, 12 24;
+                               rel2.to, "pad.lock";
+                               min, 436 32;
                                fixed, 1 1;
                                align, 0.0 0.0;
-                               image.normal, "ic_user_require_02.png";
+                               text {
+                                       font, "TizenSans";
+                                       size, 32;
+                                       text, "Privacy lock";
+                                       align, 0.0 0.5;
+                               }
+                               color, 77 77 77 255;
                        }
                }
                part {
-                       name, "pad.require.text";
+                       name, "pad.lock.down";
                        type, RECT;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "icon.require";
-                                       relative, 1.0 0.0;
+                                       to, "lock";
+                                       relative, 0.0 1.0;
                                }
                                rel2 {
-                                       to, "icon.require";
-                                       relative, 1.0 0.0;
+                                       to, "lock";
+                                       relative, 0.0 1.0;
                                }
-                               min, 6 0;
-                               align, 0.0 0.0;
+                               min, 0 22;
                                fixed, 1 1;
+                               align, 0.0 0.0;
                                visible, 0;
                        }
                }
                part {
-                       name, "require";
-                       type, TEXT;
+                       name, PART_USER_EDIT_CONTENTS_LOCK;
+                       type, SWALLOW;
                        scale, 1;
                        description {
                                state, "default" 0.0;
                                rel1 {
-                                       to, "pad.require.text";
-                                       relative, 1.0 0.0;
-                               }
-                               rel2 {
-                                       to, "pad.require.text";
-                                       relative, 1.0 0.0;
+                                       to, "pad.lock.down";
+                                       relative, 1.0 1.0;
                                }
-                               min, 418 24;
+                               rel2.to, "pad.lock.down";
+                               min, 104 54;
                                fixed, 1 1;
                                align, 0.0 0.0;
-                               text {
-                                       font, "TizenSans";
-                                       size, 24;
-                                       align, 0.0 0.5;
-                                       text, "Required fields";
-                               }
-                               color, 64 136 211 255;
                        }
                }
+
                part {
                        name, "pad.delete";
                        type, RECT;