ALL PAGES Landscape Mode, Home/Apps/Menu Buttons

This patch modifies ALL PAGES in landscape mode and home/apps/menu buttons.

Change-Id: Ia96a9e80e4eb1c78ac3d6bd61142cdb67abac110
Signed-off-by: prachi kumar <prachi.kumar@samsung.com>

diff --git a/inc/conf.h b/inc/conf.h
index f9328f7..a0304db 100755 (executable)
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -98,12 +98,14 @@ extern int __conf_get_cluster_all_page_w();
 #define CLUSTER_VIEW_H_COMMON ((1280) * (__conf_get_resolution_scale_h()))
 #define CLUSTER_W ((708) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_H CLUSTER_W
-#define CLUSTER_ALL_PAGE_W (__conf_get_cluster_all_page_w())
-#define CLUSTER_ALL_PAGE_H CLUSTER_ALL_PAGE_W
-#define CLUSTER_ALL_PAGE_GAP_H ((100) * (__conf_get_resolution_scale_h()))
-#define CLUSTER_ALL_PAGE_GAP_W ((16) * (__conf_get_resolution_scale_w()))
-#define CLUSTER_ALL_PAGE_PADDING_SIDE ((32) * (__conf_get_resolution_scale_w()))
-#define CLUSTER_ALL_PAGE_PADDING_TOP ((60) * (__conf_get_resolution_scale_h()))
+
+#define CLUSTER_ALL_PAGE_W 357
+#define CLUSTER_ALL_PAGE_H 256
+#define CLUSTER_ALL_PAGE_GAP_H 16
+#define CLUSTER_ALL_PAGE_GAP_W 16
+#define CLUSTER_ALL_PAGE_PADDING_SIDE 88
+#define CLUSTER_ALL_PAGE_PADDING_TOP 96
+
 #define CLUSTER_DELETE_BUTTON_W ((60) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_DELETE_BUTTON_H CLUSTER_DELETE_BUTTON_W
 #define CLUSTER_EDIT_LEFT_SCROLL_REGION ((72) * (__conf_get_resolution_scale_w()))

