Apps Folder Popup, Apps Chooser

Change-Id: I21648e288d5d13b29afc73fae0d3d7f7fd853167

diff --git a/inc/conf.h b/inc/conf.h
index 289f8de..4c76b73 100755 (executable)
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -95,8 +95,8 @@ extern int __conf_get_cluster_all_page_w();
 #define APPS_VIEW_EDIT_RIGHT_SCROLL_REGION (APPS_VIEW_W - APPS_VIEW_EDIT_LEFT_SCROLL_REGION)
 
 #define APPS_VIEW_EDIT_MOVE_GAP 2500
-#define APPS_VIEW_CHOOSER_TEXT_SIZE ((48) * (__conf_get_resolution_scale_h()))
-#define APPS_VIEW_CHOOSER_BUTTON_TEXT_SIZE ((32) * (__conf_get_resolution_scale_h()))
+#define APPS_VIEW_CHOOSER_TEXT_SIZE 36
+#define APPS_VIEW_CHOOSER_BUTTON_TEXT_SIZE 26
 #define APPS_VIEW_CHOOSER_TEXT "<font_size=%d>%s</font_size>"
 
 #define CLUSTER_VIEW_W ((720) * (__conf_get_resolution_scale_w()))
@@ -145,7 +145,7 @@ extern int __conf_get_cluster_all_page_w();
 #define ALLPAGE_MOVE_GAP 0.15
 #define MENU_W 720
 
-#define APPS_FOLDER_MAX_ITEM 9
+#define APPS_FOLDER_MAX_ITEM 8
 #define APPS_FOLDER_MAX_TITLE 30
 
 #define LONG_PRESS_TIME 0.75

diff --git a/inc/edc_conf.h b/inc/edc_conf.h
index 303dc87..0c9f2fe 100755 (executable)
--- a/inc/edc_conf.h
+++ b/inc/edc_conf.h
@@ -154,8 +154,8 @@
 
 #define GROUP_APPS_FOLDER_POPUP_LY "apps_folder_popup_ly"
 #define APPS_FOLDER_BG "apps_folder_bg"
-#define APPS_FOLDER_COL 3
-#define APPS_FOLDER_ROW 3
+#define APPS_FOLDER_COL 4
+#define APPS_FOLDER_ROW 2
 #define APPS_FOLDER_TITLE "apps_folder_title"
 #define APPS_FOLDER_SEPARATOR "apps_folder_separator"
 #define APPS_FOLDER_CONTAINER "apps_folder_container"

diff --git a/res/edje/apps_chooser_btn.edc b/res/edje/apps_chooser_btn.edc
index f6370cc..7aff976 100755 (executable)
--- a/res/edje/apps_chooser_btn.edc
+++ b/res/edje/apps_chooser_btn.edc
@@ -22,7 +22,7 @@ collections {
        styles {
                style{
                        name: "label";
-                       base: "font=Tizen:style=Regular align=center color=#FFFFFFFF font_size=26 ellipsis=1.0";
+                       base: "font=Tizen:style=Regular align=left color=#FFFAFAFA font_size=26 ellipsis=1.0";
                }
        }
        group { name: GROUP_APPS_CHOOSER_BTN_LY;
@@ -33,8 +33,8 @@ collections {
                                mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.0625;
+                                       rel1.relative: 0.0 0.01;
+                                       rel2.relative: 1.0 0.1;
                                }
                        }
                        part {
@@ -51,7 +51,7 @@ collections {
                                                style: label;
                                                text: "CANCEL";
                                        }
-                                       rel1 { relative: 0.0 0.0;to: "chooser_spacer"; }
+                                       rel1 { relative: 0.075 0.0;to: "chooser_spacer"; }
                                        rel2 { relative: 0.28 1.0;to: "chooser_spacer"; }
                                }
                                description {
@@ -92,7 +92,7 @@ collections {
                                                text: "0 Selected";
                                                style: label;
                                        }
-                                       rel1 { relative: 0.30 0.0;to: "chooser_spacer"; }
+                                       rel1 { relative: 0.429 0.0;to: "chooser_spacer"; }
                                        rel2 { relative: 0.70 1.0;to: "chooser_spacer"; }
                                }
                                description {
@@ -115,7 +115,7 @@ collections {
                                                style: label;
                                                text: "DONE";
                                        }
-                                       rel1 { relative: 0.72 0.0;to: "chooser_spacer"; }
+                                       rel1 { relative: 0.87 0.0;to: "chooser_spacer"; }
                                        rel2 { relative: 1.0 1.0;to: "chooser_spacer"; }
                                }
                                description {
@@ -180,4 +180,4 @@ collections {
                        }
                }
        }
