From 215ee6b7d97412f329cdbe7a53c81a736e3912a9 Mon Sep 17 00:00:00 2001
From: Nataliia Kamyshna <n.kamyshna@samsung.com>
Date: Thu, 25 Feb 2016 12:49:26 +0200
Subject: [PATCH] TizenRefApp-5766 Extract common code from
 DETAILS_ITEM_LAYOUT_EDJ theme and move to common library TizenRefApp-5767
 Integrate CONTACT_DETAILS_ITEM_LAYOUT_EDJ theme with Contacts/BasicInfoItem

Change-Id: Iac9420a4c944ddf9502c6015c1eeab539c05ab3e
Signed-off-by: Nataliia Kamyshna <n.kamyshna@samsung.com>
---
 lib-common/.cproject                               |  15 +--
 lib-common/CMakeLists.txt                          |   4 +-
 lib-common/res/common/edje/dummy.edc               |   3 -
 lib-common/res/{common => details}/CMakeLists.txt  |   4 +-
 lib-common/res/details/edje/DetailsItemLayout.h    |  28 +++++
 .../res/details/edje/DetailsItemLayoutMetrics.h    |   6 -
 .../res/details/edje/details-item-layout.edc       | 137 +++++++++++++++++++++
 lib-contact/.cproject                              |  17 +--
 lib-contact/CMakeLists.txt                         |   2 +-
 lib-contact/res/details/CMakeLists.txt             |   2 +-
 ...ilsItemLayout.h => ContactsDetailsItemLayout.h} |  14 +--
 .../edje/ContactsDetailsItemLayoutMetrics.h        |  29 +++++
 .../edje/{DetailsPath.h => ContactsDetailsPath.h}  |   8 +-
 ...layout.edc => contacts-details-item-layout.edc} | 103 ++--------------
 .../src/Contacts/Details/ActionFieldItem.cpp       |   4 +-
 lib-contact/src/Contacts/Details/BasicInfoItem.cpp |   4 +-
 lib-contact/src/Contacts/Details/DetailsView.cpp   |   2 +-
 packaging/org.tizen.contacts.spec                  |   1 -
 18 files changed, 234 insertions(+), 149 deletions(-)
 delete mode 100644 lib-common/res/common/edje/dummy.edc
 rename lib-common/res/{common => details}/CMakeLists.txt (81%)
 create mode 100644 lib-common/res/details/edje/DetailsItemLayout.h
 rename {lib-contact => lib-common}/res/details/edje/DetailsItemLayoutMetrics.h (89%)
 create mode 100644 lib-common/res/details/edje/details-item-layout.edc
 rename lib-contact/res/details/edje/{DetailsItemLayout.h => ContactsDetailsItemLayout.h} (75%)
 create mode 100644 lib-contact/res/details/edje/ContactsDetailsItemLayoutMetrics.h
 rename lib-contact/res/details/edje/{DetailsPath.h => ContactsDetailsPath.h} (84%)
 rename lib-contact/res/details/edje/{details-item-layout.edc => contacts-details-item-layout.edc} (63%)

diff --git a/lib-common/.cproject b/lib-common/.cproject
index faca374..1ff4b07 100644
--- a/lib-common/.cproject
+++ b/lib-common/.cproject
@@ -5,18 +5,17 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.tizen.nativecore.config.sbi.gcc45.so.debug.119020880" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.tizen.nativecore.NativeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="so" artifactName="common" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.debug.119020880" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.so.debug">
+				<configuration artifactExtension="so" artifactName="common" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.debug.119020880" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.so.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.so.debug.119020880." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.so.debug.2051485246" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.so.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.589094415" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -118,7 +117,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-apps-common/inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-common/res/common/edje}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-common/res/details/edje}&quot;"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks.core.1624823287" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs">
 									<listOptionValue builtIn="false" value="Native_API"/>
