Fixed TSAM-8887 Changed Search View Layout

Change-Id: I31ac4c4270cbf8d92730c20fe9f9fdfc574a273a
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/inc/mf-conf.h b/inc/mf-conf.h
index 412b976..c12c908 100755 (executable)
--- a/inc/mf-conf.h
+++ b/inc/mf-conf.h
@@ -19,7 +19,7 @@
 #define __DEF_MYFILE_CONF_H_
 
 
-#define MYFILE_STRING_PACKAGE                          "myfile"
+#define MYFILE_STRING_PACKAGE  "myfile"
 #define MYFILE_PACKAGE                 "My Files"
 #define PKGNAME_MYFILE                 "org.tizen.myfile"
 #define PKGNAME_SYSTEM                 "sys_string"

diff --git a/inc/mf-util.h b/inc/mf-util.h
index 77017d4..b4401cf 100755 (executable)
--- a/inc/mf-util.h
+++ b/inc/mf-util.h
@@ -30,9 +30,9 @@
 #include "mf-media-types.h"
 #include "mf-object-conf.h"
 
-#define MF_ICON_SOFT_SEARCH_BACK "myfile_icon_soft_search_back.png"
-#define MF_ICON_SOFT_SEARCH_CANCEL                     "T01_2_button_expand_cancel.png"
-#define MF_ICON_SOFT_BACK                      "myfile_icon_soft_back.png"
+#define MF_ICON_SOFT_SEARCH_BACK               "myfile_icon_soft_search_back.png"
+#define MF_ICON_SOFT_SEARCH_CANCEL             "T01_2_button_expand_cancel.png"
+#define MF_ICON_SOFT_BACK                              "myfile_icon_soft_back.png"
 #define MF_SCALE_FACTORY    elm_config_scale_get()
 #define SAFE_FREE_CHAR(x) do {\
                                        if ((x) != NULL) {\

diff --git a/res/edje/edc_common.h b/res/edje/edc_common.h
index ea35158..e6085c3 100755 (executable)
--- a/res/edje/edc_common.h
+++ b/res/edje/edc_common.h
@@ -38,8 +38,7 @@
 #define SEARCHBAR_RIGHT_PADDING_INC 16*LITE_SCALE_W
 #define SEARCHBAR_HEIGHT_INC        72*LITE_SCALE_H
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 0 //72*LITE_SCALE_W
-#define SEARCHBAR_BACKGROUND_COLOR 34 44 71 255
-#define SEARCHBAR_BG_COLOR 5 90 118 255
+#define SEARCHBAR_BG_COLOR 0 0 0 0
 #define SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 10*LITE_SCALE_W
 
 /********* top layout ****************/

diff --git a/res/edje/icon/T01_2_button_expand_cancel.png b/res/edje/icon/T01_2_button_expand_cancel.png
index 7dfcde3..90221a4 100644 (file)
Binary files a/res/edje/icon/T01_2_button_expand_cancel.png and b/res/edje/icon/T01_2_button_expand_cancel.png differ

diff --git a/res/edje/icon/myfile_icon_soft_search_back.png b/res/edje/icon/myfile_icon_soft_search_back.png
index 7a548a4..d708747 100644 (file)
Binary files a/res/edje/icon/myfile_icon_soft_search_back.png and b/res/edje/icon/myfile_icon_soft_search_back.png differ

diff --git a/res/edje/myfile.edc b/res/edje/myfile.edc
index 95a0ac8..78aef20 100644 (file)
--- a/res/edje/myfile.edc
+++ b/res/edje/myfile.edc
@@ -1692,11 +1692,10 @@ group {
                        {
                                state: "default" 0.0;
                                visible: 1;
-                               min: 0 58;
+                               min: 0 110;
                                rel1 { relative: 0.0 0.0;}
                                rel2 { relative: 1.0 1.0;}
-                               //color: SEARCHBAR_BG_COLOR;
-                               color: 255 255 255 255;
+                               color: SEARCHBAR_BG_COLOR;
                        }
                }
 
@@ -1709,7 +1708,6 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.5;
-                               //min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
                                        relative: 0.1 0.0;
@@ -1719,15 +1717,14 @@ group {
                                rel2
                                {
                                        relative: 1.0 1.0;
-                                       offset: -10 -10;
+                                       offset: -32 -10;
                                        to: "bg";
                                }
-                               color:0 0 0 255;
+                               color: SEARCHBAR_BG_COLOR;
                        }
                        description {
                                state: "landscape" 0.0;
                                align: 0.0 0.5;
-                               //min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
                                        relative: 0.05 0.0;
@@ -1737,10 +1734,29 @@ group {
                                rel2
                                {
                                        relative: 1.0 1.0;
-                                       offset: -10 -10;
+                                       offset: -32 -10;
                                        to: "bg";
                                }
-                               color:0 0 0 255;
+                               color: SEARCHBAR_BG_COLOR;
+                       }
+               }
+
+               part {
+                       name: "bottom_border";
+                       type: RECT;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       relative: 0.0 1.0;
+                                       offset: 0 0;
+                                       to: "outer_rect_search";
+                               }
+                               rel2 {
+                                       relative: 1.0 1.0;
+                                       offset: 0 2;
+                                       to: "outer_rect_search";
+                               }
+                               color: 255 255 255 255;
                        }
                }
 
