Changed icons and background used for volume slider. Changed alignment layout for...

Change-Id: Ib470343abfb8690c8c0956ffbe62b42c09b13157
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/inc/main.h b/inc/main.h
index f2bb6a930ab7667d9f3cd8a71fc2b2ecee041b36..bf2eb632aacd912860aef9240a8db7189a086ccc 100755 (executable)
--- a/inc/main.h
+++ b/inc/main.h
@@ -36,7 +36,7 @@
 #define EDJ_APP EDJ_DIR"/volume_app.edj"
 
 #define IMG_VOLUME_ICON "sound_slider_icon_volume.png"
-#define IMG_VOLUME_ICON_OFF "sound_off_icon_volume.png"
+#define IMG_VOLUME_ICON_OFF "sound_off_icon_volume_mute.png"
 #define IMG_VOLUME_ICON_VIB "sound_slider_icon_volume_vibrate.png"
 #define IMG_VOLUME_ICON_MUTE "sound_slider_icon_volume_mute.png"
 #define IMG_VOLUME_ICON_MUTE_OFF "sound_off_icon_volume_mute.png"

diff --git a/res/edje/volume_app.edc b/res/edje/volume_app.edc
index 66fafbe42bb8ffa08b8d574c9c90d274d87365c9..5b16529354565f9c54c54427de282732dd374fb8 100755 (executable)
--- a/res/edje/volume_app.edc
+++ b/res/edje/volume_app.edc
@@ -44,34 +44,34 @@
 /**
  * Values above should be modified if something will be changed in GUI
  */
-#define WIN_HEIGHT 80
-#define WIN_WIDTH 980
+#define WIN_HEIGHT 112
+#define WIN_WIDTH 944
 
-#define LEFT_PADDING 150
-#define RIGHT_PADDING 150
-#define TOP_PADDING 320
+#define LEFT_PADDING 168
+#define RIGHT_PADDING 168
+#define TOP_PADDING 32
 
-#define WIN_LEFT_PADDING 45
+#define WIN_LEFT_PADDING 56
 #define WIN_RIGHT_PADDING 44
-#define SETTING_RIGHT_PADDING 44
+#define SETTING_RIGHT_PADDING 0
 
 #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 IC_SETTING_SIZE 0
+#define IC_SOUND_ON_W 0
+#define IC_SOUND_ON_H 0
+#define IC_SOUND_TOP_PADDING 39
+#define IC_SOUND_MUTE_W 32
+#define IC_SOUND_MUTE_H 32
 
 
-#define CONTENT_TOP_PADDING 23
-#define CONTENT_BOTTOM_PADDING 23
-#define CONTENT_LEFT_PADDING 120
-#define CONTENT_RIGHT_PADDING 26
+#define CONTENT_TOP_PADDING 54
+#define CONTENT_BOTTOM_PADDING 54
+#define CONTENT_LEFT_PADDING 108
+#define CONTENT_RIGHT_PADDING 0
 
-#define CONTENT_SLIDER_WIDTH 620
-#define CONTENT_SLIDER_WIDTH_L 620
-#define CONTENT_HEIGHT 34
+#define CONTENT_SLIDER_WIDTH 780
+#define CONTENT_SLIDER_WIDTH_L 780
+#define CONTENT_HEIGHT 4
 
 #define WARNING_POPUP_HEIGHT 222
 #define WARRNING_TEXT_TOP_PADDING 38
@@ -326,12 +326,14 @@ RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
                                description {
                                        state : "default" 0.0;
                                        image.normal: "sound_volume_popup_bg.#.png";
+                                       image.border : 0 0 0 0;
                                        rel1.to : "bg";
                                        rel2.to : "bg";
                                }
                                description {
                                        state : "portrait" 0.0;
                                        image.normal: "sound_volume_popup_bg.#.png";
+                                       image.border : 0 0 0 0;
                                        rel1.to : "bg";
                                        rel2.to : "bg";
                                }
@@ -339,6 +341,7 @@ RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
                                        state : "landscape" 0.0;
                                        visible : 1;
                                        image.normal: "sound_volume_popup_bg.#.png";
+                                       image.border : 0 0 0 0;
                                        rel1.to : "bg";
                                        rel2.to : "bg";
                                }
@@ -385,12 +388,17 @@ RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
                                scale : 1;
                                description {
                                        state : "default" 0.0;
+                                       visible : 1;
                                        fixed : 1 1;
                                        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;
                                }
