Made changes as per GUI guidelines

Change-Id: I4266c2c4192b7529ea308af6e7cdbe716a5daa47

diff --git a/TelegramTizen/inc/tg_search_peer_view.h b/TelegramTizen/inc/tg_search_peer_view.h
index 36ecd6b..311e17d 100644 (file)
--- a/TelegramTizen/inc/tg_search_peer_view.h
+++ b/TelegramTizen/inc/tg_search_peer_view.h
@@ -11,7 +11,7 @@
 #include "tg_common.h"
 
 extern void launch_start_peer_search_view(appdata_s* ad);
-
+extern int on_create_new_contact(appdata_s* ad);
 
 
 #endif /* TG_SEARCH_PEER_VIEW_H_ */

diff --git a/TelegramTizen/res/edje/telegram_init_screen.edc b/TelegramTizen/res/edje/telegram_init_screen.edc
index 0acac27..dc1af3b 100644 (file)
--- a/TelegramTizen/res/edje/telegram_init_screen.edc
+++ b/TelegramTizen/res/edje/telegram_init_screen.edc
@@ -118,6 +118,7 @@ collections {
 
        images {
                image: "camera_btn_gallery_mask.png" COMP;
+               image: "telegram_date_divider.#.png" COMP;
        }
 
    group {
@@ -1106,16 +1107,20 @@ collections {
                        }
                }
                
-                   part {
-                               name: "swallow.text_entry,bg";
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
+                       part{
+                       name: "swallow.text_entry,bg";
+                       type: IMAGE;
+                       description{
+                               state: "default" 0.0;
                                        rel1 { relative: 0.0 0.97; to, "swallow.text_entry"; }
                                        rel2 { relative: 1.0 1.0; to, "swallow.text_entry"; }
-                                       color: 0 0 255 255;
-                               }
-                       }  
+                               max: 800 2;
+                               image {
+                                               normal: "telegram_date_divider.#.png";
+                                       }
+                                       color: 0 0 0 51;
+                       }
+               }    
                
                part{
                        name: "swallow.text_entry";
@@ -1131,8 +1136,8 @@ collections {
                        type:SWALLOW;
                        description{
                                state: "default" 0.0;
-                               rel1 { relative: 0.79 0.2; }
-                               rel2 { relative: 0.89 0.92; }
+                               rel1 { relative: 0.81 0.2; }
+                               rel2 { relative: 0.91 0.92; }
                        }
                }
                part{
@@ -1140,7 +1145,7 @@ collections {
                        type:SWALLOW;
                        description{
                                state: "default" 0.0;
-                               rel1 { relative: 0.9 0.1; }
+                               rel1 { relative: 0.91 0.1; }
                                rel2 { relative: 1.0 0.97; }
                        }
                }
@@ -1329,10 +1334,6 @@ group
 }
 
 
-       images {
-               image: "telegram_date_divider.#.png" COMP;
-       }
-
        group
     {
        name: "chat_date_item_box";
@@ -2952,5 +2953,47 @@ group
        }
        }
        
+       images {
+               image: "Telegram-main-icon.png" COMP;
+       }
+       
+       group
+       {
+               name: "splash_screen";
+       parts{
+           part {
+                               name: "swallow.splash_screen,bg";
+                               type: RECT;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0 0.0; to, "swallow.splash_screen"; }
+                                       rel2 { relative: 1.0 1.0; to, "swallow.splash_screen"; }
+                                       color: 255 255 255 255;
+                               }
+                       }  
+                       part{
+                       name: "splash_screen_bg_image";
+                       type:IMAGE;
+                       description{
+                               state: "default" 0.0;
+                               rel1 { relative: 0.3 0.2; to, "swallow.splash_screen,bg"; }
+                               rel2 { relative: 0.7 0.4; to, "swallow.splash_screen,bg"; }
+                               image {
+                                               normal: "Telegram-main-icon.png";
+                                       }
+                       }
+               }
+               part{
+                       name: "swallow.splash_screen";
+                       type:SWALLOW;
+                       description{
+                               state: "default" 0.0;
+                               rel1 { relative: 0.0 0.0; }
+                               rel2 { relative: 1.0 1.0; }     
+                               color: 0 0 0 0;                 
+                       }
+               }
+       }       
+       }
 
 }

