TizenRefApp-6759 Display image-attachment in sub-bubble

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

diff --git a/edje/images/messages_attach_image_round_line.#.png b/edje/images/messages_attach_image_round_line.#.png
new file mode 100644 (file)
index 0000000..c4a85c4
Binary files /dev/null and b/edje/images/messages_attach_image_round_line.#.png differ

diff --git a/edje/images/messages_attach_image_round_mask.#.png b/edje/images/messages_attach_image_round_mask.#.png
new file mode 100644 (file)
index 0000000..51ebaeb
Binary files /dev/null and b/edje/images/messages_attach_image_round_mask.#.png differ

diff --git a/res/edje/conv_list_bubble.edc b/res/edje/conv_list_bubble.edc
index 4d40312..da3dba0 100644 (file)
--- a/res/edje/conv_list_bubble.edc
+++ b/res/edje/conv_list_bubble.edc
@@ -1,7 +1,5 @@
 #include "macros.inl"
 
-#define COLOR_BLUE_EDC  2 61 132 255
-
 collections {
 
     BASE_SCALE;
@@ -131,6 +129,42 @@ collections {
     }
 
     group {
+        name: "conv/list/image_item";
+        images {
+            image: "messages_attach_image_round_line.#.png" RAW;
+            image: "messages_attach_image_round_mask.#.png" RAW;
+        }
+        parts {
+            part {
+                name: "masking";
+                type: IMAGE;
+                precise_is_inside: 1;
+                description {
+                    state: "default" 0.0;
+                    image.normal: "messages_attach_image_round_mask.#.png";
+                }
+            }
+            part {
+                name: "content";
+                type: SWALLOW;
+                clip_to: "masking";
+                description {
+                    state: "default" 0.0;
+                }
+            }
+            part {
+                name: "line";
+                type: IMAGE;
+                description {
+                    state: "default" 0.0;
+                    image.normal: "messages_attach_image_round_line.#.png";
+                    color: 0 0 0 51;
+                }
+            }
+        }
+    }
+
+    group {
       name: "conv/list/video_item";
       images {
          image: "messages_play_btn.png" COMP;

diff --git a/res/edje/msg_thumbnail.edc b/res/edje/msg_thumbnail.edc
index 09123dc..e2c2344 100644 (file)
--- a/res/edje/msg_thumbnail.edc
+++ b/res/edje/msg_thumbnail.edc
@@ -2,7 +2,7 @@
 group {\
     name: NAME;\
         images {\
-        image: MASK COMP;\
+        image: MASK RAW;\
         }\
     parts {\
         part {\

diff --git a/src/Conversation/ConvList/View/src/BubbleImageViewItem.cpp b/src/Conversation/ConvList/View/src/BubbleImageViewItem.cpp
index 16a96d3..181d065 100644 (file)
--- a/src/Conversation/ConvList/View/src/BubbleImageViewItem.cpp
+++ b/src/Conversation/ConvList/View/src/BubbleImageViewItem.cpp
@@ -16,15 +16,17 @@
  */
 
 #include "BubbleImageViewItem.h"
+#include "Resource.h"
 
 using namespace Msg;
 
 BubbleImageViewItem::BubbleImageViewItem(BubbleEntity &entity, Evas_Object *parent, const std::string &imagePath)
     : BubbleViewItem(entity)
 {
+    setEo(addLayout(parent, CONV_LIST_BUBBLE_EDJ_PATH, "conv/list/image_item"));
+    attachGestureTapLayer(getEo(), getEo());
     Evas_Object *img = createImage(parent, imagePath);
-    attachGestureTapLayer(img, img);
-    setEo(img);
+    setContent(img, "content");
 }
 
 BubbleImageViewItem::~BubbleImageViewItem()