TSAM-6581 Missing Play icon when send and receive Voice and video

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

diff --git a/Build/makefile.mk b/Build/makefile.mk
index 41e1a00582775d6e811b909f4a6d52167748cb44..17601b7294b22cfdc17cfe953a32b4a7605ab6d2 100644 (file)
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -2,7 +2,7 @@
 # Usege : make -f <proj_root>/Build/makefile -C <proj_root> 
 #
  
-BUILD_SCRIPT_VERSION := 1.2.0
+BUILD_SCRIPT_VERSION := 1.2.1
 
 .PHONY : app_version app_clean build_version
 
@@ -85,7 +85,7 @@ endif
 
 ifneq ($(strip $(USER_LIB_DIRS)),)
 _ENC_USER_LIB_DIRS := $(call ENCODE_4MAKE,$(USER_LIB_DIRS))
-_ENC_USER_LIB_DIRS := $(addprefix -L,$(call $(_ENC_USER_LIB_DIRS))
+_ENC_USER_LIB_DIRS := $(addprefix -L,$(call $(_ENC_USER_LIB_DIRS)))
 LIBPATHS := $(call DECODE_4MAKE,$(_ENC_USER_LIB_DIRS))
 endif
 

diff --git a/inc/Resource.h b/inc/Resource.h
index 630eb1d6a019818aff361b986b0cc477bd87c850..b3b9e9038173709e72b0fc395037e386011f8b6a 100644 (file)
--- a/inc/Resource.h
+++ b/inc/Resource.h
@@ -51,6 +51,7 @@
 #define CONV_LIST_EDJ_PATH               EDJ_PATH"/conv_list.edj"
 #define CONV_LAYOUT_EDJ_PATH             EDJ_PATH"/conv_layout.edj"
 #define CONV_CONTACT_LIST_LAYOUT         EDJ_PATH"/conv_contact_list_layout.edj"
+#define CONV_LIST_ATTACHMENTS            EDJ_PATH"/conv_list_attachments.edj"
 
 
 // Images(res):

diff --git a/project_def.prop b/project_def.prop
index 915b69be030f51b7ac9648ac7ee4cd447637977d..154186d3960f08893249b9c20090d18657198e38 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -60,7 +60,7 @@ USER_EDCS_FONT_DIRS_ABS =
 # EDC Flags
 USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/msg_title.edc res/edje/msg_body.edc res/edje/conv_layout.edc res/edje/bubble_theme.edc res/edje/viewer_layout.edc res/edje/msg_thread.edc res/edje/smil_item.edc res/edje/msg_input_panel.edc res/edje/select_all.edc res/edje/thread_genlist_theme.edc res/edje/recipient_panel.edc res/edje/viewer_player.edc res/edje/conv_list.edc res/edje/viewer_subject_layout.edc res/edje/conv_contact_list_layout.edc res/edje/contact_search.edc res/edje/button_theme.edc res/edje/msg_thumbnail.edc res/edje/images.edc 
+USER_EXT_EDC0_EDCS = res/edje/msg_title.edc res/edje/msg_body.edc res/edje/conv_layout.edc res/edje/bubble_theme.edc res/edje/viewer_layout.edc res/edje/conv_list_attachments.edc res/edje/msg_thread.edc res/edje/smil_item.edc res/edje/msg_input_panel.edc res/edje/select_all.edc res/edje/thread_genlist_theme.edc res/edje/recipient_panel.edc res/edje/viewer_player.edc res/edje/conv_list.edc res/edje/viewer_subject_layout.edc res/edje/conv_contact_list_layout.edc res/edje/contact_search.edc res/edje/button_theme.edc res/edje/msg_thumbnail.edc res/edje/images.edc 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS = edje/images res/images 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = 
 USER_EXT_EDC0_EDCS_SOUND_DIRS = edje/sounds 

diff --git a/res/edje/conv_list_attachments.edc b/res/edje/conv_list_attachments.edc
new file mode 100644 (file)
index 0000000..1891f61
--- /dev/null
+++ b/res/edje/conv_list_attachments.edc
@@ -0,0 +1,97 @@
+#include "macros.inl"
+
+collections {
+    BASE_SCALE;
+group {
+      name: "conv/list/attachments/video_item";
+      images {
+         image: "00_video_play.png" COMP;
+      }
+      parts {
+         PADDING_TOP("padding_top", 0);
+         PADDING_LEFT("padding_left", 5);
+         PADDING_RIGHT("padding_right", 0);
+         PADDING_BOTTOM("padding_bottom", 0);
+         part {
+            name: "rect.bg";
+            type: RECT;
+            scale: 1;
+            mouse_events: 1;
+            repeat_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1{
+                  to_x: "padding_left";
+                  to_y: "padding_top";
+                  relative: 1.0 1.0;
+               }
+               rel2{
+                  to: "rect.thumbnail";
+                  relative: 1.0 1.0;
+               }
+               align: 0.0 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part {
+            name: "rect.thumbnail";
+            type: SPACER;
+            scale: 1;
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               rel1 {
+                  to: "rect.bg";
+                  relative: 0.0 0.0;
+                  offset: 2 2;
+               }
+               rel2 {
+                  to: "swl.thumbnail";
+                  relative: 1.0 1.0;
+                  offset: 1 1;
+               }
+               align: 0.0 0.0;
+            }
+         }
+         part {
+            name: "swl.thumbnail";
+            type: SWALLOW;
+            scale: 1;
+            mouse_events: 1;
+            repeat_events: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 0 0;
+               rel1 {
+                  to: "rect.thumbnail";
+                  relative: 0.0 0.0;
+               }
+               align: 0.0 0.0;
+            }
+         }
+         part {
+            name: "play_button";
+            type: IMAGE;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               image.normal: "00_video_play.png";
+               align: 0.5 0.5;
+               min: 48 48;
+               rel1 {
+                  to: "swl.thumbnail";
+                  relative: 0.5 0.5;
+                  offset: -36 -36;
+               }
+               rel2 {
+                  to: "swl.thumbnail";
+                  relative: 0.5 0.5;
+                  offset: 36 36;
+               }
+            }
+         }
+      }
+   }
+}

diff --git a/src/Conversation/ConvList/View/src/BubbleView.cpp b/src/Conversation/ConvList/View/src/BubbleView.cpp
index 261f1bfb304d564ddf5c5a3d33a09cdfc4de700b..62ca9cb693d4a54f99e914fafa6306fff321dec1 100644 (file)
--- a/src/Conversation/ConvList/View/src/BubbleView.cpp
+++ b/src/Conversation/ConvList/View/src/BubbleView.cpp
@@ -131,7 +131,10 @@ Evas_Object *BubbleView::createImage(const std::string &path)
 
 Evas_Object *BubbleView::createVideo(const std::string &path)
 {
-    Evas_Object *image = elm_image_add(*this);
+    Evas_Object *layout = addLayout(*this, CONV_LIST_ATTACHMENTS, "conv/list/attachments/video_item");
+    evas_object_show(layout);
+
+    Evas_Object *image = elm_image_add(layout);
     elm_image_file_set(image, path.c_str(), nullptr);
     int imageWidth = 0;
     int imageHeight = 0;
@@ -144,7 +147,10 @@ Evas_Object *BubbleView::createVideo(const std::string &path)
     }
     evas_object_size_hint_min_set(image, imageWidth, imageHeight);
     evas_object_show(image);
-    return image;
+
+    elm_object_part_content_set(layout, "swl.thumbnail", image);
+    evas_object_smart_calculate(layout);
+    return layout;
 }
 
 Evas_Object *BubbleView::createDownloadButton()