From: Eugene Kurzberg Date: Thu, 30 Jun 2016 08:11:26 +0000 (+0300) Subject: Removed temporary background from Log Details, Contact Details and Input views. X-Git-Tag: submit/tizen/20160826.132643~1^2~85 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F77646%2F3;p=profile%2Fmobile%2Fapps%2Fnative%2Fphone-contacts.git Removed temporary background from Log Details, Contact Details and Input views. Fixed some items being selectable in Contact Input view. Change-Id: Ifa0547bf42b0f5e233be9f34963b35ad967a371a Signed-off-by: Eugene Kurzberg --- diff --git a/lib-apps-common/res/apps-common/edje/apps-common-colors.edc b/lib-apps-common/res/apps-common/edje/apps-common-colors.edc index bc74e5e..0d13a6d 100644 --- a/lib-apps-common/res/apps-common/edje/apps-common-colors.edc +++ b/lib-apps-common/res/apps-common/edje/apps-common-colors.edc @@ -46,8 +46,4 @@ color_classes { name: "touch_icon_pressed"; color: 34 104 115 255; } - color_class { - name: "title_bg"; - color: 61 185 204 255; - } } diff --git a/lib-common/res/details/edje/details-item-layout.edc b/lib-common/res/details/edje/details-item-layout.edc index 36af926..b886aac 100644 --- a/lib-common/res/details/edje/details-item-layout.edc +++ b/lib-common/res/details/edje/details-item-layout.edc @@ -40,11 +40,6 @@ collections data.item: "contents" PART_BACK_BTN" "PART_THUMBNAIL; parts { - rect { "rect.bg"; - desc { "default"; - color_class: "title_bg"; - } - } spacer { "spacer.left_top"; scale; desc { "default"; min: BACK_BTN_L BACK_BTN_T; diff --git a/lib-contacts/inc/Contacts/Input/ContactCompoundFieldItem.h b/lib-contacts/inc/Contacts/Input/ContactCompoundFieldItem.h index c4c186e..c5562b1 100644 --- a/lib-contacts/inc/Contacts/Input/ContactCompoundFieldItem.h +++ b/lib-contacts/inc/Contacts/Input/ContactCompoundFieldItem.h @@ -45,7 +45,7 @@ namespace Contacts * @brief Disables auto-expansion. * @see ContactFieldItem::onInserted() */ - virtual void onInserted() override { } + virtual void onInserted() override; /** * @see GenlistItem::onExpanded() diff --git a/lib-contacts/res/input/edje/InputItemLayoutMetrics.h b/lib-contacts/res/input/edje/InputItemLayoutMetrics.h index 299ae35..41f3ecb 100644 --- a/lib-contacts/res/input/edje/InputItemLayoutMetrics.h +++ b/lib-contacts/res/input/edje/InputItemLayoutMetrics.h @@ -19,6 +19,8 @@ #define INPUT_ITEM_LAYOUT_METRICS_H #define ITEM_H 120 +#define ITEM_T 33 +#define ITEM_B 20 #define TYPE_L 32 #define TYPE_W 180 diff --git a/lib-contacts/res/input/edje/input-item-layout.edc b/lib-contacts/res/input/edje/input-item-layout.edc index f13015b..5c500c3 100644 --- a/lib-contacts/res/input/edje/input-item-layout.edc +++ b/lib-contacts/res/input/edje/input-item-layout.edc @@ -42,22 +42,22 @@ collections parts { swallow { "swallow.bg"; } - spacer { "spacer.left"; scale; + spacer { "spacer.left_top"; scale; desc { "default"; - align: 0.0 0.5; + align: 0.0 0.0; rel1.relative: 0.0 0.0; - rel2.relative: 0.0 1.0; + rel2.relative: 0.0 0.0; } desc { "visible"; inherit: "default"; - min: TYPE_L 0; + min: TYPE_L ITEM_T; } } swallow { PART_TYPE; scale; desc { "default"; align: 0.0 0.5; - rel1 { relative: 1.0 0.5; to_x: "spacer.left"; } - rel2 { relative: 1.0 0.5; to_x: "spacer.left"; } + rel1 { relative: 1.0 1.0; to: "spacer.left_top"; } + rel2 { relative: 1.0 0.0; to_x: "spacer.left_top"; to_y: "spacer.right_bottom"; } } desc { "visible"; inherit: "default"; @@ -74,15 +74,15 @@ collections swallow { PART_BUTTON; scale; desc { "default"; align: 1.0 0.5; - rel1 { relative: 0.0 0.5; to_x: "spacer.right"; } - rel2 { relative: 0.0 0.5; to_x: "spacer.right"; } + rel1 { relative: 0.0 0.5; to_x: "spacer.right_bottom"; } + rel2 { relative: 0.0 0.5; to_x: "spacer.right_bottom"; } } } - spacer { "spacer.right"; scale; + spacer { "spacer.right_bottom"; scale; desc { "default"; - align: 1.0 0.5; - min: BUTTON_R 0; - rel1.relative: 1.0 0.0; + align: 1.0 1.0; + min: BUTTON_R ITEM_B; + rel1.relative: 1.0 1.0; rel2.relative: 1.0 1.0; } } @@ -93,14 +93,14 @@ collections source: "elm"; action: STATE_SET "visible" 0.0; target: PART_TYPE; - target: "spacer.left"; + target: "spacer.left_top"; } program { signal: "elm,state,"PART_TYPE",passive"; source: "elm"; action: STATE_SET "default" 0.0; target: PART_TYPE; - target: "spacer.left"; + target: "spacer.left_top"; } } } @@ -140,11 +140,6 @@ collections data.item: "contents" "swallow.content"; parts { - rect { "rect.bg"; scale; - desc { "default"; - color_class: "title_bg"; - } - } spacer { "spacer.base"; scale; desc { "default"; min: 0 IMAGE_ITEM_H; diff --git a/lib-contacts/src/Contacts/Input/ContactCompoundFieldItem.cpp b/lib-contacts/src/Contacts/Input/ContactCompoundFieldItem.cpp index ca10ae8..8b9a21b 100644 --- a/lib-contacts/src/Contacts/Input/ContactCompoundFieldItem.cpp +++ b/lib-contacts/src/Contacts/Input/ContactCompoundFieldItem.cpp @@ -52,6 +52,11 @@ Evas_Object *ContactCompoundFieldItem::getContent(Evas_Object *parent, const cha } } +void ContactCompoundFieldItem::onInserted() +{ + ContactFieldSubItem::onInserted(); +} + void ContactCompoundFieldItem::onExpanded(bool isExpanded) { auto control = static_cast(getFieldControl()); diff --git a/lib-contacts/src/Contacts/Input/InputView.cpp b/lib-contacts/src/Contacts/Input/InputView.cpp index 60074c5..bde61ef 100644 --- a/lib-contacts/src/Contacts/Input/InputView.cpp +++ b/lib-contacts/src/Contacts/Input/InputView.cpp @@ -121,6 +121,7 @@ Evas_Object *InputView::onCreate(Evas_Object *parent) m_AddFieldsItem = new AddFieldsItem(); m_AddFieldsItem->setAddFieldCallback(std::bind(&InputView::onAddField, this, _1)); m_Genlist->insert(m_AddFieldsItem); + elm_genlist_item_select_mode_set(m_AddFieldsItem->getObjectItem(), ELM_OBJECT_SELECT_MODE_NONE); for (unsigned id = FieldBegin; id < FieldEnd; ++id) { if (!isFieldVisible[id] || !m_Contact.getFieldById(id)) {