+                               description {
+                                       state: "portrait";
+                                       inherit: "default" 0.0;
+                               }
                        }
 
                        part {

diff --git a/res/images/private/volume/sound_off_icon_volume.png b/res/images/private/volume/sound_off_icon_volume.png
old mode 100644 (file)
new mode 100755 (executable)
index eed4280..4d5c43b
Binary files a/res/images/private/volume/sound_off_icon_volume.png and b/res/images/private/volume/sound_off_icon_volume.png differ

diff --git a/res/images/private/volume/sound_off_icon_volume_mute.png b/res/images/private/volume/sound_off_icon_volume_mute.png
old mode 100644 (file)
new mode 100755 (executable)
index deb8eb5..25df969
Binary files a/res/images/private/volume/sound_off_icon_volume_mute.png and b/res/images/private/volume/sound_off_icon_volume_mute.png differ

diff --git a/res/images/private/volume/sound_slider_icon_volume.png b/res/images/private/volume/sound_slider_icon_volume.png
index 7b9ae4a179c17c568a0621b96d32aacbe1c2993e..4f1f6bacb0ab127f33ddf73ecf6c4ad1cda1c58f 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 172f90b983f3ab4765fd65415f455d8ff7d75d57..7146d8002cf9bc1a145b76783a2bcb2f6ebf5dbc 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_popup_bg.#.png b/res/images/private/volume/sound_volume_popup_bg.#.png
index b4f079650119b812db5c1348f78ce12e9c67bc89..48f487e0baa52b57b49b523aa0d7d8f7a8b31673 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 4a8e45f5aadaf54cf18c3cee7e241b8f06ccf394..b5187f5343bef6ea21d82673d187897ecfa625a8 100755 (executable)
--- a/src/view.c
+++ b/src/view.c
@@ -325,6 +325,7 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
        _D("Volume icon set");
        char *img = NULL;
        char *img_mute = NULL;
+       int sound_level = volume_sound_level_get(sound_type);
 
        if (sound == -1 || vibration == -1) {
                img = IMG_VOLUME_ICON_OFF;
@@ -339,8 +340,13 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
        case SOUND_TYPE_ALARM:
        case SOUND_TYPE_RINGTONE:
                if (sound > 0) {
-                       img = IMG_VOLUME_ICON;
-                       img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+                       if (sound_level <= 7) {
+                               img = IMG_VOLUME_ICON_MUTE;
+                               img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+                       } else {
+                               img = IMG_VOLUME_ICON;
+                               img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+                       }
                } else {
                        img = IMG_VOLUME_ICON_OFF;
                        img_mute = IMG_VOLUME_ICON_MUTE;
@@ -348,8 +354,13 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
                break;
        case SOUND_TYPE_MEDIA:
                if (volume_sound_sound_manager_volume_get(sound_type) > 0) {
-                       img = IMG_VOLUME_ICON;
-                       img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+                       if (sound_level <= 7) {
+                               img = IMG_VOLUME_ICON_MUTE;
+                               img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+                       } else {
+                               img = IMG_VOLUME_ICON;
+                               img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+                       }
                } else {
                        img = IMG_VOLUME_ICON_OFF;
                        img_mute = IMG_VOLUME_ICON_MUTE;
@@ -370,8 +381,13 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
                        img = IMG_VOLUME_ICON_NOTI_MUTE;
                break;
        default:
-               img = IMG_VOLUME_ICON;
-               img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+               if (sound_level <= 7) {
+                       img = IMG_VOLUME_ICON_MUTE;
+                       img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+               } else {
+                       img = IMG_VOLUME_ICON;
+                       img_mute = IMG_VOLUME_ICON_MUTE_OFF;
+               }
                break;
        }
 
@@ -458,7 +474,7 @@ Evas_Object *add_slider(Evas_Object *parent, int min, int max, int val)
        elm_slider_indicator_show_set(slider, EINA_FALSE);
        elm_slider_indicator_format_set(slider, "%.0f");
        evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0);
-       evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5);
+       evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.0);
        elm_slider_min_max_set(slider, min, max);
        elm_slider_value_set(slider, val);
 
@@ -578,24 +594,12 @@ volume_error_e volume_view_layout_create(Evas_Object *win)
        elm_object_signal_callback_add(ly_outer, "hide,popup", "event", _hide_launcher, NULL);
        view_info.ly_outer = ly_outer;
 
-       /* make setting icon */
-       Evas_Object *icon_setting = _setting_icon_make();
-       retv_if(!icon_setting, VOLUME_ERROR_FAIL);
-       elm_object_part_content_set(ly_outer, "ic_setting", icon_setting);
-       view_info.icon_setting = icon_setting;
-
        /* make volume icon */
        Evas_Object *icon_volume = _volume_icon_make();
        retv_if(!icon_volume, VOLUME_ERROR_FAIL);
-       elm_object_part_content_set(ly_outer, "ic_sound", icon_volume);
+       elm_object_part_content_set(ly_outer, "ic_sound_mute", icon_volume);
        view_info.icon_volume = icon_volume;
 
-       /* make volume mute icon */
-       Evas_Object *icon_volume_mute = _volume_icon_make();
-       retv_if(!icon_volume_mute, VOLUME_ERROR_FAIL);
-       elm_object_part_content_set(ly_outer, "ic_sound_mute", icon_volume_mute);
-       view_info.icon_volume_mute = icon_volume_mute;
-
        /* make slider */
        Evas_Object *slider = _slider_make();
        retv_if(!slider, VOLUME_ERROR_FAIL);