Modified GUI

This patch mofifies GUI of volume app as per page no 22 of Invision guideline.
Signed-off-by: Kartik Tidke <kr.tidke@samsung.com>
Change-Id: Ic77798b44ebb979995aa1417d06c7dea606650b1

diff --git a/res/edje/volume_app.edc b/res/edje/volume_app.edc
index adef336170efe50fb9b4e75f493badc71d7da52d..4713589c09ae5db5f2ced429550becaf0fa3dce2 100755 (executable)
--- a/res/edje/volume_app.edc
+++ b/res/edje/volume_app.edc
@@ -34,8 +34,8 @@
 /*
 * Helper sizes
 */
-#define SCREEN_HEIGHT 800
-#define SCREEN_WIDTH 480
+#define SCREEN_HEIGHT 720
+#define SCREEN_WIDTH 1280
 
 #define SCREEN_HEIGHT_L 480
 #define SCREEN_WIDTH_L 800
@@ -44,27 +44,34 @@
 /**
  * Values above should be modified if something will be changed in GUI
  */
-#define WIN_HEIGHT 102
-#define WIN_WIDTH 456
+#define WIN_HEIGHT 80
+#define WIN_WIDTH 980
 
-#define LEFT_PADDING 12
-#define RIGHT_PADDING 12
-#define TOP_PADDING 113
+#define LEFT_PADDING 150
+#define RIGHT_PADDING 150
+#define TOP_PADDING 320
 
-#define WIN_LEFT_PADDING 24
-#define WIN_RIGHT_PADDING 26
-#define SETTING_RIGHT_PADDING 21
+#define WIN_LEFT_PADDING 45
+#define WIN_RIGHT_PADDING 44
+#define SETTING_RIGHT_PADDING 44
 
 #define IC_ICON_SIZE 42
+#define IC_SETTING_SIZE 27
+#define IC_SOUND_ON_W 30
+#define IC_SOUND_ON_H 26
+#define IC_SOUND_TOP_PADDING 27
+#define IC_SOUND_MUTE_W 29
+#define IC_SOUND_MUTE_H 26
 
-#define CONTENT_TOP_PADDING 28
-#define CONTENT_BOTTOM_PADDING CONTENT_TOP_PADDING
-#define CONTENT_LEFT_PADDING 26
+
+#define CONTENT_TOP_PADDING 23
+#define CONTENT_BOTTOM_PADDING 23
+#define CONTENT_LEFT_PADDING 120
 #define CONTENT_RIGHT_PADDING 26
 
-#define CONTENT_SLIDER_WIDTH 291
-#define CONTENT_SLIDER_WIDTH_L 600
-#define CONTENT_HEIGHT 46
+#define CONTENT_SLIDER_WIDTH 620
+#define CONTENT_SLIDER_WIDTH_L 620
+#define CONTENT_HEIGHT 34
 
 #define WARNING_POPUP_HEIGHT 222
 #define WARRNING_TEXT_TOP_PADDING 38
@@ -89,23 +96,28 @@
 /*
 * IC sound (Positioned to clipper)
 */
-#define IC_SOUND_X_MIN (LEFT_PADDING+WIN_LEFT_PADDING)/SCREEN_WIDTH
-#define IC_SOUND_X_MAX (LEFT_PADDING+WIN_LEFT_PADDING+IC_ICON_SIZE)/SCREEN_WIDTH
-#define IC_SOUND_Y_MIN (CONTENT_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
-#define IC_SOUND_Y_MAX (CONTENT_TOP_PADDING+IC_ICON_SIZE+TOP_PADDING)/SCREEN_HEIGHT
+#define IC_SOUND_MUTE_X_MIN (LEFT_PADDING+WIN_LEFT_PADDING)/SCREEN_WIDTH
+#define IC_SOUND_MUTE_X_MAX (LEFT_PADDING+WIN_LEFT_PADDING+IC_SOUND_MUTE_W)/SCREEN_WIDTH
+#define IC_SOUND_MUTE_Y_MIN (IC_SOUND_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
+#define IC_SOUND_MUTE_Y_MAX (IC_SOUND_TOP_PADDING+IC_SOUND_MUTE_H+TOP_PADDING)/SCREEN_HEIGHT
 
 #define IC_SOUND_X_MIN_L (LEFT_PADDING+WIN_LEFT_PADDING)/SCREEN_WIDTH_L
 #define IC_SOUND_X_MAX_L (LEFT_PADDING+WIN_LEFT_PADDING+IC_ICON_SIZE)/SCREEN_WIDTH_L
 #define IC_SOUND_Y_MIN_L (CONTENT_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT_L
 #define IC_SOUND_Y_MAX_L (CONTENT_TOP_PADDING+IC_ICON_SIZE+TOP_PADDING)/SCREEN_HEIGHT_L
 
