add user icon list and item group

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

diff --git a/edje/view/useredit.edc b/edje/view/useredit.edc
index cebea5b..4fee726 100644 (file)
--- a/edje/view/useredit.edc
+++ b/edje/view/useredit.edc
@@ -138,7 +138,7 @@ group {
                                        relative, 0.0 1.0;
                                }
                                min, 308 0;
-                               fixed, 1 0;
+                               fixed, 1 1;
                                align, 1.0 0.5;
                        }
                }
@@ -154,7 +154,7 @@ group {
                                }
                                rel2.to, "pad.action.btn";
                                min, 308 0;
-                               fixed, 1 0;
+                               fixed, 1 1;
                                align, 0.0 0.5;
                        }
                }
@@ -787,6 +787,19 @@ group {
                        }
                }
                part {
+                       name, "clip";
+                       type, RECT;
+                       description {
+                               state, "default" 0.0;
+                               color, 0 0 0 0;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 255 255 255 255;
+                       }
+               }
+               part {
                        name, PART_USER_EDIT_PHOTO;
                        type, SWALLOW;
                        scale, 1;
@@ -804,6 +817,17 @@ group {
                                fixed, 1 1;
                        }
                }
+               part {
+                       name, PART_USER_EDIT_PHOTO_FOCUS;
+                       type, SWALLOW;
+                       scale, 1;
+                       clip_to, "clip";
+                       description {
+                               state, "default" 0.0;
+                               rel1.to, PART_USER_EDIT_PHOTO;
+                               rel2.to, PART_USER_EDIT_PHOTO;
+                       }
+               }
        }
        programs {
                program {
@@ -811,16 +835,18 @@ group {
                        signal, SIG_FOCUS;
                        source, SRC_PROG;
                        action, STATE_SET "focus" 0.0;
-                       transition, LINEAR 0.5;
+                       transition, LINEAR 0.2;
                        target, "bg.photo";
+                       target, "clip";
                }
                program {
                        name, "sig,unfocus";
                        signal, SIG_UNFOCUS;
                        source, SRC_PROG;
                        action, STATE_SET "default" 0.0;
-                       transition, LINEAR 0.5;
+                       transition, LINEAR 0.2;
                        target, "bg.photo";
+                       target, "clip";
                }
        }
 }
@@ -991,3 +1017,107 @@ group {
                }
        }
 }
+
+group {
+       name, GRP_USER_EDIT_ICON_LIST;
+       parts {
+               part {
+                       name, "bg";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 589 295;
+                               color, 194 194 194 255;
+                       }
+               }
+               part {
+                       name, PART_USER_EDIT_ICON_LIST;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               fixed, 1 1;
+                       }
+               }
+       }
+}
+
+group {
+       name, GRP_USER_EDIT_ICON_LIST_ITEM;
+       parts {
+               part {
+                       name, "bg";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 146 146;
+                               color, 255 255 255 255;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 0 119 246 255;
+                       }
+               }
+               part {
+                       name, "clip";
+                       type, RECT;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               color, 0 0 0 0;
+                       }
+                       description {
+                               state, "focus" 0.0;
+                               inherit, "default" 0.0;
+                               color, 255 255 255 255;
+                       }
+               }
+               part {
+                       name, PART_USER_EDIT_ICON_LIST_ITEM;
+                       type, SWALLOW;
+                       scale, 1;
+                       description {
+                               state, "default" 0.0;
+                               min, 70 70;
+                               rel1.relative, 0.5 0.5;
+                               rel2.relative, 0.5 0.5;
+                               fixed, 1 1;
+                       }
+               }
+               part {
+                       name, PART_USER_EDIT_ICON_LIST_ITEM_FOCUS;
+                       type, SWALLOW;
+                       scale, 1;
+                       clip_to, "clip";
+                       description {
+                               state, "default" 0.0;
+                               rel1.to, PART_USER_EDIT_ICON_LIST_ITEM;
+                               rel2.to, PART_USER_EDIT_ICON_LIST_ITEM;
+                               fixed, 1 1;
+                       }
+               }
+       }
+       programs {
+               program {
+                       name, "sig,focus";
+                       signal, SIG_FOCUS;
+                       source, SRC_PROG;
+                       action, STATE_SET "focus" 0.0;
+                       transition, LINEAR 0.3;
+                       target, "clip";
+                       target, "bg";
+               }
+               program {
+                       name, "sig,unfocus";
+                       signal, SIG_UNFOCUS;
+                       source, SRC_PROG;
+                       action, STATE_SET "default" 0.0;
+                       transition, LINEAR 0.3;
+                       target, "clip";
+                       target, "bg";
+               }
+       }
+}

