TizenRefApp-6487 Message Sending Icon Misplaced

Change-Id: Ic64f09b8382c6122a78683951d1f6a66f594e222
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/res/edje/conv_genlist_theme.edc b/res/edje/conv_genlist_theme.edc
index 45ce2f784f5825aa05fb2ff9d282b2ad8f922636..528cd0b53f6cc3206ebfe86f5568fa01b689660e 100755 (executable)
--- a/res/edje/conv_genlist_theme.edc
+++ b/res/edje/conv_genlist_theme.edc
@@ -18,10 +18,9 @@
 #define BUBBLE_INFO_THUMB_HEIGHT 80
 #define BUBBLE_INFO_THUMB_WIDTH 80
 #define BUBBLE_INFO_THUMB_PAD_WIDTH 13
-#define BUBBLE_INFO_PAD_TOP_HEIGHT 9
+#define BUBBLE_INFO_PAD_RIGHT_WIDTH 20
 #define BUBBLE_INFO_STATUS_HEIGHT 44
 #define BUBBLE_INFO_STATUS_WIDTH 44
-#define BUBBLE_INFO_STATUS_PAD_WIDTH 4
 #define BUBBLE_INFO_TEXT_HEIGHT 38
 #define BUBBLE_DRAFT_PAD_WIDTH 74
 #define BUBBLE_DRAFT_BUTTON_PAD_WIDTH 26
@@ -30,6 +29,7 @@
 #define BUBBLE_DRAFT_BUTTON_HEIGHT 56
 #define BUBBLE_FAILED_BUTTON_WIDTH 56
 #define BUBBLE_FAILED_BUTTON_HEIGHT 56
+#define BUBBLE_INFO_PAD_TOP_HEIGHT 6
 
 #define BUBBLE_BG_COLOR 90 111 199 64
 