+#define IC_SOUND_ON_X_MIN (LEFT_PADDING+786)/SCREEN_WIDTH
+#define IC_SOUND_ON_X_MAX (LEFT_PADDING+786+IC_SOUND_ON_W)/SCREEN_WIDTH
+#define IC_SOUND_ON_Y_MIN (IC_SOUND_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
+#define IC_SOUND_ON_Y_MAX (IC_SOUND_TOP_PADDING+IC_SOUND_ON_H+TOP_PADDING)/SCREEN_HEIGHT
+
 /*
 * IC setting (Positioned to clipper)
 */
-#define IC_SETTING_X_MIN 1.0-(SETTING_RIGHT_PADDING+IC_ICON_SIZE+RIGHT_PADDING)/SCREEN_WIDTH
+#define IC_SETTING_X_MIN 1.0-(SETTING_RIGHT_PADDING+IC_SETTING_SIZE+RIGHT_PADDING)/SCREEN_WIDTH
 #define IC_SETTING_X_MAX 1.0-((SETTING_RIGHT_PADDING+RIGHT_PADDING)/SCREEN_WIDTH)
-#define IC_SETTING_Y_MIN (CONTENT_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
-#define IC_SETTING_Y_MAX (CONTENT_TOP_PADDING+IC_ICON_SIZE+TOP_PADDING)/SCREEN_HEIGHT
+#define IC_SETTING_Y_MIN (IC_SOUND_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
+#define IC_SETTING_Y_MAX (IC_SOUND_TOP_PADDING+IC_SETTING_SIZE+TOP_PADDING)/SCREEN_HEIGHT
 
 #define IC_SETTING_X_MIN_L 1.0-(SETTING_RIGHT_PADDING+IC_ICON_SIZE+RIGHT_PADDING)/SCREEN_WIDTH_L
 #define IC_SETTING_X_MAX_L 1.0-((SETTING_RIGHT_PADDING+RIGHT_PADDING)/SCREEN_WIDTH_L)
@@ -117,8 +129,8 @@
 /*
 * Content swallow (Positioned to clipper)
 */
-#define IC_CONTENT_X_MIN (WIN_LEFT_PADDING+IC_ICON_SIZE+4+LEFT_PADDING)/SCREEN_WIDTH
-#define IC_CONTENT_X_MAX (WIN_LEFT_PADDING+IC_ICON_SIZE+CONTENT_SLIDER_WIDTH+4+LEFT_PADDING)/SCREEN_WIDTH
+#define IC_CONTENT_X_MIN (CONTENT_LEFT_PADDING+LEFT_PADDING)/SCREEN_WIDTH
+#define IC_CONTENT_X_MAX (CONTENT_LEFT_PADDING+CONTENT_SLIDER_WIDTH+LEFT_PADDING)/SCREEN_WIDTH
 #define IC_CONTENT_Y_MIN (CONTENT_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
 #define IC_CONTENT_Y_MAX (CONTENT_HEIGHT+CONTENT_TOP_PADDING+TOP_PADDING)/SCREEN_HEIGHT
 