@@ -155,7 +154,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
@@ -285,18 +283,17 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.tizen.nativecore.config.sbi.gcc45.so.release.1726378043" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.tizen.nativecore.NativeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="so" artifactName="org.tizen.apps-common" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.release.1726378043" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.so.release">
+				<configuration artifactExtension="so" artifactName="org.tizen.apps-common" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.release.1726378043" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.so.release">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.so.release.1726378043." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.so.release.479052506" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.so.release">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1018798881" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -329,7 +326,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
@@ -430,7 +426,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
diff --git a/lib-common/CMakeLists.txt b/lib-common/CMakeLists.txt
index 581b705..c2e8b1c 100644
--- a/lib-common/CMakeLists.txt
+++ b/lib-common/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB_RECURSE SOURCES src/*.cpp)
 include_directories(
 	${CMAKE_SOURCE_DIR}/lib-apps-common/inc
 	${CMAKE_CURRENT_SOURCE_DIR}/inc
-	${CMAKE_CURRENT_SOURCE_DIR}/res/common/edje
+	${CMAKE_CURRENT_SOURCE_DIR}/res/details/edje
 )
 
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
@@ -13,4 +13,4 @@ target_link_libraries(${PROJECT_NAME} ${LIBRARIES} apps-common)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_DIR})
 
-add_subdirectory(res/common)
+add_subdirectory(res/details)
diff --git a/lib-common/res/common/edje/dummy.edc b/lib-common/res/common/edje/dummy.edc
deleted file mode 100644
index 824c7f6..0000000
--- a/lib-common/res/common/edje/dummy.edc
+++ /dev/null
@@ -1,3 +0,0 @@
-collections {
-	base_scale: 2.8;
-}
diff --git a/lib-common/res/common/CMakeLists.txt b/lib-common/res/details/CMakeLists.txt
similarity index 81%
rename from lib-common/res/common/CMakeLists.txt
rename to lib-common/res/details/CMakeLists.txt
index 09cc0cc..6a70084 100644
--- a/lib-common/res/common/CMakeLists.txt
+++ b/lib-common/res/details/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(EDCFILES dummy.edc)
-set(EDJDIR "${RES_DIR}/common/edje")
+set(EDCFILES details-item-layout.edc)
+set(EDJDIR "${RES_DIR}/details/edje")
 
 foreach(EDCFILE ${EDCFILES})
 	get_filename_component(EDJFILE ${EDCFILE} NAME_WE)
diff --git a/lib-common/res/details/edje/DetailsItemLayout.h b/lib-common/res/details/edje/DetailsItemLayout.h
new file mode 100644
index 0000000..a407777
--- /dev/null
+++ b/lib-common/res/details/edje/DetailsItemLayout.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef DETAILS_ITEM_LAYOUT_H
+#define DETAILS_ITEM_LAYOUT_H
+
+#define DETAILS_ITEM_STYLE      "details_item"
+
+#define PART_BACK_BTN           "swallow.back"
+#define PART_THUMBNAIL          "swallow.thumbnail"
+
+#define PART_NAME               "text.name"
+
+#endif /* DETAILS_ITEM_LAYOUT_H */
diff --git a/lib-contact/res/details/edje/DetailsItemLayoutMetrics.h b/lib-common/res/details/edje/DetailsItemLayoutMetrics.h
similarity index 89%
rename from lib-contact/res/details/edje/DetailsItemLayoutMetrics.h
rename to lib-common/res/details/edje/DetailsItemLayoutMetrics.h
index 3c771b8..b879b72 100644
--- a/lib-contact/res/details/edje/DetailsItemLayoutMetrics.h
+++ b/lib-common/res/details/edje/DetailsItemLayoutMetrics.h
@@ -34,10 +34,4 @@
 #define NAME_H 76
 #define NAME_TEXT_SIZE 56
 
-#define PHONETIC_NAME_H 48
-#define PHONETIC_NAME_TEXT_SIZE 36
-
-#define COMPANY_H 48
-#define COMPANY_TEXT_SIZE 36
-
 #endif /* DETAILS_ITEM_LAYOUT_METRICS_H */