diff --git a/TelegramTizen/src/telegramtizen.c b/TelegramTizen/src/telegramtizen.c
index 6086bef..6dceaa0 100644 (file)
--- a/TelegramTizen/src/telegramtizen.c
+++ b/TelegramTizen/src/telegramtizen.c
@@ -58,7 +58,7 @@ void load_registered_user_data(appdata_s *ad)
 
        if(!user_info) {
                //error
-               show_toast(ad, "User info not loaded");
+               //show_toast(ad, "User info not loaded");
        }
 
        if (ad->current_user_data) {
@@ -704,7 +704,7 @@ void load_unknown_buddy_list_data(appdata_s *ad)
 
        if(!user_info) {
                //error
-               show_toast(ad, "User info not loaded");
+               //show_toast(ad, "User info not loaded");
                return;
        }
 
@@ -921,7 +921,7 @@ void load_buddy_list_data(appdata_s *ad)
 
        if(!user_info) {
                //error
-               show_toast(ad, "User info not loaded");
+               //show_toast(ad, "User info not loaded");
                return;
        }
 
@@ -1343,7 +1343,8 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
                result = bundle_get_str(rec_msg, "file_path", &pic_file_path);
 
                if (!pic_file_path || strlen(pic_file_path) <= 0 || access(pic_file_path, F_OK ) == -1) {
-                       pic_file_path = (char*)ui_utils_get_resource(DEFAULT_PROFILE_PIC);
+                       //pic_file_path = (char*)ui_utils_get_resource(DEFAULT_PROFILE_PIC);
+                       return SVC_RES_OK;
                }
 
 
@@ -1365,6 +1366,7 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
                                                item->use_data->photo_path = strdup(pic_file_path);
                                                if (item->contact_icon) {
                                                        elm_image_file_set(item->contact_icon, pic_file_path, NULL);
+                                                       evas_object_color_set(item->contact_icon, 0, 0, 0, 0);
                                                }
                                                break;
                                        }
@@ -1382,6 +1384,7 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
                                                item->use_data->photo_path = strdup(pic_file_path);
                                                if (item->contact_icon) {
                                                        elm_image_file_set(item->contact_icon, pic_file_path, NULL);
+                                                       evas_object_color_set(item->contact_icon, 0, 0, 0, 0);
                                                }
                                                break;
                                        }
@@ -1400,6 +1403,7 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
                                        item->profile_pic_path = strdup(pic_file_path);
                                        if (item->profile_pic) {
                                                elm_image_file_set(item->profile_pic, pic_file_path, NULL);
+                                               evas_object_color_set(item->profile_pic, 0, 0, 0, 0);
                                        }
                                        break;
                                }
@@ -1417,8 +1421,6 @@ static int _on_service_client_msg_received_cb(void *data, bundle *const rec_msg)
 
                        show_toast(app, "Chat profile picture updated successfully.");
                }