@@ -130,8 +142,8 @@
 /**
  * Divider line
  */
-#define DIVIDER_X_MIN 386/SCREEN_WIDTH
-#define DIVIDER_X_MAX 388/SCREEN_WIDTH
+#define DIVIDER_X_MIN 1012/SCREEN_WIDTH
+#define DIVIDER_X_MAX 1013/SCREEN_WIDTH
 #define DIVIDER_Y_MIN (TOP_PADDING+CONTENT_TOP_PADDING)/SCREEN_HEIGHT
 #define DIVIDER_Y_MAX (TOP_PADDING+CONTENT_TOP_PADDING+CONTENT_HEIGHT)/SCREEN_HEIGHT
 
@@ -157,7 +169,7 @@
 color_class: "W0661D"; \
 color_class: "B0563L1P"; \*/
 
-#define RESOURCE_IMAGE( FILE_NAME ) \
+#define RESOURCE_IMAGE_ORI( FILE_NAME ) \
        group { \
                name : FILE_NAME; \
                images.image: FILE_NAME COMP; \
@@ -168,12 +180,28 @@ color_class: "B0563L1P"; \*/
                                        image.normal : FILE_NAME; \
                                        aspect : 1 1; \
                                        aspect_preference : BOTH; \
-                                       color: 61 185 204 255; \
                                } \
                        } \
                }\
        }
 