diff --git a/lib-common/res/details/edje/details-item-layout.edc b/lib-common/res/details/edje/details-item-layout.edc
new file mode 100644
index 0000000..3d204f1
--- /dev/null
+++ b/lib-common/res/details/edje/details-item-layout.edc
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "DetailsItemLayout.h"
+#include "DetailsItemLayoutMetrics.h"
+
+styles {
+	style {
+		name: "name_style";
+		base: "font=Tizen:style=Light font_size="NAME_TEXT_SIZE" align=center wrap=mixed color=#fafafa ellipsis=1.0";
+	}
+}
+
+collections
+{
+	base_scale: 2.6;
+
+	group {
+		name: "elm/genlist/item/"DETAILS_ITEM_STYLE"/default";
+		alias: "elm/genlist/item_compress/"DETAILS_ITEM_STYLE"/default";
+		alias: "elm/genlist/tree/"DETAILS_ITEM_STYLE"/default";
+		alias: "elm/genlist/tree_compress/"DETAILS_ITEM_STYLE"/default";
+
+		data.item: "texts" PART_NAME;
+		data.item: "contents" PART_BACK_BTN" "PART_THUMBNAIL;
+
+		parts {
+			spacer { "spacer.top"; scale;
+				desc { "default";
+					min: 0 PAD_T;
+					align: 0.5 0.0;
+					rel1.relative: 0.0 0.0;
+					rel2.relative: 1.0 0.0;
+				}
+			}
+			spacer { "spacer.left"; scale;
+				desc { "default";
+					min: PAD_L 0;
+					align: 0.0 0.5;
+					rel1.relative: 0.0 0.0;
+					rel2.relative: 0.0 1.0;
+				}
+			}
+			spacer { "spacer.right"; scale;
+				desc { "default";
+					min: PAD_R 0;
+					align: 1.0 0.5;
+					rel1.relative: 1.0 0.0;
+					rel2.relative: 1.0 1.0;
+				}
+			}
+			swallow { PART_BACK_BTN; scale;
+				desc { "default";
+					min: BTN_SIZE;
+					max: BTN_SIZE;
+					align: 0.0 0.0;
+					rel1 { relative: 1.0 1.0; to_x: "spacer.left"; to_y: "spacer.top"; }
+				}
+			}
+			spacer { "spacer.thumbnail.top"; scale;
+				desc { "default";
+					min: 0 THUMBNAIL_PAD_T;
+					align: 0.5 0.0;
+					rel1.relative: 0.0 0.0;
+					rel2.relative: 1.0 0.0;
+				}
+			}
+			swallow { PART_THUMBNAIL; scale;
+				desc { "default";
+					align: 0.5 0.0;
+					min: THUMBNAIL_SIZE;
+					max: THUMBNAIL_SIZE;
+					rel1 { relative: 0.0 1.0; to_y: "spacer.thumbnail.top"; }
+				}
+			}
+			spacer { "spacer.text.left"; scale;
+				desc { "default";
+					min: TEXT_PAD_X 0;
+					align: 0.0 0.5;
+					rel1.relative: 0.0 0.0;
+					rel2.relative: 0.0 1.0;
+				}
+			}
+			spacer { "spacer.text.right"; scale;
+				desc { "default";
+					min: TEXT_PAD_X 0;
+					align: 1.0 0.5;
+					rel1.relative: 1.0 0.0;
+					rel2.relative: 1.0 1.0;
+				}
+			}
+			spacer { "spacer.name.top"; scale;
+				desc { "default";
+					min: 0 TEXT_PAD_Y;
+					align: 0.5 0.0;
+					rel1 { relative: 0.0 1.0; to_y: PART_THUMBNAIL; }
+					rel2 { relative: 1.0 1.0; to_y: PART_THUMBNAIL; }
+				}
+			}
+			textblock { PART_NAME; scale;
+				desc { "default";
+					min: 0 NAME_H;
+					max: -1 NAME_H;
+					align: 0.5 0.0;
+					rel1 { relative: 1.0 1.0; to_x: "spacer.text.left"; to_y: "spacer.name.top"; }
+					rel2 { relative: 0.0 1.0; to_x: "spacer.text.right"; }
+					text {
+						align: 0.5 0.0;
+						style: "name_style";
+					}
+				}
+			}
+			spacer { "spacer.bottom"; scale;
+				desc { "default";
+					min: 0 PAD_B;
+					align: 0.5 0.0;
+					rel1 { relative: 0.0 1.0; to_y: PART_NAME; }
+					rel2 { relative: 1.0 1.0; }
+				}
+			}
+		}
+	}
+}
diff --git a/lib-contact/.cproject b/lib-contact/.cproject
index e5a15d4..a9c29c9 100644
--- a/lib-contact/.cproject
+++ b/lib-contact/.cproject
@@ -5,18 +5,17 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.tizen.nativecore.config.sbi.gcc45.so.debug.1961370693" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.tizen.nativecore.NativeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="so" artifactName="contact" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.debug.1961370693" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.so.debug">
+				<configuration artifactExtension="so" artifactName="contact" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.debug.1961370693" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.so.debug">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.so.debug.1961370693." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.so.debug.1680494626" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.so.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1236388608" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -118,10 +117,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-apps-common/inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-apps-common/res/apps-common/edje}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-common/inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-common/res/common/edje}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-contact/res/input/edje}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-common/res/details/edje}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-apps-common/res/apps-common/edje}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-contact/res/details/edje}&quot;"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks.core.708088795" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs">
@@ -162,7 +161,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
@@ -297,18 +295,17 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.tizen.nativecore.config.sbi.gcc45.so.release.1790414907" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.tizen.nativecore.NativeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="so" artifactName="contact" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.release.1790414907" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.so.release">
+				<configuration artifactExtension="so" artifactName="contact" buildArtefactType="org.tizen.nativecore.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.sharedLib" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.so.release.1790414907" name="Release" parent="org.tizen.nativecore.config.sbi.gcc45.so.release">
 					<folderInfo id="org.tizen.nativecore.config.sbi.gcc45.so.release.1790414907." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.so.release.1124909558" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.so.release">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1825944738" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -341,7 +338,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