@@ -1753,7 +1769,6 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.5;
-                               //min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
                                        relative: 0.0 0.0;
@@ -1766,7 +1781,7 @@ group {
                                        offset: -3 -3;
                                        to: "outer_rect_search";
                                }
-                               color:255 255 255 255;
+                               color: SEARCHBAR_BG_COLOR;
                        }
                }
 
@@ -1779,8 +1794,6 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.5;
-                               //fixed: 1 1;
-                               //min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
                                        relative: 0.0 0.0;
@@ -1790,14 +1803,11 @@ group {
                                rel2
                                {
                                        relative: 0.9 1.0;
-                                       //offset: -3 -3;
                                        to: "inner_rect_search";
                                }
                        }
                        description {
                                state: "landscape" 0.0;
-                               //align: 0.0 0.5;
-                               //fixed: 1 1;
                                min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
@@ -1808,7 +1818,6 @@ group {
                                rel2
                                {
                                        relative: 0.95 1.0;
-                                       //offset: -3 -3;
                                        to: "inner_rect_search";
                                }
                        }
@@ -1821,7 +1830,6 @@ group {
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
-               //              min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
                                        relative: 0.9 0.0;
@@ -1833,13 +1841,11 @@ group {
                                        offset: -3 -3;
                                        to: "inner_rect_search";
                                }
-                       //      min: 50 50;
                        }
                        description {
                                state: "landscape" 0.0;
                                align: 1 0;
                                fixed: 1 1;
-                       //      min: 0 SEARCHBAR_HEIGHT_INC;
                                rel1
                                {
                                        relative: 0.94 0.0;
@@ -1852,7 +1858,6 @@ group {
                                        offset: -3 -3;
                                        to: "inner_rect_search";
                                }
-                       //      min: 50 50;
                        }
                }
                part

diff --git a/src/widget/mf-search-view.c b/src/widget/mf-search-view.c
index 362e229..1095292 100755 (executable)
--- a/src/widget/mf-search-view.c
+++ b/src/widget/mf-search-view.c
@@ -144,15 +144,19 @@ Evas_Object *mf_search_view_create_search_bar(Evas_Object * parent, void *data)
 
        elm_layout_file_set(sb, edj_path, "myfile_search_layout");
        //elm_layout_theme_set(sb, "layout", "searchbar", "cancel_button");
+       char search_txt[1024] = {0, };
+       char *search_fmt = "<color=#FFFFFFFF>%s";
+       snprintf(search_txt, 1024, search_fmt, dgettext(MYFILE_STRING_PACKAGE, "IDS_COM_BODY_SEARCH"));
 
        en = elm_entry_add(sb);
-       elm_object_domain_translatable_part_text_set(en, "elm.guide", MYFILE_STRING_PACKAGE, "IDS_COM_BODY_SEARCH");
+       elm_object_domain_translatable_part_text_set(en, "elm.guide", MYFILE_STRING_PACKAGE, search_txt);
 
        elm_entry_input_panel_return_key_type_set(en, ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH);
 
        elm_entry_scrollable_set(en, EINA_TRUE);
        elm_entry_single_line_set(en, EINA_TRUE);
        elm_entry_cnp_mode_set(en, ELM_CNP_MODE_PLAINTEXT);
+       elm_entry_text_style_user_push(en, "DEFAULT='color=#ffffffff'");
        elm_object_part_content_set(sb, "elm.swallow.content", en);
 
        elm_entry_prediction_allow_set(en, EINA_FALSE);