-
-
                }
        } else if (strcmp(rec_key_val, "message_received") == 0) {
 
@@ -2583,8 +2585,8 @@ void app_nf_back_cb(void *data, Evas_Object *obj, void *event_info)
                case TG_START_MESSAGING_VIEW_STATE:
                case TG_SETTINGS_SCREEN_STATE:
                        elm_naviframe_item_pop(ad->nf);
-                       create_floating_button(ad);
                        ad->current_app_state = TG_USER_MAIN_VIEW_STATE;
+                       create_floating_button(ad);
                        //evas_object_show(ad->panel);
                        //elm_panel_hidden_set(ad->panel, EINA_FALSE);
                        break;

diff --git a/TelegramTizen/src/tg_messaging_view.c b/TelegramTizen/src/tg_messaging_view.c
index 9d70b5e..76bd776 100644 (file)
--- a/TelegramTizen/src/tg_messaging_view.c
+++ b/TelegramTizen/src/tg_messaging_view.c
@@ -2440,6 +2440,7 @@ static void on_media_attach_clicked(void *data, Evas_Object *obj, void *event_in
 
 }
 
+#if 0
 static void on_text_message_send_pressed(void *data, Evas_Object *obj, void *event_info)
 {
        elm_image_file_set(data, ui_utils_get_resource(SEND_UNPRESSED_ICON), NULL);
@@ -2449,15 +2450,18 @@ static void on_text_message_send_unpressed(void *data, Evas_Object *obj, void *e
 {
        elm_image_file_set(data, ui_utils_get_resource(SEND_PRESSED_ICON), NULL);
 }
+#endif
 
 static void on_message_smiley_pressed(void *data, Evas_Object *obj, void *event_info)
 {
-       elm_image_file_set(data, ui_utils_get_resource(SMILEY_ICON_PRESSED), NULL);
+       if (data)
+               evas_object_color_set(data, 45, 165, 224, 255);
 }
 
 static void on_message_smiley_unpressed(void *data, Evas_Object *obj, void *event_info)
 {
-       elm_image_file_set(data, ui_utils_get_resource(SMILEY_ICON_UNPRESSED), NULL);
+       if (data)
+               evas_object_color_set(data, 45, 165, 224, 178);
 }
 
 void on_user_info_button_clicked(void *data, Evas_Object *obj, void *event_info)
@@ -2665,17 +2669,34 @@ void launch_messaging_view_cb(appdata_s* ad, int user_id)
        evas_object_size_hint_weight_set(entry_box_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_show(entry_box_layout);
 
+
+       Evas_Object* attach_btn = elm_button_add(entry_box_layout);
+       elm_object_style_set(attach_btn, "transparent");
+       evas_object_size_hint_align_set(attach_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_size_hint_weight_set(attach_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
        Evas_Object* attach_icon = elm_image_add(entry_box_layout);
        evas_object_size_hint_align_set(attach_icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(attach_icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_image_file_set(attach_icon, ui_utils_get_resource(ATTACH_ICON), NULL);
-    elm_image_resizable_set(attach_icon, EINA_TRUE, EINA_TRUE);
+    elm_image_file_set(attach_icon, ui_utils_get_resource(TG_ATTACH_ICON), NULL);
     evas_object_show(attach_icon);
-    evas_object_smart_callback_add(attach_icon, "clicked", on_media_attach_clicked, chat_conv_list);
-       elm_object_part_content_set(entry_box_layout, "swallow.attach_icon", attach_icon);
+    evas_object_color_set(attach_icon, 45, 165, 224, 178);
+
+       Evas_Object* attach_pic_layout = elm_layout_add(ad->nf);
+       elm_layout_file_set(attach_pic_layout, edj_path, "circle_layout");
+       evas_object_size_hint_weight_set(attach_pic_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(attach_pic_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_show(attach_pic_layout);
+       elm_object_part_content_set(attach_pic_layout, "content", attach_icon);
+    elm_object_content_set(attach_btn, attach_pic_layout);
+
+    //evas_object_smart_callback_add(attach_btn, "clicked", on_media_attach_clicked, chat_conv_list);
+    evas_object_smart_callback_add(attach_btn, "pressed", on_message_smiley_pressed, attach_icon);
+    evas_object_smart_callback_add(attach_btn, "unpressed", on_message_smiley_unpressed, attach_icon);
+       elm_object_part_content_set(entry_box_layout, "swallow.attach_icon", attach_btn);
 
        Evas_Object* text_entry = elm_entry_add(entry_box_layout);
-       elm_object_part_text_set(text_entry, "elm.guide", "<font=Tizen:style=Italic color=#A8A8A8 valign=middle><font_size=35>Enter Message</font_size></font>");
+       elm_object_part_text_set(text_entry, "elm.guide", "<font=Tizen:style=Italic color=#A8A8A8 valign=middle><font_size=35>Text message</font_size></font>");
        elm_entry_line_wrap_set(text_entry, EINA_TRUE);
        evas_object_size_hint_align_set(text_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(text_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -2697,16 +2718,31 @@ void launch_messaging_view_cb(appdata_s* ad, int user_id)
        Evas_Object* smiley_icon = elm_image_add(entry_box_layout);
        evas_object_size_hint_align_set(smiley_icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(smiley_icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_image_file_set(smiley_icon, ui_utils_get_resource(SMILEY_ICON_UNPRESSED), NULL);
+
+       elm_image_file_set(smiley_icon, ui_utils_get_resource(TG_SMILEY_ICON), NULL);
+
     elm_image_resizable_set(smiley_icon, EINA_TRUE, EINA_TRUE);
     evas_object_show(smiley_icon);
-    elm_object_content_set(smiley_btn, smiley_icon);
+    evas_object_color_set(smiley_icon, 45, 165, 224, 178);
+
+       Evas_Object* smiley_pic_layout = elm_layout_add(ad->nf);
+       elm_layout_file_set(smiley_pic_layout, edj_path, "circle_layout");
+       evas_object_size_hint_weight_set(smiley_pic_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(smiley_pic_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_show(smiley_pic_layout);
+       elm_object_part_content_set(smiley_pic_layout, "content", smiley_icon);
+
+    elm_object_content_set(smiley_btn, smiley_pic_layout);
+
     evas_object_smart_callback_add(smiley_btn, "clicked", on_message_smiley_clicked, text_entry);
+
+
     evas_object_smart_callback_add(smiley_btn, "pressed", on_message_smiley_pressed, smiley_icon);
     evas_object_smart_callback_add(smiley_btn, "unpressed", on_message_smiley_unpressed, smiley_icon);
-       elm_object_part_content_set(entry_box_layout, "swallow.smiely_icon", smiley_btn);
 
 
+    elm_object_part_content_set(entry_box_layout, "swallow.smiely_icon", smiley_btn);
+
        Evas_Object* send_btn = elm_button_add(entry_box_layout);
        elm_object_style_set(send_btn, "transparent");
        evas_object_size_hint_align_set(send_btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -2715,15 +2751,21 @@ void launch_messaging_view_cb(appdata_s* ad, int user_id)
        Evas_Object* send_icon = elm_image_add(entry_box_layout);
        evas_object_size_hint_align_set(send_icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(send_icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_image_file_set(send_icon, ui_utils_get_resource(SEND_PRESSED_ICON), NULL);
-    elm_image_resizable_set(send_icon, EINA_TRUE, EINA_TRUE);
+    elm_image_file_set(send_icon, ui_utils_get_resource(TG_SEND_ICON), NULL);
     evas_object_show(send_icon);
+    evas_object_color_set(send_icon, 45, 165, 224, 178);
+       Evas_Object* send_pic_layout = elm_layout_add(ad->nf);
+       elm_layout_file_set(send_pic_layout, edj_path, "circle_layout");
+       evas_object_size_hint_weight_set(send_pic_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(send_pic_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_show(send_pic_layout);
+       elm_object_part_content_set(send_pic_layout, "content", send_icon);
 
-    elm_object_content_set(send_btn, send_icon);
+    elm_object_content_set(send_btn, send_pic_layout);
 
     evas_object_smart_callback_add(send_btn, "clicked", on_text_message_send_clicked, chat_conv_list);
-    evas_object_smart_callback_add(send_btn, "pressed", on_text_message_send_pressed, send_icon);
-    evas_object_smart_callback_add(send_btn, "unpressed", on_text_message_send_unpressed, send_icon);
+    evas_object_smart_callback_add(send_btn, "pressed", on_message_smiley_pressed, send_icon);
+    evas_object_smart_callback_add(send_btn, "unpressed", on_message_smiley_unpressed, send_icon);
        elm_object_part_content_set(entry_box_layout, "swallow.send_icon", send_btn);
 
        //elm_object_part_content_set(layout, "swallow.entry_box", entry_box_layout);

diff --git a/TelegramTizen/tg_utils/tg_common.h b/TelegramTizen/tg_utils/tg_common.h
index 17e6060..72c7496 100644 (file)
--- a/TelegramTizen/tg_utils/tg_common.h
+++ b/TelegramTizen/tg_utils/tg_common.h
@@ -51,11 +51,18 @@
 #define DEFAULT_LIST_THUMB_MULTI_PIC       FM_ICON_PATH"telegram_list_thumb_image_multi.png"
 #define FM_ICON_ROBO_BUDDY       FM_ICON_PATH"robo_buddy.png"
 #define SEARCH_ICON FM_ICON_PATH"/search_icon.png"
-#define ATTACH_ICON FM_ICON_PATH"/ic_ab_attach.png"
-#define SMILEY_ICON_UNPRESSED FM_ICON_PATH"/ic_msg_panel_smiles_pressed.png"
-#define SMILEY_ICON_PRESSED FM_ICON_PATH"/ic_msg_panel_smiles_unpressed.png"
-#define SEND_UNPRESSED_ICON FM_ICON_PATH"/ic_send_pressed.png"
-#define SEND_PRESSED_ICON FM_ICON_PATH"/ic_send_unpressed.png"
+#define TG_ATTACH_ICON FM_ICON_PATH"/telegram_add_object.png"
+
+//#define SMILEY_ICON_UNPRESSED FM_ICON_PATH"/ic_msg_panel_smiles_pressed.png"
+//#define SMILEY_ICON_PRESSED FM_ICON_PATH"/ic_msg_panel_smiles_unpressed.png"
+
+#define TG_SMILEY_ICON FM_ICON_PATH"/telegram_emotion.png"
+
+//#define SEND_UNPRESSED_ICON FM_ICON_PATH"/ic_send_pressed.png"
+//#define SEND_PRESSED_ICON FM_ICON_PATH"/ic_send_unpressed.png"
+
+#define TG_SEND_ICON FM_ICON_PATH"/telegram_send.png"
+
 #define CHAT_BG FM_ICON_PATH"/chat_bg.jpg"
 #define BLUR_BG FM_ICON_PATH"/blur_img.png"
 #define CAMERA_ICON FM_ICON_PATH"/camera-icon.png"