TizenRefApp-8310 Integrate Subject item to ConvListItem

Change-Id: Iebdeffedfbeb12243ffc4fadaec897ee1886d8a5
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/res/edje/conv_list_bubble.edc b/res/edje/conv_list_bubble.edc
index adec36dcf6d079c54d39855172b2c2d1366197bf..23ff55c981cd025fcbfba31fadcc7ff78b082a4c 100644 (file)
--- a/res/edje/conv_list_bubble.edc
+++ b/res/edje/conv_list_bubble.edc
@@ -135,25 +135,27 @@ collections {
       parts {
          swallow { "text.swl"; scale;
             desc { "default";
-               align: 0 0;
+               rel1.relative: 0 0;
+               rel2.to_y: "pad.bottom";
+               rel2.relative: 1 0;
+               align: 0 1;
             }
          }
          spacer { "pad.bottom"; scale;
             desc { "default";
                min: 0 6;
                max: -1 6;
-               rel1.to_y: "text.swl";
-               rel1.relative: 0 1;
-               align: 0 0;
+               rel2.to_y: "divider";
+               rel2.relative: 1 0;
+               align: 0 1;
             }
          }
          rect { "divider"; scale;
             desc { "default";
                min: MAX_CONTENT_WIDTH 1;
                max: MAX_CONTENT_WIDTH 1;
-               rel1.to_y: "pad.bottom";
-               rel1.relative: 0 1;
-               align: 0 0;
+               rel2.relative: 1 1;
+               align: 0 1;
                color: 0 0 0 68;
             }
          }

diff --git a/src/Common/MsgEngine/src/dummy/MsgConversationItemDummy.cpp b/src/Common/MsgEngine/src/dummy/MsgConversationItemDummy.cpp
index bc7bad3e06d7de791f658cee0aff10500ab4af55..774812460b67f797210870c32e728bce0f599d3a 100644 (file)
--- a/src/Common/MsgEngine/src/dummy/MsgConversationItemDummy.cpp
+++ b/src/Common/MsgEngine/src/dummy/MsgConversationItemDummy.cpp
@@ -52,7 +52,7 @@ std::string MsgConversationItemDummy::getText() const
 
 std::string MsgConversationItemDummy::getSubject() const
 {
-    return "Subject";
+    return fakeMessages[rand() % fakeMessages.size()];
 }
 
 time_t MsgConversationItemDummy::getTime() const

diff --git a/src/Conversation/Controller/inc/BubbleEntityFactory.h b/src/Conversation/Controller/inc/BubbleEntityFactory.h
index 244465044a887ee985cd1cbcea770af73035a37f..023b43ba07df403c3a8ff01a0bbf2190d3a7f71b 100644 (file)
--- a/src/Conversation/Controller/inc/BubbleEntityFactory.h
+++ b/src/Conversation/Controller/inc/BubbleEntityFactory.h
@@ -50,6 +50,7 @@ namespace Msg {
             BubbleRetrieveEntity *createRetrieveEntity(Message::Direction direction);
             BubbleNoContentEntity *createNoContentEntity(Message::Direction direction);
             BubbleEntity *createTextEntityFromFile(std::string filePath, Message::Direction direction);
+            BubbleEntity *createSubjectEntity(const std::string subject, Message::Direction direction);
             BubbleEntity *createVideoEntity(std::string filePath, std::string fileName, Message::Direction direction);
             BubbleEntity *createAudioEntity(std::string filePath, std::string fileName, Message::Direction direction);
             BubbleEntity *createVoiceEntity(std::string filePath, std::string fileName, Message::Direction direction);

diff --git a/src/Conversation/Controller/src/BubbleEntityFactory.cpp b/src/Conversation/Controller/src/BubbleEntityFactory.cpp
index 640f12d30aa7156fcbe95807f6a0d868935d662f..e8150f06b62b9601ba2e2ef42c1e261dfcf20921 100644 (file)
--- a/src/Conversation/Controller/src/BubbleEntityFactory.cpp
+++ b/src/Conversation/Controller/src/BubbleEntityFactory.cpp
@@ -31,6 +31,7 @@
 #include "BubbleAudioEntity.h"
 #include "BubbleVoiceEntity.h"
 #include "BubbleUnknownFileEntity.h"
+#include "BubbleSubjectEntity.h"
 
 #include <algorithm>
 
@@ -64,6 +65,10 @@ std::list<BubbleEntityRef> BubbleEntityFactory::create(const MsgConversationItem
             list.push_back(BubbleEntityRef(entity));
     } else {
         // MMS:
+        auto *subject = createSubjectEntity(item.getSubject(), direct);
+        if (subject)
+            list.push_back(BubbleEntityRef(subject));
+
         const MsgConvMediaList &convList = item.getMediaList();
         int convListLen = convList.getLength();
         for (int i = 0; i < convListLen; ++i) {
@@ -180,3 +185,8 @@ BubbleEntity *BubbleEntityFactory::createTextEntityFromFile(std::string filePath
     return entity;
 }
 
+BubbleEntity *BubbleEntityFactory::createSubjectEntity(const std::string subject, Message::Direction direction)
+{
+    return subject.empty() ? nullptr : new BubbleSubjectEntity(std::move(subject), direction);
+}
+