diff --git a/res/edje/cluster_allpage_thumbnail.edc b/res/edje/cluster_allpage_thumbnail.edc
index 9d8deaf..3adce11 100755 (executable)
--- a/res/edje/cluster_allpage_thumbnail.edc
+++ b/res/edje/cluster_allpage_thumbnail.edc
@@ -39,15 +39,14 @@ collections {
                                        state: "hide" 0.0;
                                        inherit: "default" 0.0;
                                        color: 0 0 0 0;
-                                       visible: 0;
                                }
                        }
                        part { name: CLUSTER_ALLPAGE_ADD_BUTTON;
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1{relative: 0.375 0.375; to: "bg";}
-                                       rel2{relative: 0.625 0.625; to: "bg";}
+                                       rel1{relative: 0.442 0.421; to: "bg";}
+                                       rel2{relative: 0.554 0.578; to: "bg";}
                                        visible: 0;
                                        aspect: 1.0 1.0;
                                        aspect_preference: BOTH;
@@ -118,8 +117,8 @@ collections {
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1{relative: 0.031 0.031; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
-                                       rel2{relative: 0.218 0.218; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
+                                       rel1{relative: 0.028 0.035; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
+                                       rel2{relative: 0.140 0.191; to: CLUSTER_ALLPAGE_THUMBNAIL_IMAGE;}
                                        color: 255 255 255 0;
                                        visible: 0;
                                        aspect: 1.0 1.0;
@@ -199,25 +198,31 @@ collections {
                                name: "add_button_mouse_up";
                                signal: "mouse,up,1";
                                source: "cluster_allpage_add_button_touch_rect";
-                               action: STATE_SET "show" 0.0;
-                               target: CLUSTER_ALLPAGE_ADD_BUTTON;
+                               script{
+                                       set_state(PART:CLUSTER_ALLPAGE_ADD_BUTTON, "show", 0.0);
+                                       set_state(PART:"bg", "hide", 0.0);
+                               }
                        }
                        program {
                                name: "add_button_show";
                                signal: SIGNAL_ALLPAGE_ADD_BUTTON_SHOW;
                                source: SIGNAL_SOURCE;
-                               action: STATE_SET "show" 0.0;
-                               target: CLUSTER_ALLPAGE_ADD_BUTTON;
-                               target: "cluster_allpage_add_button_touch_rect";
+                               script{
+                                       set_state(PART:CLUSTER_ALLPAGE_ADD_BUTTON, "show", 0.0);
+                                       set_state(PART:"cluster_allpage_add_button_touch_rect", "show", 0.0);
+                                       set_state(PART:"bg", "hide", 0.0);
+                               }
                                transition: DECELERATE ANIMATION_RESIZE_TIME;
                        }
                        program {
                                name: "add_button_hide";
                                signal: SIGNAL_ALLPAGE_ADD_BUTTON_HIDE;
                                source: SIGNAL_SOURCE;
-                               action: STATE_SET "default" 0.0;
-                               target: CLUSTER_ALLPAGE_ADD_BUTTON;
-                               target: "cluster_allpage_add_button_touch_rect";
+                               script{
+                                       set_state(PART:CLUSTER_ALLPAGE_ADD_BUTTON, "default", 0.0);
+                                       set_state(PART:"cluster_allpage_add_button_touch_rect", "default", 0.0);
+                                       set_state(PART:"bg", "hide", 0.0);
+                               }
                                transition: DECELERATE ANIMATION_RESIZE_TIME;
                        }
                        program {
@@ -236,4 +241,4 @@ collections {
                        }
                }
        }
-}
\ No newline at end of file
+}

diff --git a/res/edje/home_btn.edc b/res/edje/home_btn.edc
index 3c6cd64..0b5a58c 100755 (executable)
--- a/res/edje/home_btn.edc
+++ b/res/edje/home_btn.edc
@@ -30,9 +30,9 @@ collections {
                                type: IMAGE;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1{relative: 0.044 0.928;}
-                                       rel2{relative: 0.223 0.986;}
-                                       color: 0 0 0 40;
+                                       rel1{relative: 0.018 0.922;}
+                                       rel2{relative: 0.082 0.988;}
+                                       color: 0 0 0 102;
                                        visible: 1;
                                        image {
                                                normal: "home_button_bg.png";
@@ -60,8 +60,8 @@ collections {
                                mouse_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1{relative: 0.27 0.1; to:MENU_BUTTON;}
-                                       rel2{relative: 0.73 0.9; to:MENU_BUTTON;}
+                                       rel1{relative: 0.317 0.312; to:MENU_BUTTON;}
+                                       rel2{relative: 0.682 0.687; to:MENU_BUTTON;}
                                        color: 255 255 255 255;
                                        visible: 1;
                                        image {
@@ -83,9 +83,9 @@ collections {
                                type: IMAGE;
                                description {state: "default" 0.0;
                                        align: 0 0;
-                                       rel1{relative: 0.776 0.928;}
-                                       rel2{relative: 0.955 0.986;}
-                                       color: 0 0 0 40;
+                                       rel1{relative: 0.917 0.922;}
+                                       rel2{relative: 0.981 0.988;}
+                                       color: 0 0 0 102;
                                        visible: 1;
                                        image {
                                                normal: "home_button_bg.png";
@@ -113,8 +113,8 @@ collections {
                                mouse_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1{relative: 0.27 0.1; to:HOME_BUTTON;}
-                                       rel2{relative: 0.73 0.9; to:HOME_BUTTON;}
+                                       rel1{relative: 0.341 0.229; to:HOME_BUTTON;}
+                                       rel2{relative: 0.646 0.75; to:HOME_BUTTON;}
                                        color: 255 255 255 0;
                                        visible: 1;
                                        image {
@@ -136,8 +136,8 @@ collections {
                                mouse_events: 0;
                                description { state: "default" 0.0;
                                        align: 0 0;
-                                       rel1{relative: 0.27 0.1; to:HOME_BUTTON;}
-                                       rel2{relative: 0.73 0.9; to:HOME_BUTTON;}
+                                       rel1{relative: 0.341 0.229; to:HOME_BUTTON;}
+                                       rel2{relative: 0.646 0.75; to:HOME_BUTTON;}
                                        color: 255 255 255 255;
                                        visible: 1;
                                        image {

diff --git a/res/images/home_button_apps.png b/res/images/home_button_apps.png
index 968b1b2..377bdac 100755 (executable)
Binary files a/res/images/home_button_apps.png and b/res/images/home_button_apps.png differ

diff --git a/res/images/home_button_bg.png b/res/images/home_button_bg.png
index a505579..ec59e87 100755 (executable)
Binary files a/res/images/home_button_bg.png and b/res/images/home_button_bg.png differ

diff --git a/res/images/home_button_home.png b/res/images/home_button_home.png
index ec4cdcc..8ceaa5a 100755 (executable)
Binary files a/res/images/home_button_home.png and b/res/images/home_button_home.png differ

diff --git a/res/images/home_button_menu.png b/res/images/home_button_menu.png
index 75eed42..6bcd294 100755 (executable)
Binary files a/res/images/home_button_menu.png and b/res/images/home_button_menu.png differ

diff --git a/src/cluster_view.c b/src/cluster_view.c
index c303500..a9fbd3b 100755 (executable)
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -549,7 +549,7 @@ bool cluster_view_set_state(view_state_t state)
        } else if (state == VIEW_STATE_ADD_VIEWER) {
                add_widget_viewer_win_create();
        } else if (state == VIEW_STATE_ALL_PAGE) {
-               elm_win_indicator_mode_set(app_get_win(), ELM_WIN_INDICATOR_HIDE);
+               elm_win_indicator_mode_set(app_get_win(), ELM_WIN_INDICATOR_SHOW);
                app_btn_hide(HOMESCREEN_VIEW_HOME);
                page_indicator_hide(cluster_view_s.indicator);
 
@@ -954,17 +954,23 @@ static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h)
 {
        int row, col;
        int start_y = 0;
-       if (cluster_view_s.page_count < 2) {
+       if (cluster_view_s.page_count < 3) {
                start_y = (WINDOW_H - CLUSTER_ALL_PAGE_H) / 2;
-       } else if (cluster_view_s.page_count < 4) {
+       } else if (cluster_view_s.page_count < 7) {
                start_y = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 2 + CLUSTER_ALL_PAGE_GAP_H)) / 2;
        } else {
                start_y = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 3 + CLUSTER_ALL_PAGE_GAP_H * 2)) / 2;
        }
-       row = page_idx / 2;
-       col = page_idx % 2;
+       row = page_idx / 3;
+       col = page_idx % 3;
 
-       *w = CLUSTER_ALL_PAGE_PADDING_SIDE + (col * (CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W));
+       if (page_idx < 1 && cluster_view_s.page_count < 2) {
+               *w =(WINDOW_W-(2*CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W))/2;
+       } else if(page_idx < 2 && cluster_view_s.page_count < 2) {
+               *w =(WINDOW_W-(2*CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W))/2 + CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W;
+       } else {
+               *w = CLUSTER_ALL_PAGE_PADDING_SIDE + (col * (CLUSTER_ALL_PAGE_W + CLUSTER_ALL_PAGE_GAP_W));
+       }
        *h = start_y + (row * (CLUSTER_ALL_PAGE_H + CLUSTER_ALL_PAGE_GAP_H));
 }
 
@@ -973,9 +979,9 @@ static int __cluster_view_allpage_get_page_index(int x, int y)
        int idx = 0;
        int sx = CLUSTER_ALL_PAGE_PADDING_SIDE;
        int sy = 0;
-       if (cluster_view_s.page_count < 2) {
+       if (cluster_view_s.page_count < 3) {
                sy = (WINDOW_H - CLUSTER_ALL_PAGE_H) / 2;
-       } else if (cluster_view_s.page_count < 4) {
+       } else if (cluster_view_s.page_count < 7) {
                sy = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 2 + CLUSTER_ALL_PAGE_GAP_H)) / 2;
        } else {
                sy = (WINDOW_H - (CLUSTER_ALL_PAGE_H * 3 + CLUSTER_ALL_PAGE_GAP_H * 2)) / 2;
@@ -984,14 +990,14 @@ static int __cluster_view_allpage_get_page_index(int x, int y)
        int h = CLUSTER_ALL_PAGE_H + CLUSTER_ALL_PAGE_GAP_H;
 
        for (idx = 0; idx < cluster_view_s.page_count; idx++) {
-               int row = idx / 2;
-               int col = idx % 2;
+               int row = idx / 3;
+               int col = idx % 3;
                int ny = sy + (row * h) + (CLUSTER_ALL_PAGE_H / 2);
                int nx = sx + (col * w) + (CLUSTER_ALL_PAGE_W / 2);
 
                int d = (ny - y) * (ny - y) + (nx - x) * (nx - x);
                if (d < CLUSTER_VIEW_ALLPAGE_MOVE_GAP) {
-                       return (row * 2) + col;
+                       return (row * 3) + col;
                }
        }