@@ -93,7 +93,7 @@ group { name: "elm/genlist/item/sentbubble/default";
 
     data.item: "banded_bg_area" "elm.swallow.bg";
     data.item: "texts" "info.time msg.type";
-    data.item: "contents" "bubble.content info.status info.status1 bubble.check";
+    data.item: "contents" "bubble.content bubble.check info.status";
     parts{
         spacer { "base"; scale; mouse;
             desc { "default";
@@ -118,58 +118,50 @@ group { name: "elm/genlist/item/sentbubble/default";
                 fixed: 0 1;
             }
         }
-        spacer { "info.pad.top"; scale;
+        swallow { "info.status.pad"; scale;
             desc { "default"
-                min: 0 BUBBLE_INFO_PAD_TOP_HEIGHT;
-                max: -1 BUBBLE_INFO_PAD_TOP_HEIGHT;
-                align: 0.0 0.0;
-                rel1.to: "info.pad";
-                fixed: 0 1;
+                min: BUBBLE_INFO_PAD_RIGHT_WIDTH 0;
+                max: BUBBLE_INFO_PAD_RIGHT_WIDTH -1;
+                rel1.to_y: "bubble.content";
+                rel1.relative: 0.0 0.0;
+                rel2.to: "bubble.content";
+                rel2.relative: 0.0 1.0;
+                fixed: 1 0;
+                align: 1.0 0.0;
             }
         }
         swallow { "info.status"; scale;
             desc { "default";
                 min: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
                 max: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
-                align: 1.0 0.0;
-                rel1.to_y: "info.pad.top";
-                rel1.relative: 0.0 1.0;
-                rel2.to_x: "info.pad";
+                align: 1.0 0.5;
+                rel1.to_y: "info.status.pad";
+                rel1.relative: 0.0 0.0;
+                rel2.to: "info.status.pad";
                 rel2.relative: 0.0 1.0;
                 fixed: 1 1;
             }
         }
-        spacer { "info.status.pad"; scale;
-            desc { "default"
-                min: BUBBLE_INFO_STATUS_PAD_WIDTH 0;
-                max: BUBBLE_INFO_STATUS_PAD_WIDTH -1;
-                align: 1.0 0.0;
-                rel2.to_x: "info.status";
-                rel2.relative: 0.0 1.0;
-                fixed: 1 0;
-            }
-        }
-        swallow { "info.status1"; scale;
+        spacer { "info.pad.top"; scale;
             desc { "default";
-                min: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
-                max: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
-                align: 1.0 0.0;
-                rel1.to_y: "info.pad.top";
-                rel1.relative: 0.0 1.0;
-                rel2.to_x: "info.status.pad";
-                rel2.relative: 0.0 1.0;
-                fixed: 1 1;
+                min: 0 BUBBLE_INFO_PAD_TOP_HEIGHT;
+                max: -1 BUBBLE_INFO_PAD_TOP_HEIGHT;
+                align: 0.0 1.0;
+                rel1.relative: 0.0 0.0;
+                rel2.to: "bubble.content";
+                rel2.relative: 1.0 0.0;
+                fixed: 0 1;
             }
         }
         textblock { "msg.type"; scale;
             desc { "default";
-                align: 1.0 0.0;
+                align: 1.0 1.0;
                 rel1.to_x: "bubble.pad.right";
                 rel2.to_x: "bubble.pad.right";
-                rel1.to_y: "info.status";
-                rel2.to_y: "info.status";
-                rel1.relative: 1.0 1.0;
-                rel2.relative: 1.0 1.0;
+                rel1.to_y: "info.pad.top";
+                rel2.to_y: "info.pad.top";
+                rel1.relative: 1.0 0.0;
+                rel2.relative: 1.0 0.0;
                 text{
                     style: "entry_bubble_sent_textblock_style";
                     min: 1 1;
@@ -195,10 +187,10 @@ group { name: "elm/genlist/item/sentbubble/default";
                 align: 1.0 0.0;
                 rel1.to_x: "msg.type.pad";
                 rel2.to_x: "msg.type.pad";
-                rel1.to_y: "info.status";
-                rel2.to_y: "info.status";
-                rel1.relative: 0.0 1.0;
-                rel2.relative: 0.0 1.0;
+                rel1.to_y: "msg.type";
+                rel2.to_y: "msg.type";
+                rel1.relative: 0.0 0.0;
+                rel2.relative: 0.0 0.0;
                 text{
                     style: "entry_bubble_sent_textblock_style";
                     min: 1 1;
@@ -373,7 +365,7 @@ group { name: "elm/genlist/item/draft/default";
     alias: "elm/genlist/item_compress/draft/default";
     inherit: "elm/genlist/item/sentbubble/default";
 
-    data.item: "contents" "bubble.content info.status info.status1 bubble.check draft.button";
+    data.item: "contents" "bubble.content info.status bubble.check draft.button";
 
     parts {
         spacer { "bubble.pad.right"; scale;
@@ -417,7 +409,7 @@ group { name: "elm/genlist/item/failed/default";
     alias: "elm/genlist/item_compress/failed/default";
     inherit: "elm/genlist/item/draft/default";
     part_remove: "draft.button";
-    data.item: "contents" "bubble.content info.status info.status1 bubble.check failed.button";
+    data.item: "contents" "bubble.content info.status bubble.check failed.button";
 
     parts {
         swallow { "failed.button"; scale;
@@ -435,7 +427,7 @@ group { name: "elm/genlist/item/failed/default";
 group { name: "elm/genlist/item/receivebubble/default";
     alias: "elm/genlist/item_compress/receivebubble/default";
     inherit: "elm/genlist/item/sentbubble/default";
-    data.item: "contents" "bubble.content info.thumbnail info.status info.status1 bubble.check";
+    data.item: "contents" "bubble.content info.thumbnail bubble.check";
 
     parts {
         swallow { "info.thumbnail"; scale;
@@ -459,39 +451,27 @@ group { name: "elm/genlist/item/receivebubble/default";
                 fixed: 1 0;
             }
         }
-        swallow { "info.status"; scale;
+        textblock { "msg.type"; scale;
             desc { "default";
                 align: 0.0 0.0;
-                rel1.to_y: "info.pad.top";
-                rel1.to_x: "info.thumb.pad";
-                rel1.relative: 1.0 1.0;
-                rel2.to: "";
-            }
-        }
-        spacer { "info.status.pad"; scale;
-            desc { "default"
-                align: 0.0 0.0;
-                rel1.to_x: "info.status";
+                rel1.to_x: "msg.type.pad";
+                rel2.to_x: "msg.type.pad";
+                rel1.to_y: "info.time";
+                rel2.to_y: "info.time";
                 rel1.relative: 1.0 0.0;
-                rel2.to: "";
-            }
-        }
-        swallow { "info.status1"; scale;
-            desc { "default";
-                align: 0.0 0.0;
-                rel1.to_y: "info.pad.top";
-                rel1.to_x: "info.status.pad";
-                rel1.relative: 1.0 1.0;
-                rel2.to: "";
+                rel2.relative: 1.0 1.0;
+                text.style: "entry_bubble_receive_textblock_style";
             }
         }
         textblock { "info.time"; scale;
             desc { "default";
-                align: 0.0 0.0;
+                align: 0.0 1.0;
+                rel1.to_y: "info.pad.top";
+                rel2.to_y: "info.pad.top";
                 rel1.to_x: "info.thumb.pad";
-                rel1.relative: 1.0 1.0;
                 rel2.to_x: "info.thumb.pad";
-                rel2.relative: 1.0 1.0;
+                rel1.relative: 1.0 0.0;
+                rel2.relative: 1.0 0.0;
                 text.style: "entry_bubble_receive_textblock_style";
             }
         }
@@ -507,18 +487,6 @@ group { name: "elm/genlist/item/receivebubble/default";
                 fixed: 1 1;
             }
         }
-        textblock { "msg.type"; scale;
-            desc { "default";
-                align: 0.0 0.0;
-                rel1.to_x: "msg.type.pad";
-                rel2.to_x: "msg.type.pad";
-                rel1.to_y: "info.time";
-                rel2.to_y: "info.time";
-                rel1.relative: 1.0 0.0;
-                rel2.relative: 1.0 1.0;
-                text.style: "entry_bubble_receive_textblock_style";
-            }
-        }
         spacer { "pad.left"; scale;
             desc { "default";
                 max: BUBBLE_PAD_LEFT_WIDTH -1;