From 92f926fe1d2e989e7229dc63453083ae25a73c79 Mon Sep 17 00:00:00 2001
From: Iscaro <iscaro@profusion.mobi>
Date: Thu, 6 Sep 2012 16:44:26 -0300
Subject: [PATCH] Call screen now shows contact's photo

---
 data/themes/default-hd.edc             |   4 +-
 data/themes/default-sd.edc             |   4 +-
 data/themes/images/ico_multiparty.png  | Bin 2330 -> 3421 bytes
 data/themes/includes/answer_screen.edc |  68 +++++++++-
 data/themes/includes/call.edc          | 223 +++++++++++++++++++++++++++++----
 data/themes/includes/contacts.edc      |   1 +
 dialer/callscreen.c                    |  46 ++++++-
 tizen/answer_daemon.c                  |  12 ++
 utils/util.c                           |   4 +
 9 files changed, 334 insertions(+), 28 deletions(-)

diff --git a/data/themes/default-hd.edc b/data/themes/default-hd.edc
index 2f48667..4b22f68 100644
--- a/data/themes/default-hd.edc
+++ b/data/themes/default-hd.edc
@@ -26,7 +26,6 @@
 #define SIZE_TINY 16
 
 #define CONTACT_PHOTO_SIZE 128
-#define CONTACT_HALF_PHOTO 64
 #define LIST_CONTACT_HEIGHT 170
 
 #define GROUP_HEIGHT 30
@@ -39,4 +38,7 @@
 #define NOTIFICATION_BAR_HEIGHT 0
 #endif
 
+#define CALL_TEXT_OFFSET 32
+#define CALL_PHOTO_SIZE 180
+
 #include "default.edc"
diff --git a/data/themes/default-sd.edc b/data/themes/default-sd.edc
index 8ed28a6..bf229b7 100644
--- a/data/themes/default-sd.edc
+++ b/data/themes/default-sd.edc
@@ -26,7 +26,6 @@
 #define SIZE_TINY 8
 
 #define CONTACT_PHOTO_SIZE 64
-#define CONTACT_HALF_PHOTO 32
 #define LIST_CONTACT_HEIGHT 90
 
 #define GROUP_HEIGHT 20
@@ -39,4 +38,7 @@
 #define NOTIFICATION_BAR_HEIGHT 0
 #endif
 
+#define CALL_TEXT_OFFSET 16
+#define CALL_PHOTO_SIZE 90
+
 #include "default.edc"
diff --git a/data/themes/images/ico_multiparty.png b/data/themes/images/ico_multiparty.png
index 4db977e7dbe89e9a3363528ec301c20a138cf36a..fade23b6a5ab073bb52b91a0b2642f7125d55fa8 100644
GIT binary patch
literal 3421
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

literal 2330
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
A$p8QV

