TizenRefApp-6754 Update icons for Contact and calendar event attachments

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

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

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

diff --git a/inc/Resource.h b/inc/Resource.h
index 2f913129d3b1e8227f0d5022a6529bd450100a9c..00197a3a57bdbcc78921b6deabf8a7f86af4f420 100644 (file)
--- a/inc/Resource.h
+++ b/inc/Resource.h
@@ -28,7 +28,8 @@
 #define ATTACH_IMG                      "attach_icon.png"
 #define ADD_PLUS_ICON                   "core_button_add.png"
 #define ATTACH_MUSIC_ICON               "messages_attach_ic_music.png"
-#define ATTACH_CAL_ICON                 "U01_icon_vcs.png"
+#define ATTACH_CAL_ICON                 "messages_attach_ic_calendar.png"
+#define ATTACH_CONTACT_ICON             "messages_attach_ic_contact.png"
 #define ATTACH_UNKNOWN_ICON             "U01_icon_etc.png"
 
 // Edj:

diff --git a/res/edje/conv_list_attachments.edc b/res/edje/conv_list_attachments.edc
index 203f14d13deb160ed297039a91c6e1e7ec639b91..01c2c3e67421f39a8d004b6091c37b326f41aa1c 100644 (file)
--- a/res/edje/conv_list_attachments.edc
+++ b/res/edje/conv_list_attachments.edc
@@ -8,7 +8,7 @@ collections {
     styles {
         style {
             name: "main_text_style";
-            base: "font=Tizen:style=Roman font_size="32" color=#000000 left_margin=1 right_margin=2 wrap=mixed ellipsis=1 align=left";
+            base: "font=Samsung Condensed:style=Latin font_size="32" color=#000000 left_margin=1 right_margin=2 wrap=mixed ellipsis=1 align=left";
             tag:  "tab" "\t";
             tag:  "em" "+ font=Tizen:style=Oblique";
             tag:  "b" "+ font=Tizen:style=Bold";
@@ -18,7 +18,7 @@ collections {
         }
         style {
             name: "sub_text_style";
-            base: "font=Tizen:style=Roman font_size="30" color=#000000 left_margin=1 right_margin=2 wrap=mixed ellipsis=1 align=left";
+            base: "font=Samsung Condensed:style=Latin font_size="28" color=#000000 left_margin=1 right_margin=2 wrap=mixed ellipsis=1 align=left";
             tag:  "tab" "\t";
             tag:  "em" "+ font=Tizen:style=Oblique";
             tag:  "b" "+ font=Tizen:style=Bold";
@@ -78,7 +78,7 @@ collections {
         name: "conv/list/1icon_2text_attachment";
         inherit: "conv/list/1icon_1text_attachment";
         parts {
-            PADDING_TOP("padding.top", 10);
+            PADDING_TOP("padding.top", 0);
             PADDING_BOTTOM("padding.bottom", 16);
             part {
                 name: "main.text";

diff --git a/res/edje/images.edc b/res/edje/images.edc
index 4f0811f67ffbfbc27a7f8b8c0b0dce9dc3ce629e..3c737604186efdc2e3a9d11cf9aacd23df11aaa4 100755 (executable)
--- a/res/edje/images.edc
+++ b/res/edje/images.edc
@@ -11,7 +11,6 @@ collections {
        RESOURCE_IMAGE("M01_icon_message_status_sms_unread_n.png");
        RESOURCE_IMAGE("M01_icon_composer.png");
        RESOURCE_IMAGE("masking_message_list.png");
-       RESOURCE_IMAGE("U01_icon_etc.png");
        RESOURCE_IMAGE("U01_icon_excel.png");
        RESOURCE_IMAGE("U01_icon_html.png");
        RESOURCE_IMAGE("U01_list_icon_image.png");
@@ -21,7 +20,6 @@ collections {
        RESOURCE_IMAGE("U01_icon_ppt.png");
        RESOURCE_IMAGE("U01_icon_rss.png");
        RESOURCE_IMAGE("U01_icon_vcf.png");
-       RESOURCE_IMAGE("U01_icon_vcs.png");
        RESOURCE_IMAGE("U01_icon_svg.png");
        RESOURCE_IMAGE("U01_icon_swf.png");
        RESOURCE_IMAGE("U01_icon_text.png");
@@ -76,8 +74,10 @@ collections {
        RESOURCE_IMAGE("badge_icon_draft_pencil.png");
        RESOURCE_IMAGE("icon_soft_search_back.png");
        RESOURCE_IMAGE("list_ic_user_thumb_masking.png");
-
-       RESOURCE_IMAGE_COLOR("messages_attach_ic_music.png", 250 250 250 255);
+       RESOURCE_IMAGE("messages_attach_ic_music.png");
+       RESOURCE_IMAGE("messages_attach_ic_calendar.png");
+    RESOURCE_IMAGE("messages_attach_ic_contact.png");
+    RESOURCE_IMAGE("U01_icon_etc.png");
 
        RESOURCE_OVERLAP_IMAGE("title/thumb/contact", "title_thumbnail_image_bg.png", 255, 255, 255, 255, "title_thumbnail_image.png", 2, 61, 132, 255);
        RESOURCE_OVERLAP_IMAGE("title/thumb/group", "title_thumbnail_image_bg.png", 255, 255, 255, 255, "title_thumbnail_image_group.png", 2, 61, 132, 255);

diff --git a/src/Conversation/ConvList/Controller/src/BubbleContactEntity.cpp b/src/Conversation/ConvList/Controller/src/BubbleContactEntity.cpp
index f7f4d5c216c9d854e233124affbaa1786e3e928b..90505e6597afa4204d2ceebc8a0cbbf3696085e3 100644 (file)
--- a/src/Conversation/ConvList/Controller/src/BubbleContactEntity.cpp
+++ b/src/Conversation/ConvList/Controller/src/BubbleContactEntity.cpp
@@ -58,17 +58,8 @@ BubbleContactViewItem *BubbleContactEntity::createView(Evas_Object *parent)
     auto *item = new BubbleContactViewItem(*this, parent, type);
     item->setMainText(m_Name);
 
-    Evas_Object *thumb = nullptr;
-    if(m_ThumbPath.empty())
-    {
-        ThumbId id = m_ThumbMaker.getThumbId(ThumbnailMaker::SingleThumb);
-        thumb = m_ThumbMaker.getThumb(*item, id, BubbleContactViewItem::iconSize);
-    }
-    else
-    {
-        thumb = m_ThumbMaker.getThumb(*item, m_ThumbPath, BubbleContactViewItem::iconSize);
-    }
-
+    Evas_Object *thumb = m_ThumbPath.empty() ? BubbleContactViewItem::createIcon(*item, ATTACH_CONTACT_ICON)
+                                             : m_ThumbMaker.getThumb(*item, m_ThumbPath, BubbleContactViewItem::iconSize);
     if(thumb)
         item->setIcon(thumb);
     if(!m_Address.empty())