@@ -442,7 +438,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
diff --git a/lib-contact/CMakeLists.txt b/lib-contact/CMakeLists.txt
index 67dc0cc..94d6e6a 100644
--- a/lib-contact/CMakeLists.txt
+++ b/lib-contact/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
 	${CMAKE_SOURCE_DIR}/lib-apps-common/inc
 	${CMAKE_SOURCE_DIR}/lib-apps-common/res/apps-common/edje
 	${CMAKE_SOURCE_DIR}/lib-common/inc
-	${CMAKE_SOURCE_DIR}/lib-common/res/common/edje
+	${CMAKE_SOURCE_DIR}/lib-common/res/details/edje
 	${CMAKE_CURRENT_SOURCE_DIR}/inc
 	${CMAKE_CURRENT_SOURCE_DIR}/res/details/edje
 	${CMAKE_CURRENT_SOURCE_DIR}/res/input/edje
diff --git a/lib-contact/res/details/CMakeLists.txt b/lib-contact/res/details/CMakeLists.txt
index c2fd853..a2acf39 100644
--- a/lib-contact/res/details/CMakeLists.txt
+++ b/lib-contact/res/details/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(EDC_FILES details-item-layout.edc)
+set(EDC_FILES contacts-details-item-layout.edc)
 set(EDJ_DIR "${RES_DIR}/details/edje")
 set(IMG_DIR "${RES_DIR}/details/images")
 
diff --git a/lib-contact/res/details/edje/DetailsItemLayout.h b/lib-contact/res/details/edje/ContactsDetailsItemLayout.h
similarity index 75%
rename from lib-contact/res/details/edje/DetailsItemLayout.h
rename to lib-contact/res/details/edje/ContactsDetailsItemLayout.h
index 7b4f2c0..f29269d 100644
--- a/lib-contact/res/details/edje/DetailsItemLayout.h
+++ b/lib-contact/res/details/edje/ContactsDetailsItemLayout.h
@@ -15,18 +15,16 @@
  *
  */
 
-#ifndef DETAILS_ITEM_LAYOUT_H
-#define DETAILS_ITEM_LAYOUT_H
+#ifndef CONTACTS_DETAILS_ITEM_LAYOUT_H
+#define CONTACTS_DETAILS_ITEM_LAYOUT_H
 
-#include "DetailsPath.h"
+#include "ContactsDetailsPath.h"
+#include "../../../../lib-common/res/details/edje/DetailsItemLayout.h"
 
-#define DETAILS_ITEM_STYLE      "details_item"
+#define CONTACTS_DETAILS_ITEM_STYLE      "contacts_details_item"
 
-#define PART_BACK_BTN           "swallow.back"
 #define PART_FAV_BTN            "swallow.favorite"