diff --git a/data/themes/includes/answer_screen.edc b/data/themes/includes/answer_screen.edc
index d9f3eb6..4d37d21 100644
--- a/data/themes/includes/answer_screen.edc
+++ b/data/themes/includes/answer_screen.edc
@@ -25,6 +25,66 @@ group {
       }
 
       part {
+         name: "img.border";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "action";
+            rel1 {
+               to: "elm.swallow.photo";
+               relative: 0.0 0.0;
+               offset: -1 -1;
+            }
+            rel2 {
+               to: "elm.swallow.photo";
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
+         }
+      }
+
+      part {
+         name: "img.bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "dark";
+            rel1 {
+               to: "elm.swallow.photo";
+               relative: 0.0 0.0;
+               offset: 0 0;
+            }
+            rel2 {
+               to: "elm.swallow.photo";
+               relative: 1.0 1.0;
+               offset: -1 -1;
+            }
+         }
+      }
+
+      part {
+         name: "elm.swallow.photo";
+         type: SWALLOW;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;
+            max: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;
+            rel1.offset: BORDER_PADDING SEPARATOR_HEIGHT;
+            rel2 {
+               relative: 0.0 0.0;
+               offset: (CALL_PHOTO_SIZE + BORDER_PADDING) (SEPARATOR_HEIGHT + CALL_PHOTO_SIZE);
+            }
+         }
+      }
+
+      part {
          name: "elm.text.name";
          type: TEXT;
          mouse_events: 0;
@@ -32,10 +92,14 @@ group {
             state: "default" 0.0;
             color: 255 255 255 255;
             color_class: "action";
-            rel1.offset: BORDER_PADDING SEPARATOR_HEIGHT;
+            rel1 {
+               to: "elm.swallow.photo";
+               relative: 1.0 0.0;
+               offset: ITEM_PADDING 0;
+            }
             rel2 {
                relative: 1.0 0.0;
-               offset:  -BORDER_PADDING ACTION_HEIGHT;
+               offset: 0 (SEPARATOR_HEIGHT + CONTACT_PHOTO_SIZE);
             }
             text {
                text: "Gustavo Barbieri";
diff --git a/data/themes/includes/call.edc b/data/themes/includes/call.edc
index fb0c043..3cd8319 100644
--- a/data/themes/includes/call.edc
+++ b/data/themes/includes/call.edc
@@ -64,7 +64,7 @@ group {
       image: "ico_merge.png" COMP;
       image: "ico_swap.png" COMP;
       image: "ico_contacts.png" COMP;
-      image: "ico_multiparty.png" COMP;
+      image: "ico_arrow_right.png" COMP;
    }
 
    parts {
@@ -197,19 +197,19 @@ group {
             state: "default" 0.0;                                       \
             color: 255 255 255 255;                                     \
             color_class: "action";                                      \
-            min: 80 80;                                                 \
-            max: 80 80;                                                 \
+            min: LIST_ICON_SIZE LIST_ICON_SIZE;				\
+            max: LIST_ICON_SIZE LIST_ICON_SIZE;                         \
             rel1 {                                                      \
                to: "call."##id;                                         \
                relative: 1.0 0.0;                                       \
-               offset: -80 (BORDER_PADDING - 1);                        \
+               offset: (-LIST_ICON_SIZE - BORDER_PADDING) 0;            \
             }                                                           \
             rel2 {                                                      \
                to: "call."##id;                                         \
-               relative: 1.0 0.0;                                       \
-               offset: -1 141;                                          \
+               relative: 1.0 1.0;                                       \
+               offset: (-BORDER_PADDING -1) -1;                         \
             }                                                           \
-            image.normal: "ico_multiparty.png";                         \
+            image.normal: "ico_arrow_right.png";                        \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
@@ -296,7 +296,7 @@ group {
          description {                                                  \
             state: "multiparty" 0.0;                                    \
             inherit: "default" 0.0;                                     \
-            rel2.offset: (-80 - ITEM_PADDING) (ACTION_HEIGHT - 1);      \
+            rel2.offset: (-BORDER_PADDING - ITEM_PADDING -LIST_ICON_SIZE - 1) (ACTION_HEIGHT - 1); \
          }                                                              \
       }                                                                 \
       part {                                                            \
@@ -310,15 +310,24 @@ group {
             state: "default" 0.0;                                       \
             color: 255 255 255 255;                                     \
             color_class: "action";                                      \
-            rel1.to: "area."##id".name";                                \
-            rel2.to: "area."##id".name";                                \
+            rel1 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 0.0;                                       \
+               offset: ITEM_PADDING 0;                                  \
+            }                                                           \
+            rel2 {                                                      \
+               to: "area."##id".name";                                  \
+               relative: 1.0 1.0;                                       \
+               offset: -1 -CALL_TEXT_OFFSET;                            \
+            }                                                           \
             text {                                                      \
                text: "Gustavo Barbieri";                                \
                font: FONT_NORMAL;                                       \
                size: SIZE_HUGE;                                         \
-               size_range: SIZE_TINY SIZE_HUGE;                         \
+               size_range: SIZE_MEDIUM SIZE_HUGE;                       \
                fit: 1 1;                                                \
-               align: 0.0 0.5;                                          \
+               max: 0 1;                                                \
+               align: 0.0 1.0;                                          \
                ellipsis: 0.0;                                           \
             }                                                           \
          }                                                              \
@@ -343,14 +352,15 @@ group {
             fixed: 1 1;                                                 \
             align: 0.0 0.0;                                             \
             rel1 {                                                      \
-               to: "area."##id".name";                                  \
-               relative: 0.0 1.0;                                       \
-               offset: 0 -20;                                           \
+               to_x: "elm.swallow.img."##id;                            \
+               to_y: "elm.text."##id".name";                            \
+               relative: 1.0 1.0;                                       \
+               offset: ITEM_PADDING -SEPARATOR_HEIGHT;                  \
             }                                                           \
             rel2 {                                                      \
-               to: "area."##id".name";                                  \
-               relative: 0.0 1.0;                                       \
-               offset: 0 -1;                                            \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 1.0;                                       \
+               offset: ITEM_PADDING -1;                                 \
             }                                                           \
             text {                                                      \
                text: "calling...";                                      \
@@ -395,6 +405,78 @@ group {
          }                                                              \
       }                                                                 \
                                                                         \
+      part {                                                            \
+         name: "elm.swallow.border."##id;                               \
+         type: RECT;                                                    \
+         scale: 1;                                                      \
+         mouse_events: 0;                                               \
+         clip_to: "call."##id;                                          \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            color: 255 255 255 255;                                     \
+            color_class: "action";                                      \
+            rel1 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 0.0 0.0;                                       \
+               offset: -1 -1;                                           \
+            }                                                           \
+            rel2 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 1.0;                                       \
+               offset: 0 0;                                             \
+            }                                                           \
+         }                                                              \
+      }                                                                 \
+                                                                        \
+      part {                                                            \
+         name: "elm.swallow.img.bg".#id;                                \
+         type: RECT;                                                    \
+         scale: 1;                                                      \
+         mouse_events: 0;                                               \
+         clip_to: "call."##id;                                          \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            color: 255 255 255 255;                                     \
+            color_class: "dark";                                        \
+            rel1 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 0.0 0.0;                                       \
+               offset: 0 0;                                             \
+            }                                                           \
+            rel2 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 1.0;                                       \
+               offset: -1 -1;                                           \
+            }                                                           \
+         }                                                              \
+      }                                                                 \
+                                                                        \
+      part {                                                            \
+         name: "elm.swallow.img."##id;                                  \
+         type: SWALLOW;                                                 \
+         scale: 1;                                                      \
+         clip_to: "call."##id;                                          \
+         mouse_events: 0;                                               \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            visible: 1;                                                 \
+            min: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;                       \
+            max: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;                       \
+            rel1 {                                                      \
+               to: "area."##id."name";                                  \
+               relative: 0.0 0.0;                                       \
+               offset: 0 ITEM_PADDING;                                  \
+            }                                                           \
+            rel2 {                                                      \
+               to: "area."##id."name";                                  \
+               relative: 0.0 0.0;                                       \
+               offset: CALL_PHOTO_SIZE (CALL_PHOTO_SIZE + ITEM_PADDING); \
+            }                                                           \
+         }								\
+								        \
+      }                                                                 \
+									\
+                                                                        \
       programs {                                                        \
          program {                                                      \
             signal: "mouse,clicked,1";                                  \
@@ -415,6 +497,7 @@ group {
             transition: ACCELERATE 0.1;                                 \
             target: "elm.text."##id".name";                             \
          }                                                              \
+                                                                        \
       }
 
       CALL("1", 0);
@@ -2037,11 +2120,15 @@ group {
             state: "default" 0.0;
             color: 255 255 255 255;
             color_class: "action";
-            align: 0.0 0.5;
-            rel1.offset: BORDER_PADDING 0;
-            rel2 {
+            rel1 {
+               to: "elm.swallow.waiting.photo";
                relative: 1.0 0.0;
-               offset: (-BORDER_PADDING - 1) (ACTION_HEIGHT - 1);
+               offset: ITEM_PADDING 0;
+            }
+            rel2 {
+               to: "notification.bar";
+               relative: 1.0 1.0;
+               offset: -BORDER_PADDING ACTION_HEIGHT;
             }
             text {
                text: "Someone";
@@ -2056,6 +2143,75 @@ group {
       }
 
       part {
+         name: "waiting.img.border";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         clip_to: "clipper.waiting-visible";
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "action";
+            rel1 {
+               to: "elm.swallow.waiting.photo";
+               relative: 0.0 0.0;
+               offset: -1 -1;
+            }
+            rel2 {
+               to: "elm.swallow.waiting.photo";
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
+         }
+      }
+
+      part {
+         name: "waiting.img.bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         clip_to: "clipper.waiting-visible";
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "dark";
+            rel1 {
+               to: "elm.swallow.waiting.photo";
+               relative: 0.0 0.0;
+               offset: 0 0;
+            }
+            rel2 {
+               to: "elm.swallow.waiting.photo";
+               relative: 1.0 1.0;
+               offset: -1 -1;
+            }
+         }
+      }
+
+      part {
+         name: "elm.swallow.waiting.photo";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "clipper.waiting-visible";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;
+            max: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;
+            rel1 {
+               to: "notification.bar";
+               relative: 0.0 1.0;
+               offset: BORDER_PADDING ITEM_PADDING;
+            }
+            rel2 {
+               to: "notification.bar";
+               relative: 0.0 1.0;
+               offset: (CALL_PHOTO_SIZE + BORDER_PADDING) (CALL_PHOTO_SIZE + ITEM_PADDING);
+            }
+         }
+      }
+
+      part {
          name: "label.waiting";
          type: TEXT;
          mouse_events: 0;
@@ -2259,3 +2415,26 @@ group {
       }
    }
 }
+
+group {
+
+   name: "elm/icon/multiparty/default";
+
+   images{
+      image: "ico_multiparty.png" COMP;
+   }
+
+   parts {
+      part {
+         name : "base";
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            aspect: 1.0 1.0;
+            color_class: "action";
+            aspect_preference: BOTH;
+            image.normal: "ico_multiparty.png";
+         }
+      }
+   }
+}
diff --git a/data/themes/includes/contacts.edc b/data/themes/includes/contacts.edc
index 330a2be..714ddb0 100644
--- a/data/themes/includes/contacts.edc
+++ b/data/themes/includes/contacts.edc
@@ -522,6 +522,7 @@ group {
          description {
             state: "default" 0.0;
             aspect: 1.0 1.0;
+            color_class: "action";
             aspect_preference: BOTH;
             image.normal: "ico_person.png";
          }
diff --git a/dialer/callscreen.c b/dialer/callscreen.c
index cc2d838..b447c95 100644
--- a/dialer/callscreen.c
+++ b/dialer/callscreen.c
@@ -62,7 +62,7 @@ static char *_call_name_or_id(const OFono_Call *call)
 	Contact_Info *info;
 
 	if (!s)
-		return NULL;;
+		return NULL;
 
 	info = gui_contact_search(s, NULL);
 	if (info)
@@ -71,6 +71,20 @@ static char *_call_name_or_id(const OFono_Call *call)
 	return phone_format(s);
 }
 
