TizenRefApp-6760 Display Video-attachment in sub-bubble

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

diff --git a/.project b/.project
index 46dfba2..395d27f 100644 (file)
--- a/.project
+++ b/.project
@@ -12,7 +12,6 @@
                </buildCommand>
                <buildCommand>
                        <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-                       <triggers>clean,full,incremental,</triggers>
                        <arguments>
                                <dictionary>
                                        <key>?name?</key>

diff --git a/res/edje/conv_list_bubble.edc b/res/edje/conv_list_bubble.edc
index 9b6ce25..e6260eb 100644 (file)
--- a/res/edje/conv_list_bubble.edc
+++ b/res/edje/conv_list_bubble.edc
@@ -19,6 +19,8 @@ collections {
        image: "messages_bubble_bg_ef.#.png" RAW;
        image: "messages_bubble_bg_search.#.png" RAW;
        image: "messages_bubble_line_draft.#.png" RAW;
+       image: "messages_attach_image_round_line.#.png" RAW;
+       image: "messages_attach_image_round_mask.#.png" RAW;
     }
 
     styles {
@@ -130,10 +132,6 @@ 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";
@@ -147,10 +145,10 @@ collections {
             part {
                 name: "content";
                 type: SWALLOW;
+                scale: 1;
                 clip_to: "masking";
                 description {
                     state: "default" 0.0;
-                    color: 0 0 0 128;
                 }
             }
             part {
@@ -202,9 +200,19 @@ collections {
       }
       parts {
          part {
-            name: "swl.thumbnail";
+             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;
             scale: 1;
+            clip_to: "masking";
             description {
                state: "default" 0.0;
                rel1 {
@@ -216,6 +224,15 @@ collections {
             }
          }
          part {
+             name: "line";
+             type: IMAGE;
+             description {
+                 state: "default" 0.0;
+                 image.normal: "messages_attach_image_round_line.#.png";
+                 color: 0 0 0 51;
+             }
+         }
+         part {
             name: "play_button";
             type: IMAGE;
             scale: 1;
@@ -225,16 +242,37 @@ collections {
                max: 128 128;
                align: 0.5 0.5;
                rel1 {
-                  to: "swl.thumbnail";
+                  to: "content";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to: "swl.thumbnail";
+                  to: "content";
                   relative: 1.0 1.0;
                }
             }
+            description {
+                state: "pressed";
+                inherit: "default";
+                color: 190 190 190 255;
+            }
          }
       }
+      programs {
+           program { name: "pressed";
+               signal: "mouse,down,1";
+               source: "*";
+               action: STATE_SET "pressed" 0.0;
+               transition: LINEAR  0.1;
+               target: "play_button";
+           }
+           program { name: "unpressed";
+               signal: "mouse,up,1";
+               source: "*";
+               action: STATE_SET "default" 0.0;
+               transition: LINEAR  0.1;
+               target: "play_button";
+           }
+       }
    }
 
    group {

diff --git a/src/Conversation/ConvList/View/src/BubbleVideoViewItem.cpp b/src/Conversation/ConvList/View/src/BubbleVideoViewItem.cpp
index 29ef7be..f4570ab 100644 (file)
--- a/src/Conversation/ConvList/View/src/BubbleVideoViewItem.cpp
+++ b/src/Conversation/ConvList/View/src/BubbleVideoViewItem.cpp
@@ -50,6 +50,6 @@ Evas_Object *BubbleVideoViewItem::createLayout(Evas_Object *parent, const std::s
     evas_object_size_hint_min_set(image, imageWidth, imageHeight);
     evas_object_show(image);
 
-    elm_object_part_content_set(layout, "swl.thumbnail", image);
+    elm_object_part_content_set(layout, "content", image);
     return layout;
 }