-}
\ No newline at end of file
+}

diff --git a/res/edje/apps_folder_popup.edc b/res/edje/apps_folder_popup.edc
index e0d6b7c..3ae57a3 100755 (executable)
--- a/res/edje/apps_folder_popup.edc
+++ b/res/edje/apps_folder_popup.edc
@@ -74,8 +74,8 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        align: 0.0 0.0;
-                                       rel1 {relative: 0.04 0.2; to:SIZE_SETTER;}
-                                       rel2 {relative: 0.96 0.8; to:SIZE_SETTER;}
+                                       rel1 {relative: 0.140 0.088; to:SIZE_SETTER;}
+                                       rel2 {relative: 0.859 0.811; to:SIZE_SETTER;}
                                        image {
                                                normal: "folder_popup_bg.png";
                                                border: 5 5 5 5;
@@ -89,8 +89,8 @@ collections {
                                repeat_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 {relative: 0.08 0.02; to:APPS_FOLDER_BG;}
-                                       rel2 {relative: 0.92 0.12; to:APPS_FOLDER_BG;}
+                                       rel1 {relative: 0.043 0.075; to:APPS_FOLDER_BG;}
+                                       rel2 {relative: 0.956 0.134; to:APPS_FOLDER_BG;}
                                        color: 255 255 255 255;
                                }
                        }
@@ -100,8 +100,8 @@ collections {
                                repeat_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 {relative: 0.08 0.12; to:APPS_FOLDER_BG;}
-                                       rel2 {relative: 0.92 0.125; to:APPS_FOLDER_BG;}
+                                       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;
                                }
                        }
@@ -111,19 +111,18 @@ collections {
                                repeat_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1 {relative: 0.08 0.15; to:APPS_FOLDER_BG;}
-                                       rel2 {relative: 0.92 0.96; to:APPS_FOLDER_BG;}
+                                       rel1 {relative: -0.02 0.233; to:APPS_FOLDER_BG;}
+                                       rel2 {relative: 1.02 0.96; 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(0,2)
-                       MAKE_TILE(1,2)
-                       MAKE_TILE(2,2)
+                       MAKE_TILE(3,1)
                        part { name: APPS_FOLDER_PLUS_ICON;
                                type: IMAGE;
                                mouse_events: 1;
@@ -141,7 +140,10 @@ collections {
                                        image {
                                                normal: "btn_add_nor.png";
                                        }
-                                       fixed: 1 0;
+                                       fixed: 1 1;
+                                       min: 84 84;
+                                       max: 84 84;
+                                       color: 255 255 255 100;
                                }
                                description {
                                        state: "press" 0.0;

diff --git a/res/images/btn_add_nor.png b/res/images/btn_add_nor.png
index 65bce6b..323b4df 100755 (executable)
Binary files a/res/images/btn_add_nor.png and b/res/images/btn_add_nor.png differ

diff --git a/res/images/core_check_bg_stroke.png b/res/images/core_check_bg_stroke.png
index 54f7e13..f559433 100755 (executable)
Binary files a/res/images/core_check_bg_stroke.png and b/res/images/core_check_bg_stroke.png differ

diff --git a/res/images/core_check_icon.png b/res/images/core_check_icon.png
index 1ad477a..11583f7 100755 (executable)
Binary files a/res/images/core_check_icon.png and b/res/images/core_check_icon.png differ

diff --git a/res/images/folder_popup_bg.png b/res/images/folder_popup_bg.png
index 6a1c594..8c5059d 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_view.c b/src/apps_view.c
index ca178fe..9006b9f 100755 (executable)
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -302,7 +302,6 @@ void apps_view_folder_reroder(void)
        app_data_t *item = NULL;
        Eina_List *find_list;
        int item_count = 0;
-       double item_count_double = 0.0;
        if (!apps_view_s.opened_folder)
                return;
 
@@ -310,7 +309,6 @@ void apps_view_folder_reroder(void)
                if (item->parent_db_id == apps_view_s.opened_folder->db_id) {
                        apps_view_icon_set(item);
                        item_count++;
-                       item_count_double = item_count_double + 1.0;
                }
        }
 
@@ -320,7 +318,7 @@ void apps_view_folder_reroder(void)
                        return;
                }
                msg->count = 2;
-               msg->val[0] = item_count_double / APPS_FOLDER_COL;
+               msg->val[0] = item_count / APPS_FOLDER_COL;
                msg->val[1] = item_count % APPS_FOLDER_COL;
 
                if (apps_view_get_state() != VIEW_STATE_CHOOSER) {