+static Evas_Object *_call_photo_get(const OFono_Call *call, Evas_Object *parent)
+{
+	const char *s = ofono_call_line_id_get(call);
+	Contact_Info *info;
+
+	if (!s)
+		return NULL;
+
+	info = gui_contact_search(s, NULL);
+	if (info)
+		return picture_icon_get(parent, contact_info_picture_get(info));
+	return NULL;
+}
+
 static char *_call_name_get(const Callscreen *ctx __UNUSED__,
 				const OFono_Call *call)
 {
@@ -277,17 +291,38 @@ static const char *_call_state_id(OFono_Call_State state)
 	}
 }
 
+static void _call_photo_set(Callscreen *ctx, unsigned int id,
+				Evas_Object *photo)
+{
+	char buf[128];
+
+	if (!photo) {
+		photo = elm_icon_add(ctx->self);
+		elm_icon_standard_set(photo, "no-picture");
+	}
+
+	snprintf(buf, sizeof(buf), "elm.swallow.img.%u", id);
+	elm_object_part_content_set(ctx->self, buf, photo);
+}
+
 static void _call_show(Callscreen *ctx, unsigned int id, const OFono_Call *c)
 {
 	char *contact = _call_name_get(ctx, c);
 	const char *type = _call_type_get(c);
 	const char *status = _call_state_str(ofono_call_state_get(c));
+	Evas_Object *photo;
+
+	if (ofono_call_multiparty_get(c)) {
+		photo = elm_icon_add(ctx->self);
+		elm_icon_standard_set(photo, "multiparty");
+	} else
+		photo = _call_photo_get(c, ctx->self);
 
 	_call_text_set(ctx, id, "name", contact);
 	_call_text_set(ctx, id, "phone.type", type);
 	_call_text_set(ctx, id, "status", status);
 	_call_text_set(ctx, id, "elapsed", "");
-
+	_call_photo_set(ctx, id, photo);
 	free(contact);
 }
 
