[TIZEN_3.0 UX IMPL] Popup for volume and brightness.

Change-Id: I300ed169ab518a424f052709abe5770fd4fc82d7
Signed-off-by: Ravi Kiran K N <ravi.kiran@samsung.com>

diff --git a/playview/res/edje/pv-brightness-popup.edc b/playview/res/edje/pv-brightness-popup.edc
index c4c11ee..ba4232a 100644 (file)
--- a/playview/res/edje/pv-brightness-popup.edc
+++ b/playview/res/edje/pv-brightness-popup.edc
@@ -34,11 +34,11 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 1;
-                                       min: 116 572;
+                                       min: 58 286;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 0.5 0.5;}
-                                       rel2 { relative: 0.5 0.5;}
+                                       rel1 { relative: 0.0 0.0;}
+                                       rel2 { relative: 0.0 0.5;}
                                        color: 0 0 0 0;
                                }
                        }
@@ -51,11 +51,11 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 1;
-                                       min: 116 572;
+                                       min: 58 286;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 0.5 0.5;}
-                                       rel2 { relative: 0.5 0.5;}
+                                       rel1 { relative: 0.0 0.0;}
+                                       rel2 { relative: 0.0 0.5;}
                                        color: 255 255 255 255;
                                        image { normal: "volume/T01_2_volume_popup_bg.png"; border: 0 0 29 29;}
                                }
@@ -69,7 +69,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 0;
-                                       min: 0 24;
+                                       min: 0 12;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.bg";}
@@ -87,7 +87,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 1;
-                                       min: 45 45;
+                                       min: 22 22;
                                        fixed: 1 1;
                                        align: 0.5 0.0;
                                        rel1 { relative: 0.5 1.0; to_x: "pv.brightness.popup.bg"; to_y: "pv.brightness.popup.icon.padding";}
@@ -103,7 +103,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 0;
-                                       min: 0 8;
+                                       min: 0 11;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.icon";}
@@ -121,7 +121,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 0;
-                                       min: 0 32;
+                                       min: 0 18;
                                        fixed: 1 1;
                                        align: 0.0 1.0;
                                        rel1 { relative: 0.0 1.0; to: "pv.brightness.popup.bg";}
@@ -140,7 +140,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 1;
-                                       min: 0 46;
+                                       min: 0 23;
                                        fixed: 1 1;
                                        align: 0.5 1.0;
                                        rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.bottom.padding";}
@@ -149,7 +149,7 @@ collections {
                                        color3: 51 57 72 255;
                                        text {
                                                font: FONT_BOLD_TYPE;
-                                               size: 42;
+                                               size: 21;
                                                text: "3";
                                                align: 0.5 0.5;
                                        }
@@ -165,7 +165,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible : 0;
-                                       min: 0 0;
+                                       min: 0 11;
                                        fixed: 0 1;
                                        align: 0.0 1.0;
                                        rel1 { relative: 0.0 0.0; to: "pv.brightness.popup.txt";}
@@ -183,7 +183,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 1;
-                                       min: 19 0;
+                                       min: 6 0;
                                        fixed: 1 0;
                                        align: 0.5 0.5;
                                        rel1 { relative: 0.5 1.0; to_x : "pv.brightness.popup.bg";  to_y : "pv.brightness.popup.top.padding";}
@@ -253,13 +253,13 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 1;
-                                       min: 19 0;
+                                       min: 6 0;
                                        fixed: 1 0;
-                                       align: 0.5 0.0;
-                                       rel1 { relative: 0.5 0.0; to_x : "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.circle";}
-                                       rel2 { relative: 0.5 1.0; to_x : "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.bar.bg"; }
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 0.0 0.5; to_x : "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.circle"; }
+                                       rel2 { relative: 1.0 1.0; to_x : "pv.brightness.popup.bar.bg"; to_y: "pv.brightness.popup.bar.bg"; offset: 0 2; }
                                        color: 255 255 255 255;
-                                       image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 19 19;}
+                                       image { normal: "volume/T01_2_volume_popup_progress_bar.png"; border: 0 0 10 10;}
                                        color: 255 255 255 255;
                                }
                        }