+#define RESOURCE_IMAGE( FILE_NAME ) \
+group { \
+       name : FILE_NAME; \
+       images.image: FILE_NAME COMP; \
+       parts { \
+               part { name: "image"; \
+                       description { \
+                               state : "default" 0.0; \
+                               image.normal : FILE_NAME; \
+                               aspect : 1 1; \
+                               aspect_preference : BOTH; \
+                               color: 61 185 204 255; \
+                       } \
+               } \
+       }\
+}
+
 #define RESOURCE_IMAGE_DIM( FILE_NAME ) \
        group { \
                name : FILE_NAME; \
@@ -211,9 +239,9 @@ color_class: "B0563L1P"; \*/
 
 collections {
 
-RESOURCE_IMAGE(sound_slider_icon_volume.png);
+RESOURCE_IMAGE_ORI(sound_slider_icon_volume.png);
 RESOURCE_IMAGE(sound_slider_icon_volume_vibrate.png);
-RESOURCE_IMAGE(sound_slider_icon_volume_mute.png);
+RESOURCE_IMAGE_ORI(sound_slider_icon_volume_mute.png);
 RESOURCE_IMAGE(sound_slider_icon_notification.png);
 RESOURCE_IMAGE(sound_slider_icon_notification_vibrate.png);
 RESOURCE_IMAGE(sound_slider_icon_notification_mute.png);
@@ -222,7 +250,7 @@ RESOURCE_IMAGE(sound_slider_icon_incoming_call.png);
 RESOURCE_IMAGE(sound_slider_icon_system.png);
 RESOURCE_IMAGE(sound_slider_icon_system_vibrate.png);
 RESOURCE_IMAGE(sound_slider_icon_system_mute.png);
-RESOURCE_IMAGE(sound_volume_ic_setting.png);
+RESOURCE_IMAGE_ORI(sound_volume_ic_setting.png);
 RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
 
        group {
@@ -328,8 +356,8 @@ RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
                                        state : "default" 0.0;
                                        visible : 1;
                                        fixed: 1 1;
-                                       rel1 { relative : IC_SOUND_X_MIN IC_SOUND_Y_MIN; to : "clipper";}
-                                       rel2 { relative : IC_SOUND_X_MAX IC_SOUND_Y_MAX; to : "clipper";}
+                                       rel1 { relative : IC_SOUND_ON_X_MIN IC_SOUND_ON_Y_MIN; to : "clipper";}
+                                       rel2 { relative : IC_SOUND_ON_X_MAX IC_SOUND_ON_Y_MAX; to : "clipper";}
                                }
                                description {
                                        state: "portrait";
@@ -346,7 +374,22 @@ RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
                                        inherit: "default" 0.0;
                                        visible: 0;
                                }
+                       }
 
+                       part {
+                               name : "ic_sound_mute";
+                               type : IMAGE;
+                               clip_to: "clipper";
+                               scale : 1;
+                               description {
+                                       state : "default" 0.0;
+                                       fixed : 1 1;
+                                       image.normal: "sound_slider_icon_volume_mute.png";
+                                       rel1 { relative : IC_SOUND_MUTE_X_MIN IC_SOUND_MUTE_Y_MIN; to : "clipper";}
+                                       rel2 { relative : IC_SOUND_MUTE_X_MAX IC_SOUND_MUTE_Y_MAX; to : "clipper";}
+                                       aspect : 1 1;
+                                       aspect_preference : BOTH;
+                               }
                        }
 
                        part {

diff --git a/res/images/private/volume/sound_slider_icon_volume.png b/res/images/private/volume/sound_slider_icon_volume.png
index 2ed4c998ee8bd6455b90afeb7162fc5a8e49b4cb..7b9ae4a179c17c568a0621b96d32aacbe1c2993e 100755 (executable)
Binary files a/res/images/private/volume/sound_slider_icon_volume.png and b/res/images/private/volume/sound_slider_icon_volume.png differ

diff --git a/res/images/private/volume/sound_slider_icon_volume_mute.png b/res/images/private/volume/sound_slider_icon_volume_mute.png
index c48db737729b1c05460b36d2fd72cd380747f849..172f90b983f3ab4765fd65415f455d8ff7d75d57 100755 (executable)
Binary files a/res/images/private/volume/sound_slider_icon_volume_mute.png and b/res/images/private/volume/sound_slider_icon_volume_mute.png differ

diff --git a/res/images/private/volume/sound_volume_ic_setting.png b/res/images/private/volume/sound_volume_ic_setting.png
index 4a71b7621299581908b3f9b1d6e40937d971a3a2..e0aca41ce3af01a7486eabe8776f6544eef2d5df 100755 (executable)
Binary files a/res/images/private/volume/sound_volume_ic_setting.png and b/res/images/private/volume/sound_volume_ic_setting.png differ

diff --git a/res/images/private/volume/sound_volume_popup_bg.#.png b/res/images/private/volume/sound_volume_popup_bg.#.png
index 0dcfc27e7e420d4fcfe505a3732b1f202d8c6366..b4f079650119b812db5c1348f78ce12e9c67bc89 100755 (executable)
Binary files a/res/images/private/volume/sound_volume_popup_bg.#.png and b/res/images/private/volume/sound_volume_popup_bg.#.png differ

diff --git a/src/view.c b/src/view.c
index 71d7cada5a31a57d6f66331f2feee43999bea0d3..6367835e69beeb72731f909ab31ba598633b0ef1 100755 (executable)
--- a/src/view.c
+++ b/src/view.c
@@ -334,12 +334,7 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
        switch (sound_type) {
        case SOUND_TYPE_ALARM:
        case SOUND_TYPE_RINGTONE:
-               if (sound)
-                       img = IMG_VOLUME_ICON;
-               else if (vibration)
-                       img = IMG_VOLUME_ICON_VIB;
-               else
-                       img = IMG_VOLUME_ICON_MUTE;
+               img = IMG_VOLUME_ICON;
                break;
        case SOUND_TYPE_MEDIA:
                if (volume_sound_sound_manager_volume_get(sound_type) > 0)

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 35395e74185b92e69bee5b1aba4bf12b4752f03e..08afe82a9ba50b86b299b4bd60e1a52181f26a2e 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" install-location="internal-only" package="org.tizen.volume" version="0.1.148">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" install-location="internal-only" package="org.tizen.volume_common" version="0.1.148">
     <label>Volume</label>
     <author email="junkyu.han@samsung.com" href="www.samsung.com">junkyu Han</author>
     <description>volume</description>