@@ -478,6 +513,13 @@ static void _call_waiting_set(Callscreen *ctx, OFono_Call *c)
 		elm_object_signal_emit(o, "hide,waiting", "call");
 	} else {
 		char *name = _call_name_get(ctx, c);
+		Evas_Object *photo = _call_photo_get(c, o);
+		if (!photo) {
+			photo = elm_icon_add(o);
+			elm_icon_standard_set(photo, "no-picture");
+		}
+		elm_object_part_content_set(o, "elm.swallow.waiting.photo",
+						photo);
 		elm_object_part_text_set(o, "elm.text.waiting", name);
 		elm_object_signal_emit(o, "show,waiting", "call");
 		free(name);
diff --git a/tizen/answer_daemon.c b/tizen/answer_daemon.c
index ef364e1..f35ce2a 100644
--- a/tizen/answer_daemon.c
+++ b/tizen/answer_daemon.c
@@ -122,6 +122,7 @@ static void _call_destroy(Call *c)
 static void _call_screen_show(Call_Screen *cs)
 {
 	Call *c = cs->call;
+	Evas_Object *icon = NULL;
 
 	INF("Show line_id=%s, name=%s, type=%s",
 		c->line_id, c->name, c->type);
@@ -137,9 +138,20 @@ static void _call_screen_show(Call_Screen *cs)
 	else
 		elm_object_part_text_set(cs->layout, "elm.text.name",
 						c->name);
+	icon = elm_icon_add(cs->layout);
+
+	if (strcmp("", c->img) != 0) {
+#ifdef HAVE_TIZEN
+		elm_icon_file_set(icon, c->img, NULL);
+#else
+		elm_image_file_set(icon, c->img, NULL);
+#endif
+	} else
+		elm_icon_standard_set(icon, "no-picture");
 
 	elm_object_part_text_set(cs->layout, "elm.text.state", "Incoming...");
 	elm_object_part_text_set(cs->layout, "elm.text.phone.type", c->type);
+	elm_object_part_content_set(cs->layout, "elm.swallow.photo", icon);
 	elm_object_signal_emit(cs->layout, "show,activecall", "gui");
 	evas_object_show(cs->win);
 #ifdef HAVE_TIZEN
diff --git a/utils/util.c b/utils/util.c
index 39344ff..92d15b6 100644
--- a/utils/util.c
+++ b/utils/util.c
@@ -113,12 +113,16 @@ Evas_Object *picture_icon_get(Evas_Object *parent, const char *picture)
 	if (!picture || *picture == '\0')
 		elm_icon_standard_set(icon, "no-picture");
 	else {
+#ifdef HAVE_TIZEN
+		elm_icon_file_set(icon, picture, NULL);
+#else
 		char path[PATH_MAX];
 		const char *prefix;
 		prefix = efreet_config_home_get();
 		snprintf(path, sizeof(path), "%s/%s/%s", prefix, PACKAGE_NAME,
 				picture);
 		elm_image_file_set(icon, path, NULL);
+#endif
 	}
 	return icon;
 }
-- 
2.7.4