This patch performs following tasks-

1)Corrects distances between icons, icons' size according to GUI guide.
2)Corrects distances between icons inside folder popup according to GUI guide.
3)Changes folder icon, "app uninstallation" icon
4)Resolves drag and drop issue for third row.

Change-Id: I1ed20d72c691d5c0e64de291ed7a08abf9a1b7de
Signed-off-by: Jagrat Patidar <j1.patidar@samsung.com>

diff --git a/inc/conf.h b/inc/conf.h
old mode 100755 (executable)
new mode 100644 (file)
index 86d018a..66e404a
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -77,17 +77,17 @@ extern int __conf_get_cluster_all_page_w();
 #define APPS_VIEW_H ((1280) * (__conf_get_resolution_scale_h()))
 #define APPS_VIEW_ANIMATION_DELTA ((100) * (__conf_get_resolution_scale_h()))
 
-#define APPS_VIEW_ICON_COMMON_IMAGE 84
-#define APPS_VIEW_ICON_IMAGE 84
+#define APPS_VIEW_ICON_COMMON_IMAGE 88
+#define APPS_VIEW_ICON_IMAGE 88
 
-#define APPS_VIEW_ICON_CONTENT_WIDTH 144
-#define APPS_VIEW_ICON_CONTENT_HEIGHT 152
+#define APPS_VIEW_ICON_CONTENT_WIDTH 196
+#define APPS_VIEW_ICON_CONTENT_HEIGHT 183
 
-#define APPS_VIEW_ICON_CONTENT_HORIZONTAL_DISTANCE 199
-#define APPS_VIEW_ICON_CONTENT_VERTICAL_DISTANCE 225
+#define APPS_VIEW_ICON_CONTENT_HORIZONTAL_DISTANCE 196
+#define APPS_VIEW_ICON_CONTENT_VERTICAL_DISTANCE 183
 
-#define APPS_VIEW_ICON_TEXT_SIZE_NORMAL 20
-#define APPS_VIEW_ICON_TEXT_SIZE_EDIT 19
+#define APPS_VIEW_ICON_TEXT_SIZE_NORMAL 14
+#define APPS_VIEW_ICON_TEXT_SIZE_EDIT 14
 #define APPS_VIEW_ICON_TEXT_COLOR_WHITE "FFFAFAFA"
 #define APPS_VIEW_ICON_TEXT_COLOR_BLACK "000000"
 