@@ -271,8 +271,10 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 1;
-                                       rel1 { relative: 0.0 0.0;  to: "pv.brightness.popup.bar.rect"; }
-                                       rel2 { relative: 1.0 1.0;  to: "pv.brightness.popup.bar.rect"; }
+                                       align: 0.5 0.0;
+                                       min: 24 0;
+                                       rel1 { relative: 0.5 0.0;  to: "pv.brightness.popup.bar.bg"; offset: 0 -11; }
+                                       rel2 { relative: 0.5 1.0;  to: "pv.brightness.popup.bar.bg"; offset: 0 11; }
                                        color: 255 255 255 0;
                                }
                        }
@@ -285,7 +287,7 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: 49 49;
+                                       min: 24 24;
                                        fixed: 1 1;
                                        align: 0.5 0.5;
                                        rel1 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.playing"; }
@@ -301,11 +303,9 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: 49 0;
-                                       fixed: 1 0;
-                                       align: 0.5 0.0;
-                                       rel1 { relative: 0.5 0.0; to: "pv.brightness.popup.bar.rect"; }
-                                       rel2 { relative: 0.5 0.0; to: "pv.brightness.popup.bar.rect"; }
+                                       min: 24 24;
+                                       fixed: 0 0;
+                                       align: 0.0 0.0;
                                }
                                dragable {
                                        confine:  "pv.brightness.popup.confine.rect";
@@ -323,11 +323,11 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 1;
-                                       min: 49 49;
+                                       min: 24 24;
                                        fixed: 1 1;
                                        align: 0.5 0.5;
-                                       rel1 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.circle"; }
-                                       rel2 { relative: 0.5 0.5; to_x: "pv.brightness.popup.bar.rect"; to_y: "pv.brightness.popup.circle"; }
+                                       rel1 { relative: 0.5 0.5; to: "pv.brightness.popup.playing"; }
+                                       rel2 { relative: 0.5 0.5; to: "pv.brightness.popup.playing"; }
                                        image { normal: "volume/T01_2_volume_popup_progress_handle.png";}
                                        color: 255 255 255 255;
                                }

diff --git a/playview/src/view/vp-play-normal-view.c b/playview/src/view/vp-play-normal-view.c
index 13088c1..2fea1bc 100644 (file)
--- a/playview/src/view/vp-play-normal-view.c
+++ b/playview/src/view/vp-play-normal-view.c
@@ -2037,10 +2037,10 @@ static Eina_Bool __vp_normal_momentum_press_timer_cb(void *pUserData)
 #endif
 
        pNormalView->pMomentTimer = NULL;