-#define PART_THUMBNAIL          "swallow.thumbnail"
 
-#define PART_NAME               "text.name"
 #define PART_PHONETIC_NAME      "text.phonetic_name"
 #define PART_COMPANY            "text.company"
 
@@ -35,4 +33,4 @@
 #define GROUP_ICON_EMAIL        "icon_email"
 #define GROUP_ICON_INTERNET     "icon_internet"
 
-#endif /* DETAILS_ITEM_LAYOUT_H */
+#endif /* CONTACTS_DETAILS_ITEM_LAYOUT_H */
diff --git a/lib-contact/res/details/edje/ContactsDetailsItemLayoutMetrics.h b/lib-contact/res/details/edje/ContactsDetailsItemLayoutMetrics.h
new file mode 100644
index 0000000..9327cb0
--- /dev/null
+++ b/lib-contact/res/details/edje/ContactsDetailsItemLayoutMetrics.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef CONTACTS_DETAILS_ITEM_LAYOUT_METRICS_H
+#define CONTACTS_DETAILS_ITEM_LAYOUT_METRICS_H
+
+#include "../../../../lib-common/res/details/edje/DetailsItemLayoutMetrics.h"
+
+#define PHONETIC_NAME_H 48
+#define PHONETIC_NAME_TEXT_SIZE 36
+
+#define COMPANY_H 48
+#define COMPANY_TEXT_SIZE 36
+
+#endif /* CONTACTS_DETAILS_ITEM_LAYOUT_METRICS_H */
diff --git a/lib-contact/res/details/edje/DetailsPath.h b/lib-contact/res/details/edje/ContactsDetailsPath.h
similarity index 84%
rename from lib-contact/res/details/edje/DetailsPath.h
rename to lib-contact/res/details/edje/ContactsDetailsPath.h
index 9b2ab1f..df4a5b9 100644
--- a/lib-contact/res/details/edje/DetailsPath.h
+++ b/lib-contact/res/details/edje/ContactsDetailsPath.h
@@ -15,17 +15,17 @@
  *
  */
 
-#ifndef DETAILS_PATH_H
-#define DETAILS_PATH_H
+#ifndef CONTACTS_DETAILS_PATH_H
+#define CONTACTS_DETAILS_PATH_H
 
 #define DETAILS_IMG_DIR "details/images/"
 #define DETAILS_EDJ_DIR "details/edje/"
 
-#define DETAILS_ITEM_LAYOUT_EDJ   DETAILS_EDJ_DIR"details-item-layout.edj"
+#define DETAILS_ITEM_LAYOUT_EDJ   DETAILS_EDJ_DIR"contacts-details-item-layout.edj"
 
 #define DETAILS_ICON_CALL         DETAILS_IMG_DIR"contacts_btn_ic_call.png"
 #define DETAILS_ICON_MESSAGE      DETAILS_IMG_DIR"contacts_btn_ic_message.png"
 #define DETAILS_ICON_EMAIL        DETAILS_IMG_DIR"contacts_btn_ic_email.png"
 #define DETAILS_ICON_INTERNET     DETAILS_IMG_DIR"contacts_btn_ic_Internet.png"
 
-#endif /* DETAILS_PATH_H */
+#endif /* CONTACTS_DETAILS_PATH_H */
diff --git a/lib-contact/res/details/edje/details-item-layout.edc b/lib-contact/res/details/edje/contacts-details-item-layout.edc
similarity index 63%
rename from lib-contact/res/details/edje/details-item-layout.edc
rename to lib-contact/res/details/edje/contacts-details-item-layout.edc
index ec0248a..0c93791 100644
--- a/lib-contact/res/details/edje/details-item-layout.edc
+++ b/lib-contact/res/details/edje/contacts-details-item-layout.edc
@@ -15,18 +15,15 @@
  *
  */
 
-#include "DetailsItemLayout.h"
-#include "DetailsItemLayoutMetrics.h"
+#include "ContactsDetailsItemLayout.h"
+#include "ContactsDetailsItemLayoutMetrics.h"
 
 #include "../../../../lib-apps-common/res/apps-common/edje/apps-common-colors.edc"
 #include "../../../../lib-apps-common/res/apps-common/edje/apps-common-utils.edc"
