TizenRefApp-5908 Implement show of number/email/company when contact doesn't have...

Change-Id: Ie4ae0aca1bfeafb1664f25e0e4af035f8a99a6ac
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-contact/inc/Contacts/Details/BasicInfoItem.h b/lib-contact/inc/Contacts/Details/BasicInfoItem.h
index bd3c821..b81eaf2 100644 (file)
--- a/lib-contact/inc/Contacts/Details/BasicInfoItem.h
+++ b/lib-contact/inc/Contacts/Details/BasicInfoItem.h
@@ -104,7 +104,7 @@ namespace Contacts
                        Model::ContactObject &m_Image;
                        Model::ContactTextField &m_ImagePath;
 
-                       Model::ContactCompoundObject &m_Name;
+                       Model::ContactTextField &m_Name;
                        Model::ContactCompoundObject &m_PhoneticName;
 
                        Model::ContactObject &m_Company;

diff --git a/lib-contact/inc/Contacts/Model/ContactFields.h b/lib-contact/inc/Contacts/Model/ContactFields.h
index 9bce6a1..924b8b2 100644 (file)
--- a/lib-contact/inc/Contacts/Model/ContactFields.h
+++ b/lib-contact/inc/Contacts/Model/ContactFields.h
@@ -29,6 +29,7 @@ namespace Contacts
                {
                        FieldBegin,
                        FieldFavorite = FieldBegin,
+                       FieldDisplayName,
                        FieldImage,
                        FieldName,
                        FieldPhoneticName,

diff --git a/lib-contact/src/Contacts/Common/Strings.cpp b/lib-contact/src/Contacts/Common/Strings.cpp
index e6e3332..2553667 100644 (file)
--- a/lib-contact/src/Contacts/Common/Strings.cpp
+++ b/lib-contact/src/Contacts/Common/Strings.cpp
@@ -25,6 +25,7 @@ namespace
 {
        const char *fieldNames[] = {
                /* [FieldFavorite]     = */ nullptr,
+               /* [FieldDisplayName]  = */ nullptr,
                /* [FieldImage]        = */ "IDS_PB_BODY_PHOTO",
                /* [FieldName]         = */ "IDS_PB_BODY_NAME",
                /* [FieldPhoneticName] = */ "IDS_PB_BODY_PHONETIC_NAME_ABB",
@@ -42,6 +43,7 @@ namespace
 
        const char *childFieldNames[] = {
                /* [FieldFavorite]     = */ nullptr,
+               /* [FieldDisplayName]  = */ nullptr,
                /* [FieldImage]        = */ "IDS_PB_BODY_IMAGE",
                /* [FieldName]         = */ "IDS_PB_BODY_NAME",
                /* [FieldPhoneticName] = */ "IDS_PB_BODY_PHONETIC_NAME_ABB",

diff --git a/lib-contact/src/Contacts/Details/BasicInfoItem.cpp b/lib-contact/src/Contacts/Details/BasicInfoItem.cpp
index f3120d1..6ff0f6d 100644 (file)
--- a/lib-contact/src/Contacts/Details/BasicInfoItem.cpp
+++ b/lib-contact/src/Contacts/Details/BasicInfoItem.cpp
@@ -38,7 +38,7 @@ BasicInfoItem::BasicInfoItem(Contact &contact)
          m_Image       (contact.getFieldById(FieldImage)->cast<ContactObject>()),
          m_ImagePath   (m_Image.getField(0)->cast<ContactTextField>()),
 
-         m_Name        (contact.getFieldById(FieldName)->cast<ContactCompoundObject>()),
+         m_Name        (contact.getFieldById(FieldDisplayName)->cast<ContactTextField>()),
          m_PhoneticName(contact.getFieldById(FieldPhoneticName)->cast<ContactCompoundObject>()),
 
          m_Company     (contact.getFieldById(FieldCompany)->cast<ContactObject>()),
@@ -71,7 +71,7 @@ Elm_Genlist_Item_Class *BasicInfoItem::getItemClass() const
 char *BasicInfoItem::getText(Evas_Object *parent, const char *part)
 {
        if (strcmp(part, PART_NAME) == 0) {
-               return strdup(m_Name.getValue().c_str());
+               return strdup(m_Name.getValue());
        } else if (strcmp(part, PART_PHONETIC_NAME) == 0) {
                return strdup(m_PhoneticName.getValue().c_str());
        } else if (strcmp(part, PART_COMPANY) == 0) {

diff --git a/lib-contact/src/Contacts/Details/DetailsView.cpp b/lib-contact/src/Contacts/Details/DetailsView.cpp
index 5592dae..48e786b 100644 (file)
--- a/lib-contact/src/Contacts/Details/DetailsView.cpp
+++ b/lib-contact/src/Contacts/Details/DetailsView.cpp
@@ -46,6 +46,7 @@ namespace
 {
        bool isFieldVisible[] = {
                /* [FieldFavorite]     = */ false,
+               /* [FieldDisplayName]  = */ false,
                /* [FieldImage]        = */ false,
                /* [FieldName]         = */ false,
                /* [FieldPhoneticName] = */ false,

diff --git a/lib-contact/src/Contacts/Input/InputView.cpp b/lib-contact/src/Contacts/Input/InputView.cpp
index 81387c7..afb882a 100644 (file)
--- a/lib-contact/src/Contacts/Input/InputView.cpp
+++ b/lib-contact/src/Contacts/Input/InputView.cpp
@@ -44,6 +44,7 @@ namespace
 {
        bool isFieldVisible[] = {
                /* [FieldFavorite]     = */ false,
+               /* [FieldDisplayName]  = */ false,
                /* [FieldImage]        = */ true,
                /* [FieldName]         = */ true,
                /* [FieldPhoneticName] = */ true,

diff --git a/lib-contact/src/Contacts/Model/ContactFieldMetadata.cpp b/lib-contact/src/Contacts/Model/ContactFieldMetadata.cpp
index 68387df..0a001d4 100644 (file)
--- a/lib-contact/src/Contacts/Model/ContactFieldMetadata.cpp
+++ b/lib-contact/src/Contacts/Model/ContactFieldMetadata.cpp
@@ -313,7 +313,8 @@ const ContactArrayMetadata contactMsgs = {
 
 /****************************** Contact Object ********************************/
 const ContactFieldMetadata contactFields[] = {
-       { FieldFavorite,     _contacts_contact.is_favorite,  false, UPCAST(&contactBool) },
+       { FieldFavorite,     _contacts_contact.is_favorite,  false, &contactBool },
+       { FieldDisplayName,  _contacts_contact.display_name, false, &contactRegularText },
        { FieldImage,        _contacts_contact.image,        false, UPCAST(&contactImage) },
        { FieldName,         _contacts_contact.name,         true,  UPCAST(&contactName) },
        { FieldPhoneticName, _contacts_contact.name,         false, UPCAST(&contactPhName) },
@@ -336,6 +337,7 @@ const ContactFieldMetadata contact = { 0, 0, true, UPCAST(&contactObject) };
 
 /****************************** My Profile Object *****************************/
 const ContactFieldMetadata myProfileFields[] = {
+       { FieldDisplayName,  _contacts_my_profile.display_name, false, &contactRegularText },
        { FieldImage,        _contacts_my_profile.image,        false, UPCAST(&contactImage) },
        { FieldName,         _contacts_my_profile.name,         true,  UPCAST(&contactName) },
        { FieldPhoneticName, _contacts_my_profile.name,         false, UPCAST(&contactPhName) },