-       bool bVolumeMode = FALSE;
+       bool bVolumeMode = TRUE;
 
        if (pNormalView->nGestureStartPosX < (pNormalView->nWindowWidth / 2)) {
-               bVolumeMode = TRUE;
+               bVolumeMode = FALSE;
        }
 
        if (bVolumeMode) {
@@ -2099,7 +2099,7 @@ static Evas_Event_Flags __vp_normal_gesture_momentum_start_cb(void *pUserData, v
 
        if (pNormalView->bZoomEnable == FALSE) {
 #ifdef ENABLE_VOLUME_BRIGHTNESS_POPUP
-               bool bVolumeMode = FALSE;
+               bool bVolumeMode = TRUE;
                int nMaxVal = 0;
                int nMinVal = 0;
 
@@ -2107,7 +2107,7 @@ static Evas_Event_Flags __vp_normal_gesture_momentum_start_cb(void *pUserData, v
                pNormalView->nMomentWeight = 0;
 
                if (p->x1 < (pNormalView->nWindowWidth / 2)) {
-                       bVolumeMode = TRUE;
+                       bVolumeMode = FALSE;
                }
 
                bool bIsVolumeRealize = FALSE;
@@ -2199,7 +2199,7 @@ static Evas_Event_Flags __vp_normal_gesture_momentum_move_cb(void *pUserData, vo
 
        if (pNormalView->bZoomEnable == FALSE) {
 #ifdef ENABLE_VOLUME_BRIGHTNESS_POPUP
-               if (pNormalView->pMomentTimer ||
+               if (!pNormalView->pMomentTimer ||
                        pNormalView->bLockScreen) {
                        return EVAS_EVENT_FLAG_NONE;
                }
@@ -2209,13 +2209,13 @@ static Evas_Event_Flags __vp_normal_gesture_momentum_move_cb(void *pUserData, vo
                }
 
                int nDiff = 0;
-               bool bVolumeMode = FALSE;
+               bool bVolumeMode = TRUE;
                if (pNormalView->nMomentStep <= 0) {
                        pNormalView->nMomentStep = 1;
                }
 
                if (p->x1 < (pNormalView->nWindowWidth / 2)) {
-                       bVolumeMode = TRUE;
+                       bVolumeMode = FALSE;
                }
 
                bool bIsVolumeRealize = FALSE;

diff --git a/playview/src/widget/vp-play-brightness-popup.c b/playview/src/widget/vp-play-brightness-popup.c
index 6e6d495..6f4ba14 100644 (file)
--- a/playview/src/widget/vp-play-brightness-popup.c
+++ b/playview/src/widget/vp-play-brightness-popup.c
@@ -33,14 +33,14 @@
 
 #define VP_BRIGHTNESS_HIDE_LAYOUT_TIMER_INTERVAL       5.0
 
-
-#define VP_BRIGHTNESS_PORTRAIT_POS_X   128
-#define VP_BRIGHTNESS_PORTRAIT_POS_Y   275
+#define VP_BRIGHTNESS_PORTRAIT_POS_X   275
+#define VP_BRIGHTNESS_PORTRAIT_POS_Y   150
 #define VP_BRIGHTNESS_PORTRAIT_HEIGHT  572
 
-#define VP_BRIGHTNESS_LANDSCAPE_POS_X  135
-#define VP_BRIGHTNESS_LANDSCAPE_POS_Y  67
-#define VP_BRIGHTNESS_LANDSCAPE_HEIGHT 572
+#define VP_BRIGHTNESS_LANDSCAPE_POS_X  450
+#define VP_BRIGHTNESS_LANDSCAPE_POS_Y  0
+#define VP_BRIGHTNESS_LANDSCAPE_HEIGHT 440
+
 
 #define VP_BRIGHTNESS_TEXT_MAX_LEN     4
 

diff --git a/playview/src/widget/vp-play-volume-popup.c b/playview/src/widget/vp-play-volume-popup.c
index 2da36e4..75fa5ea 100644 (file)
--- a/playview/src/widget/vp-play-volume-popup.c
+++ b/playview/src/widget/vp-play-volume-popup.c
@@ -32,14 +32,13 @@
 
 #define VP_VOLUME_POPUP_HIDE_LAYOUT_TIMER_INTERVAL     5.0
 
-
-#define VP_VOLUME_POPUP_PORTRAIT_POS_X         12
-#define VP_VOLUME_POPUP_PORTRAIT_POS_Y         275
+#define VP_VOLUME_POPUP_PORTRAIT_POS_X         220
+#define VP_VOLUME_POPUP_PORTRAIT_POS_Y         150
 #define VP_VOLUME_POPUP_PORTRAIT_HEIGHT                572
 
-#define VP_VOLUME_POPUP_LANDSCAPE_POS_X                19
-#define VP_VOLUME_POPUP_LANDSCAPE_POS_Y                67
-#define VP_VOLUME_POPUP_LANDSCAPE_HEIGHT       572
+#define VP_VOLUME_POPUP_LANDSCAPE_POS_X                400
+#define VP_VOLUME_POPUP_LANDSCAPE_POS_Y                0
+#define VP_VOLUME_POPUP_LANDSCAPE_HEIGHT       440
 
 #define VP_VOLUME_POPUP_TEXT_MAX_LEN           3
 

diff --git a/project_def.prop b/project_def.prop
index c5ce806..2a0ed76 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/pt_BR.po res/po/el_GR.po res/po/sr.po res/po/sl.po res/po/mk.po res/po/en.po res/po/da.po res/po/zh_HK.po res/po/fr_CA.po res/po/es_ES.po res/po/et.po res/po/cs.po res/po/ga.po res/po/de.po res/po/ja_JP.po res/po/uk.po res/po/sv.po res/po/nl.po res/po/fr.po res/po/ca.po res/po/nb.po res/po/zh_TW.po res/po/pt_PT.po res/po/hu.po res/po/hi.po res/po/es_US.po res/po/ka.po res/po/is.po res/po/ru_RU.po res/po/en_US.po res/po/hy.po res/po/zh_CN.po res/po/sk.po res/po/tr_TR.po res/po/ar.po res/po/gl.po res/po/az.po res/po/kk.po res/po/eu.po res/po/ko_KR.po res/po/it_IT.po res/po/en_PH.po res/po/pl.po res/po/lv.po res/po/fi.po res/po/bg.po res/po/ro.po res/po/uz.po res/po/lt.po res/po/hr.po 
 
 # User Defines
-USER_DEFS = VS_FEATURE_THUMBNAIL_VIEW VS_FEATURE_FOLDER_VIEW SUBTITLE_K_FEATURE ENABLE_LANDSCAPE USE_SWITCH ENABLE_PERSONAL ENABLE_SUBTITLE ENABLE_NOTICE_POPUP _USE_OPENGL_BACKEND ENABLE_EMBEDED_PROGRESS ENABLE_S_BEAM VS_FEATURE_THUMBNAIL_VIEW VS_FEATURE_FOLDER_VIEW
+USER_DEFS = VS_FEATURE_THUMBNAIL_VIEW VS_FEATURE_FOLDER_VIEW SUBTITLE_K_FEATURE ENABLE_LANDSCAPE USE_SWITCH ENABLE_PERSONAL ENABLE_SUBTITLE ENABLE_NOTICE_POPUP ENABLE_VOLUME_BRIGHTNESS_POPUP _USE_OPENGL_BACKEND ENABLE_EMBEDED_PROGRESS ENABLE_S_BEAM VS_FEATURE_THUMBNAIL_VIEW VS_FEATURE_FOLDER_VIEW 
 USER_CPP_DEFS = 
 
 # User Undefines

diff --git a/vp-main/project_def.prop b/vp-main/project_def.prop
index b958688..87fa6b7 100644 (file)
--- a/vp-main/project_def.prop
+++ b/vp-main/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/pt_BR.po res/po/el_GR.po res/po/sr.po res/po/sl.po res/po/mk.po res/po/en.po res/po/da.po res/po/zh_HK.po res/po/fr_CA.po res/po/es_ES.po res/po/et.po res/po/cs.po res/po/ga.po res/po/de.po res/po/ja_JP.po res/po/uk.po res/po/sv.po res/po/nl.po res/po/fr.po res/po/ca.po res/po/nb.po res/po/zh_TW.po res/po/pt_PT.po res/po/hu.po res/po/hi.po res/po/es_US.po res/po/ka.po res/po/is.po res/po/ru_RU.po res/po/en_US.po res/po/hy.po res/po/zh_CN.po res/po/sk.po res/po/tr_TR.po res/po/ar.po res/po/gl.po res/po/az.po res/po/kk.po res/po/eu.po res/po/ko_KR.po res/po/it_IT.po res/po/en_PH.po res/po/pl.po res/po/lv.po res/po/fi.po res/po/bg.po res/po/ro.po res/po/uz.po res/po/lt.po res/po/hr.po 
 
 # User Defines
-USER_DEFS = USE_I_FRAMESEKK VS_FEATURE_THUMBNAIL_VIEW VS_FEATURE_FOLDER_VIEW SUBTITLE_K_FEATURE _SUBTITLE_MULTI_LANGUAGE _TRIME_VIEW_NEW_FEATURE
+USER_DEFS = USE_I_FRAMESEKK VS_FEATURE_THUMBNAIL_VIEW VS_FEATURE_FOLDER_VIEW SUBTITLE_K_FEATURE _SUBTITLE_MULTI_LANGUAGE _TRIME_VIEW_NEW_FEATURE ENABLE_VOLUME_BRIGHTNESS_POPUP
 USER_CPP_DEFS = 
 
 # User Undefines