+#include "../../../../lib-common/res/details/edje/details-item-layout.edc"
 
 styles {
 	style {
-		name: "name_style";
-		base: "font=Tizen:style=Light font_size="NAME_TEXT_SIZE" align=center wrap=mixed color=#fafafa ellipsis=1.0";
-	}
-	style {
 		name: "phonetic_name_style";
 		base: "font=Tizen:style=Light font_size="PHONETIC_NAME_TEXT_SIZE" align=center wrap=mixed color=#fafafa ellipsis=1.0";
 	}
@@ -50,48 +47,17 @@ collections
 			"touch_icon_normal", "touch_icon_pressed");
 
 	group {
-		name: "elm/genlist/item/"DETAILS_ITEM_STYLE"/default";
-		alias: "elm/genlist/item_compress/"DETAILS_ITEM_STYLE"/default";
-		alias: "elm/genlist/tree/"DETAILS_ITEM_STYLE"/default";
-		alias: "elm/genlist/tree_compress/"DETAILS_ITEM_STYLE"/default";
+		name: "elm/genlist/item/"CONTACTS_DETAILS_ITEM_STYLE"/default";
+		alias: "elm/genlist/item_compress/"CONTACTS_DETAILS_ITEM_STYLE"/default";
+		alias: "elm/genlist/tree/"CONTACTS_DETAILS_ITEM_STYLE"/default";
+		alias: "elm/genlist/tree_compress/"CONTACTS_DETAILS_ITEM_STYLE"/default";
+		inherit: "elm/genlist/item/"DETAILS_ITEM_STYLE"/default";
 
 		data.item: "texts" PART_NAME" "PART_PHONETIC_NAME" "PART_COMPANY;
 		data.item: "contents" PART_BACK_BTN" "PART_FAV_BTN" "PART_THUMBNAIL;
 		data.item: "states" PART_PHONETIC_NAME" "PART_COMPANY;
 
 		parts {
-			spacer { "spacer.top"; scale;
-				desc { "default";
-					min: 0 PAD_T;
-					align: 0.5 0.0;
-					rel1.relative: 0.0 0.0;
-					rel2.relative: 1.0 0.0;
-				}
-			}
-			spacer { "spacer.left"; scale;
-				desc { "default";
-					min: PAD_L 0;
-					align: 0.0 0.5;
-					rel1.relative: 0.0 0.0;
-					rel2.relative: 0.0 1.0;
-				}
-			}
-			spacer { "spacer.right"; scale;
-				desc { "default";
-					min: PAD_R 0;
-					align: 1.0 0.5;
-					rel1.relative: 1.0 0.0;
-					rel2.relative: 1.0 1.0;
-				}
-			}
-			swallow { PART_BACK_BTN; scale;
-				desc { "default";
-					min: BTN_SIZE;
-					max: BTN_SIZE;
-					align: 0.0 0.0;
-					rel1 { relative: 1.0 1.0; to_x: "spacer.left"; to_y: "spacer.top"; }
-				}
-			}
 			swallow { PART_FAV_BTN; scale;
 				desc { "default";
 					min: BTN_SIZE;
@@ -101,59 +67,6 @@ collections
 					rel2 { relative: 0.0 1.0; to_x: "spacer.right"; }
 				}
 			}
-			spacer { "spacer.thumbnail.top"; scale;
-				desc { "default";
-					min: 0 THUMBNAIL_PAD_T;
-					align: 0.5 0.0;
-					rel1.relative: 0.0 0.0;
-					rel2.relative: 1.0 0.0;
-				}
-			}
-			swallow { PART_THUMBNAIL; scale;
-				desc { "default";
-					align: 0.5 0.0;
-					min: THUMBNAIL_SIZE;
-					max: THUMBNAIL_SIZE;
-					rel1 { relative: 0.0 1.0; to_y: "spacer.thumbnail.top"; }
-				}
-			}
-			spacer { "spacer.text.left"; scale;
-				desc { "default";
-					min: TEXT_PAD_X 0;
-					align: 0.0 0.5;
-					rel1.relative: 0.0 0.0;
-					rel2.relative: 0.0 1.0;
-				}
-			}
-			spacer { "spacer.text.right"; scale;
-				desc { "default";
-					min: TEXT_PAD_X 0;
-					align: 1.0 0.5;
-					rel1.relative: 1.0 0.0;
-					rel2.relative: 1.0 1.0;
-				}
-			}
-			spacer { "spacer.name.top"; scale;
-				desc { "default";
-					min: 0 TEXT_PAD_Y;
-					align: 0.5 0.0;
-					rel1 { relative: 0.0 1.0; to_y: PART_THUMBNAIL; }
-					rel2 { relative: 1.0 1.0; to_y: PART_THUMBNAIL; }
-				}
-			}
-			textblock { PART_NAME; scale;
-				desc { "default";
-					min: 0 NAME_H;
-					max: -1 NAME_H;
-					align: 0.5 0.0;
-					rel1 { relative: 1.0 1.0; to_x: "spacer.text.left"; to_y: "spacer.name.top"; }
-					rel2 { relative: 0.0 1.0; to_x: "spacer.text.right"; }
-					text {
-						align: 0.5 0.0;
-						style: "name_style";
-					}
-				}
-			}
 			spacer { "spacer.phonetic_name.top"; scale;
 				desc { "default";
 					min: 0 TEXT_PAD_Y;
diff --git a/lib-contact/src/Contacts/Details/ActionFieldItem.cpp b/lib-contact/src/Contacts/Details/ActionFieldItem.cpp
index 2f919b2..f703948 100644
--- a/lib-contact/src/Contacts/Details/ActionFieldItem.cpp
+++ b/lib-contact/src/Contacts/Details/ActionFieldItem.cpp
@@ -24,8 +24,8 @@
 #include "Ui/Scale.h"
 #include "Utils/Callback.h"
 
-#include "DetailsItemLayout.h"
-#include "DetailsItemLayoutMetrics.h"
+#include "ContactsDetailsItemLayout.h"
+#include "ContactsDetailsItemLayoutMetrics.h"
 
 using namespace Contacts::Details;
 using namespace Contacts::Model;
diff --git a/lib-contact/src/Contacts/Details/BasicInfoItem.cpp b/lib-contact/src/Contacts/Details/BasicInfoItem.cpp
index 2051f77..1357056 100644
--- a/lib-contact/src/Contacts/Details/BasicInfoItem.cpp
+++ b/lib-contact/src/Contacts/Details/BasicInfoItem.cpp
@@ -25,7 +25,7 @@
 #include "Ui/Thumbnail.h"
 #include "Utils/Callback.h"
 
-#include "DetailsItemLayout.h"
+#include "ContactsDetailsItemLayout.h"
 
 using namespace Contacts::Details;
 using namespace Contacts::Model;
@@ -59,7 +59,7 @@ void BasicInfoItem::setSelectMode(SelectMode mode)
 
 Elm_Genlist_Item_Class *BasicInfoItem::getItemClass() const
 {
-	static Elm_Genlist_Item_Class itc = createItemClass(DETAILS_ITEM_STYLE);
+	static Elm_Genlist_Item_Class itc = createItemClass(CONTACTS_DETAILS_ITEM_STYLE);
 	return &itc;
 }
 
diff --git a/lib-contact/src/Contacts/Details/DetailsView.cpp b/lib-contact/src/Contacts/Details/DetailsView.cpp
index e7b3901..ea01949 100644
--- a/lib-contact/src/Contacts/Details/DetailsView.cpp
+++ b/lib-contact/src/Contacts/Details/DetailsView.cpp
@@ -32,7 +32,7 @@
 #include "Utils/Logger.h"
 #include "Utils/Range.h"
 
-#include "DetailsItemLayout.h"
+#include "ContactsDetailsItemLayout.h"
 
 #include <app_i18n.h>
 
diff --git a/packaging/org.tizen.contacts.spec b/packaging/org.tizen.contacts.spec
index d90068c..690c70a 100644
--- a/packaging/org.tizen.contacts.spec
+++ b/packaging/org.tizen.contacts.spec
@@ -63,7 +63,6 @@ make %{?_smp_mflags}
 %{_lib_dir}
 
 %{_res_dir}/apps-common
-%{_res_dir}/common
 %{_res_dir}/details
 %{_res_dir}/dialer
 %{_res_dir}/input
-- 
2.7.4