diff --git a/res/edje/app_icon.edc b/res/edje/app_icon.edc
old mode 100755 (executable)
new mode 100644 (file)
index 7a4ebe1..639cfa2
--- a/res/edje/app_icon.edc
+++ b/res/edje/app_icon.edc
@@ -32,11 +32,11 @@ images {
 styles {
        style{
                name: "icon_label";
-               base: "font=Tizen:style=Regular align=center color=#FFFAFAFA style=shadow, font_size=20 ellipsis=1.0 wrap=mixed";
+               base: "font=Tizen:style=Regular align=center color=#FFFAFAFA style=shadow, font_size=14 ellipsis=1.0 wrap=mixed";
        }
        style{
                name: "icon_label_edit";
-               base: "font=Tizen:style=Regular align=center color=#FFFAFAFA style=shadow, font_size=19 ellipsis=1.0 wrap=mixed";
+               base: "font=Tizen:style=Regular align=center color=#FFFAFAFA style=shadow, font_size=14 ellipsis=1.0 wrap=mixed";
        }
 }
 collections {
@@ -57,11 +57,11 @@ collections {
                                type: SWALLOW;
                                description {
                                        state: "default" 0.0;
-                                       rel1{relative: 30/144 8/152; to: SIZE_SETTER;}
-                                       rel2{relative: 114/144 92/152; to: SIZE_SETTER;}
+                                       rel1{relative: 0 7/183; to: SIZE_SETTER;}
+                                       rel2{relative: 88/196 95/183; to: SIZE_SETTER;}
                                        align: 0.5 0;
-                                       min: 84 84;
-                                       max: 84 84;
+                                       min: 88 88;
+                                       max: 88 88;
                                        fixed: 1 1;
                                }
                        } //APPS_ICON_CONTENT
@@ -264,13 +264,13 @@ collections {
                                scale: 0;
                                description {
                                        state: "default" 0.0;
-                                       rel1{relative: 0.145 0.08; to: SIZE_SETTER;}
-                                       rel2{relative: 0.355 0.27; to: SIZE_SETTER;}
+                                       rel1{relative: 0 7/183; to: SIZE_SETTER;}
+                                       rel2{relative: 24/196 31/183; to: SIZE_SETTER;}
                                        color: 255 255 255 0;
                                        visible: 0;
                                        aspect: 1.0 1.0;
-                                       min: 44 44;
-                                       max: 44 44;
+                                       min: 24 24;
+                                       max: 24 24;
                                        aspect_preference: BOTH;
                                        image {
                                                normal: "btn_delete_nor.png";

diff --git a/res/edje/apps_folder_popup.edc b/res/edje/apps_folder_popup.edc
old mode 100755 (executable)
new mode 100644 (file)
index 4154e42..9028be7
--- a/res/edje/apps_folder_popup.edc
+++ b/res/edje/apps_folder_popup.edc
@@ -23,7 +23,7 @@
                        state : "default" 0.0;\
                        fixed : 1 1;\
                        rel1 {\
-                               relative: num_x/APPS_FOLDER_COL num_y/APPS_FOLDER_ROW;\
+                               relative: (num_x/APPS_FOLDER_COL)+(70/728) num_y/APPS_FOLDER_ROW;\
                                to: APPS_FOLDER_CONTAINER;\
                        }\
                        rel2 {\
@@ -74,11 +74,10 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       rel1 {relative: 0.140 0.088; to:SIZE_SETTER;}
-                                       rel2 {relative: 0.859 0.811; to:SIZE_SETTER;}
+                                       rel1 {relative: 276/1280 117/720; to:SIZE_SETTER;}
+                                       rel2 {relative: 1004/1280 603/720; to:SIZE_SETTER;}
                                        image {
                                                normal: "folder_popup_bg.png";
-                                               border: 5 5 5 5;
                                        }
                                        color: 255 255 255 255;
                                }
@@ -89,40 +88,27 @@ collections {
                                repeat_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 {relative: 0.043 0.055; to:APPS_FOLDER_BG;}
-                                       rel2 {relative: 0.956 0.114; to:APPS_FOLDER_BG;}
+                                       rel1 {relative: 0.043 23/486; to:APPS_FOLDER_BG;}
+                                       rel2 {relative: 0.956 57/486; to:APPS_FOLDER_BG;}
                                        color: 255 255 255 255;
                                }
                        }
-                       part { name: APPS_FOLDER_SEPARATOR;
-                               type: RECT;
-                               mouse_events: 1;
-                               repeat_events: 0;
-                               description { state: "default" 0.0;
-                                       align: 0 0;
-                                       rel1 {relative: 0.043 0.173; to:APPS_FOLDER_BG;}
-                                       rel2 {relative: 0.956 0.176; to:APPS_FOLDER_BG;}
-                                       color: 77 231 255 255;
-                               }
-                       }
                        part { name: APPS_FOLDER_CONTAINER;
                                type: SPACER;
                                mouse_events: 1;
                                repeat_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 {relative: -0.02 0.233; to:APPS_FOLDER_BG;}
-                                       rel2 {relative: 1.02 0.96; to:APPS_FOLDER_BG;}
+                                       rel1 {relative: 70/728 87/486; to:APPS_FOLDER_BG;}
+                                       rel2 {relative: 658/728 460/486; to:APPS_FOLDER_BG;}
                                }
                        }
                        MAKE_TILE(0,0)
                        MAKE_TILE(1,0)
                        MAKE_TILE(2,0)
-                       MAKE_TILE(3,0)
                        MAKE_TILE(0,1)
                        MAKE_TILE(1,1)
                        MAKE_TILE(2,1)
-                       MAKE_TILE(3,1)
                        part { name: APPS_FOLDER_PLUS_ICON;
                                type: IMAGE;
                                mouse_events: 1;

diff --git a/res/edje/apps_view.edc b/res/edje/apps_view.edc
old mode 100755 (executable)
new mode 100644 (file)
index a03782e..0359d20
--- a/res/edje/apps_view.edc
+++ b/res/edje/apps_view.edc
@@ -47,9 +47,9 @@ collections {
                                description {
                                        state: "edit_done" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {relative :88/1280 80/720; to: SIZE_SETTER;}
-                                       rel2 {relative :1192/1280 645/720; to: SIZE_SETTER;}
-                                       color: 0 0 0 APPS_VIEW_BG_OPACITY;
+                                       rel1 {relative :0.0 0.0; to: SIZE_SETTER;}
+                                       rel2 {relative :1.0 1.0; to: SIZE_SETTER;}
+                                       color: 0 0 0 0;
                                        visible: 1;
                                }
                        }
@@ -66,8 +66,8 @@ collections {
                                description {
                                        state: "edit" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {relative :25/1104 13/529; to: SIZE_SETTER;}
-                                       rel2 {relative :1077/1104 516/529; to: SIZE_SETTER;}
+                                       rel1 {relative :0.0 0.0; to: SIZE_SETTER;}
+                                       rel2 {relative :1.0 1.0; to: SIZE_SETTER;}
                                }
                        }
                }

diff --git a/res/edje/apps_view_bg.edc b/res/edje/apps_view_bg.edc
old mode 100755 (executable)
new mode 100644 (file)
index 26ccb84..1cd368d
--- a/res/edje/apps_view_bg.edc
+++ b/res/edje/apps_view_bg.edc
@@ -49,7 +49,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       color: 0 0 0 APPS_VIEW_BG_OPACITY;
+                                       color: 0 0 0 0;
                                        rel1 {relative: 0.0 0.0; to:SIZE_SETTER;}
                                        rel2 {relative: 1.0 1.0; to:SIZE_SETTER;}
                                        visible: 0;
@@ -58,8 +58,8 @@ collections {
                                        state: "edit" 0.0;
                                        inherit: "default" 0.0;
                                        visible: 1;
-                                       rel1{relative: 88/1280 80/720; to: SIZE_SETTER;}
-                                       rel2{relative: 1192/1280 645/720; to: SIZE_SETTER;}
+                                       rel1{relative: 0.0 0.0; to: SIZE_SETTER;}
+                                       rel2{relative: 1.0 1.0; to: SIZE_SETTER;}
                                }
                                description {
                                        state: "hide" 0.0;

diff --git a/res/images/btn_delete_nor.png b/res/images/btn_delete_nor.png
index f18f449..26a92c7 100644 (file)
Binary files a/res/images/btn_delete_nor.png and b/res/images/btn_delete_nor.png differ

diff --git a/res/images/btn_delete_press.png b/res/images/btn_delete_press.png
index 2132f4e..26a92c7 100644 (file)
Binary files a/res/images/btn_delete_press.png and b/res/images/btn_delete_press.png differ

diff --git a/res/images/folder_appicon_bg.png b/res/images/folder_appicon_bg.png
old mode 100755 (executable)
new mode 100644 (file)
index 2100555..dab127d
Binary files a/res/images/folder_appicon_bg.png and b/res/images/folder_appicon_bg.png differ

diff --git a/res/images/folder_appicon_bg_possible.png b/res/images/folder_appicon_bg_possible.png
old mode 100755 (executable)
new mode 100644 (file)
index 038a971..dab127d
Binary files a/res/images/folder_appicon_bg_possible.png and b/res/images/folder_appicon_bg_possible.png differ

diff --git a/res/images/folder_popup_bg.png b/res/images/folder_popup_bg.png
index 8c5059d..d88d2c6 100644 (file)
Binary files a/res/images/folder_popup_bg.png and b/res/images/folder_popup_bg.png differ

diff --git a/src/apps_data.c b/src/apps_data.c
index dbd4bef..ffd82cc 100644 (file)
--- a/src/apps_data.c
+++ b/src/apps_data.c
@@ -30,7 +30,7 @@ static struct {
        .data_list = NULL
 };
 
-Eina_List *clone_data_list=NULL;
+static Eina_List *clone_data_list=NULL;
 
 static void __apps_data_print(Eina_List *list);
 static int __apps_data_sort_cb(const void *a , const void *b);

diff --git a/src/apps_view.c b/src/apps_view.c
index 96b6801..a6179cc 100644 (file)
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -565,8 +565,8 @@ bool apps_view_icon_set(app_data_t *item)
                }
                w = APPS_VIEW_ICON_CONTENT_HORIZONTAL_DISTANCE;
                h = APPS_VIEW_ICON_CONTENT_VERTICAL_DISTANCE;
-               x = APPS_VIEW_W * 0.07 + col * w;
-               y = APPS_VIEW_PADDING_TOP + APPS_VIEW_H * 0.12 + row * h;
+               x = APPS_VIEW_W * 0.083 + col * w;
+               y = APPS_VIEW_PADDING_TOP + APPS_VIEW_H * 0.127 + row * h;
                if (eina_list_count(apps_view_s.page_list) < page_index+1) {
                        page = __apps_view_add_page();
                } else
@@ -1075,15 +1075,6 @@ void apps_view_set_state(view_state_t state)
                        elm_object_signal_emit(apps_view_s.bg, SIGNAL_EDIT_MODE_ON_ANI, SIGNAL_SOURCE);
 
                Eina_List *find_list = NULL;
-               Evas_Object *page_ly;
-               int page_index = 0;
-               EINA_LIST_FOREACH(apps_view_s.page_list, find_list, page_ly) {
-                       if (page_index == apps_view_s.current_page)
-                               elm_object_signal_emit(page_ly, SIGNAL_EDIT_MODE_ON_ANI, SIGNAL_SOURCE);
-                       else
-                               elm_object_signal_emit(page_ly, SIGNAL_EDIT_MODE_ON, SIGNAL_SOURCE);
-                       page_index++;
-               }
 
                Eina_List *data_list = apps_data_get_list();
                app_data_t *item = NULL;
@@ -1289,7 +1280,7 @@ static void __apps_view_open_folder_popup(app_data_t *item)
        elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, &limit_filter);
 
        char style_string[STR_MAX] = { 0, };
-       snprintf(style_string, sizeof(style_string), "<font_size=40><color=#60606060><align=center>%s</align></color></font_size>", _("IDS_COM_HEADER_UNNAMED_FOLDER"));
+       snprintf(style_string, sizeof(style_string), "<font_size=28><color=#60606060><align=center>%s</align></color></font_size>", _("IDS_COM_HEADER_UNNAMED_FOLDER"));
        elm_object_part_text_set(entry, "elm.guide", style_string);
 
        elm_entry_input_panel_return_key_type_set(entry, ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
@@ -1299,7 +1290,7 @@ static void __apps_view_open_folder_popup(app_data_t *item)
        evas_object_smart_callback_add(entry, "unfocused", __apps_view_folder_entry_unfocused_cb, NULL);
        evas_object_smart_callback_add(entry, "maxlength,reached", __apps_view_folder_entry_maxlength_reached_cb, NULL);
 
-       elm_entry_text_style_user_push(entry, "DEFAULT='font=Tizen:style=Regular align=center color=#4DE7FFFF font_size=40 wrap=none'");
+       elm_entry_text_style_user_push(entry, "DEFAULT='font=Tizen:style=Regular align=center color=#000000 font_size=28 wrap=none'");
        elm_entry_entry_set(entry, apps_view_s.opened_folder->label_str);
        elm_object_part_content_set(apps_view_s.folder_popup_ly, APPS_FOLDER_TITLE, entry);
 
@@ -2038,16 +2029,16 @@ static void __apps_view_scroll_to_page(int page_idx, bool animation)
 static int __apps_view_get_index(int page_index, int x, int y)
 {
        int row, col;
-       int sx = APPS_VIEW_W * 0.07;
-       int sy = APPS_VIEW_PADDING_TOP + APPS_VIEW_H * 0.12;
+       int sx = APPS_VIEW_W * 0.083;
+       int sy = APPS_VIEW_PADDING_TOP + APPS_VIEW_H * 0.127;
        int w = (APPS_VIEW_W * 0.94) / APPS_VIEW_COL;
        int h = (APPS_VIEW_H * 0.94) / APPS_VIEW_ROW;
        int ROW_MAX = APPS_VIEW_ROW;
        int COL_MAX = APPS_VIEW_COL;
 
        if (_COMMON) {
-               w = (APPS_VIEW_W * 0.94) / APPS_VIEW_COL_COMMON;
-               h = (APPS_VIEW_H * 0.94) / APPS_VIEW_ROW_COMMON;
+               w = APPS_VIEW_ICON_CONTENT_HORIZONTAL_DISTANCE;
+               h = APPS_VIEW_ICON_CONTENT_VERTICAL_DISTANCE;
                ROW_MAX = APPS_VIEW_ROW_COMMON;
                COL_MAX = APPS_VIEW_COL_COMMON;
        }
@@ -2070,16 +2061,16 @@ static int __apps_view_get_index(int page_index, int x, int y)
 static void __apps_view_apps_position_change(int page_index, int x, int y)
 {
        int row, col;
-       int sx = APPS_VIEW_W * 0.07;
-       int sy = APPS_VIEW_PADDING_TOP + APPS_VIEW_H * 0.12;
+       int sx = APPS_VIEW_W * 0.083;
+       int sy = APPS_VIEW_PADDING_TOP + APPS_VIEW_H * 0.127;
        int w = (APPS_VIEW_W * 0.94) / APPS_VIEW_COL;
        int h = (APPS_VIEW_H * 0.94) / APPS_VIEW_ROW;
        int ROW_MAX = APPS_VIEW_ROW;
        int COL_MAX = APPS_VIEW_COL;
 
        if (_COMMON) {
-               w = (APPS_VIEW_W * 0.94) / APPS_VIEW_COL_COMMON;
-               h = (APPS_VIEW_H * 0.94) / APPS_VIEW_ROW_COMMON;
+               w = APPS_VIEW_ICON_CONTENT_HORIZONTAL_DISTANCE;
+               h = APPS_VIEW_ICON_CONTENT_VERTICAL_DISTANCE;
                ROW_MAX = APPS_VIEW_ROW_COMMON;
                COL_MAX = APPS_VIEW_COL_COMMON;
        }