[Genlist] Apply UX 4.7

1. Add 1text.2icon.10
2. Add lisst subtext 02
3. Fix to bold text

Change-Id: Ic0791b4979b24fd7120f7ae2fa78ba28c9ce8e97

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 8308fc2..d60ed40 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -274,6 +274,9 @@
 #define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR            59 115 182 76
 #define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE      "#3B73B64C"
 
+#define GENLIST_LIST_SUB_TEXT_02_SIZE                       24
+#define GENLIST_LIST_SUB_TEXT_02_COLOR                      194 71 71 255
+
 #define GENLIST_CONTENTS_TEXT_SIZE                          28
 #define GENLIST_CONTENTS_TEXT_COLOR                         128 128 128 255
 #define GENLIST_CONTENTS_TEXT_COLOR_STYLE                   "#808080FF"

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 1a9b3d6..d4d7315 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -2632,7 +2632,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "Tizen:style=Medium"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_LIST_SUB_TEXT_SIZE; \
       text_class: "tizen"; \
    }
@@ -2642,7 +2642,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "Tizen:style=Medium"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_LIST_SUB_TEXT_SIZE; \
       text_class: "tizen"; \
    }
@@ -2665,6 +2665,18 @@
       style: "genlist_style_list_sub_text_settings"; \
    }
 
+// list subtext 02
+#define GENLIST_PARAM_SUBITEM_02 \
+   color: GENLIST_LIST_SUB_TEXT_02_COLOR; \
+   text { \
+      align: 0 0.5; \
+      min: 0 1; \
+      font: "Tizen:style=Bold"; \
+      size: GENLIST_LIST_SUB_TEXT_02_SIZE; \
+      text_class: "tizen"; \
+   }
+
+// Dialogue group - Apps
 #define GENLIST_PARAM_APPS_NAME\
    color: GENLIST_APPS_NAME_COLOR; \
    text { \
@@ -3121,6 +3133,17 @@
       GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB \
    )
 
+#define GENLIST_PART_SUBITEM_02_RTB(NAME, HEIGHT, RIGHT, TOP, BOTTOM) \
+   GENLIST_PART_TEXT(NAME, \
+      GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \
+         min: 0 HEIGHT; \
+         GENLIST_PARAM_TEXT_LIMIT_RT \
+         GENLIST_PARAM_SUBITEM_02 \
+         fixed: 1 0; \
+      ) \
+      GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \
+   )
+
 #define GENLIST_PARAM_LIST_BUBBLE_TEXT \
    color: GENLIST_LIST_BUBBLE_TEXT_COLOR; \
    text { \

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 2dd9b65..1ad72ed 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -2482,7 +2482,7 @@
          GENLIST_PART_ICON_SMALL_RTB("elm.icon.1",
             "elm.padding.text4.left", "elm.padding.top", "elm.text.3")
          GENLIST_PART_PADDING_R("elm.padding.text4.left", "elm.text.4")
-         GENLIST_PART_SUBITEM_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN,
+         GENLIST_PART_SUBITEM_02_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN,
             "elm.padding.right", "elm.padding.top", "elm.text.3")
 
          GENLIST_PART_SUBITEM_LRB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
@@ -2592,8 +2592,11 @@
             description { state: "default" 0.0;
                visible: 0;
             }
+            description { state: "selected" 0.0;
+               visible: 0;
+            }
          }
-         GENLIST_PART_SUBITEM_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN,
+         GENLIST_PART_SUBITEM_02_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN,
             "elm.padding.right", "elm.padding.top", "elm.text.3")
       }
    }
@@ -3584,6 +3587,16 @@
       )
    }
 
+// 2.4.1.22
+   group { GENLIST_NAME("dialogue/1text.2icon.10/default")
+      alias: "elm/layout/dialogue/1text.2icon.10";
+      inherit: "elm/genlist/item/1text.2icon.2/default";
+
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.edit";
+
+      GENLIST_DIALOGUE_INHERIT_BODY(;)
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon.1";  target: "elm.icon.2"; )
+   }
 
 // 2.4.2.1
     group { GENLIST_NAME("dialogue/2text/default")