diff --git a/include/defs.h b/include/defs.h
index 148e6f7..aaf8d47 100644 (file)
--- a/include/defs.h
+++ b/include/defs.h
@@ -41,6 +41,8 @@
 #define GRP_USER_EDIT_PHOTO "group.user.edit.photo"
 #define GRP_USER_EDIT_ENTRY "group.user.edit.entry"
 #define GRP_USER_EDIT_DELETE "group.user.edit.delete"
+#define GRP_USER_EDIT_ICON_LIST "group.user.edit.icon.list"
+#define GRP_USER_EDIT_ICON_LIST_ITEM "group.user.edit.icon.list.item"
 #define GRP_BAR_ITEM "group.bar.item"
 
 #define PART_HOME_MENU_BAR "part.home.menu.bar"
@@ -65,7 +67,11 @@
 #define PART_USER_EDIT_CONTENTS_LOCK "part.user.edit.contents.lock"
 #define PART_USER_EDIT_CONTETNS_DELETE "part.user.edit.contents.delete"
 #define PART_USER_EDIT_PHOTO "part.user.edit.photo"
+#define PART_USER_EDIT_PHOTO_FOCUS "part.user.edit.photo.focus"
 #define PART_USER_EDIT_ENTRY "part.user.edit.entry"
+#define PART_USER_EDIT_ICON_LIST "part.user.edit.icon.list"
+#define PART_USER_EDIT_ICON_LIST_ITEM "part.user.edit.icon.list.item"
+#define PART_USER_EDIT_ICON_LIST_ITEM_FOCUS "part.user.edit.icon.list.item.focus"
 #define PART_BAR_ITEM_BG "part.bar.item.bg"
 #define PART_BAR_ITEM_ICON "part.bar.item.icon"
 #define PART_BAR_ITEM_ICON_FOCUS "part.bar.item.icon.focus"
@@ -108,6 +114,18 @@
 #define IMAGE_USER_ADD_FOCUS IMAGEDIR"/btn_user_add_foc.png"
 #define IMAGE_USER_DEFAULT IMAGEDIR"/ic_user_01_nor.png"
 #define IMAGE_USER_DEFAULT_FOCUS IMAGEDIR"/ic_user_01_foc.png"
+#define IMAGE_USER_DEFAULT_02 IMAGEDIR"/ic_user_02_nor.png"
+#define IMAGE_USER_DEFAULT_02_FOCUS IMAGEDIR"/ic_user_02_foc.png"
+#define IMAGE_USER_DEFAULT_03 IMAGEDIR"/ic_user_03_nor.png"
+#define IMAGE_USER_DEFAULT_03_FOCUS IMAGEDIR"/ic_user_03_foc.png"
+#define IMAGE_USER_DEFAULT_04 IMAGEDIR"/ic_user_04_nor.png"
+#define IMAGE_USER_DEFAULT_04_FOCUS IMAGEDIR"/ic_user_04_foc.png"
+#define IMAGE_USER_DEFAULT_05 IMAGEDIR"/ic_user_05_nor.png"
+#define IMAGE_USER_DEFAULT_05_FOCUS IMAGEDIR"/ic_user_05_foc.png"
+#define IMAGE_USER_DEFAULT_06 IMAGEDIR"/ic_user_06_nor.png"
+#define IMAGE_USER_DEFAULT_06_FOCUS IMAGEDIR"/ic_user_06_foc.png"
+#define IMAGE_USER_DEFAULT_07 IMAGEDIR"/ic_user_07_nor.png"
+#define IMAGE_USER_DEFAULT_07_FOCUS IMAGEDIR"/ic_user_07_foc.png"
 #define IMAGE_USER_CURRENT_DEFAULT IMAGEDIR"/ic_user_profile_current_01_nor.png"
 #define IMAGE_USER_CURRENT_DEFAULT_FOCUS IMAGEDIR"/ic_user_profile_current_01_foc.png"