[TIZENIOT-1751] Modify external storage icon

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

diff --git a/res/edje/gallery.edc b/res/edje/gallery.edc
index 7d1c38d9463aae675ed38497e8d5f1411ea7c0cc..56efd9ccb30f20483aef7a57079d39764a6ced9c 100755 (executable)
--- a/res/edje/gallery.edc
+++ b/res/edje/gallery.edc
@@ -991,6 +991,12 @@ collections {
                                type: SPACER;
                                scale: 1;
                                description { state: "default" 0.0;
+                                       fixed: 0 0;
+                                       align: 0.0 0.0;
+                                       min: 0 0;
+                                       max: 0 0;
+                               }
+                               description { state: "show" 0.0;
                                        fixed: 1 1;
                                        align: 1.0 0.5;
                                        min: 0 0;
@@ -1001,6 +1007,11 @@ collections {
                                type: SPACER;
                                scale: 1;
                                description { state: "default" 0.0;
+                                       fixed: 0 0;
+                                       min: 0 0;
+                                       max: 0 0;
+                               }
+                               description { state: "show" 0.0;
                                        fixed: 1 1;
                                        rel2 {
                                                to_x: "right_dynamic_padding";
@@ -1013,7 +1024,13 @@ collections {
                 scale: 1;
                 description { state: "default" 0.0;
                     fixed: 1 1;
-                    //min: 0 0;
+                    min: 0 0;
+                                       max: 0 0;
+                    color : 0 0 0 255;
+                                       visible: 0;
+                }
+                               description { state: "show" 0.0;
+                    fixed: 1 1;
                                        align: 0.53 0.0;
                     rel1 {
                         to_x: "elm.text.bg";
@@ -1029,12 +1046,19 @@ collections {
                         min: 1 1 ;
                     }
                     color : 0 0 0 255;
+                                       visible: 1;
                 }
             }
                        part { name: "center_padding";
                                type: SPACER;
                                scale: 1;
                                description { state: "default" 0.0;
+                                       fixed: 0 0;
+                                       align: 0.0 0.0;
+                                       min: 0 0;
+                                       max: 0 0;
+                               }
+                               description { state: "show" 0.0;
                                        fixed: 1 1;
                                        align: 0.0 0.5;
                                        min: CENTER_PADDING_WIDTH 0;
@@ -1052,6 +1076,25 @@ collections {
                                type: TEXTBLOCK;
                                scale: 1;
                                description { state: "default" 0.0;
+                                       fixed: 1 1;
+                                       min: 0 0;
+                                       align: 0.0 0.5;
+                                       rel1 {
+                                               to_x: "center_padding";
+                                               relative: 0.0 0.0;
+                                       }
+                                       rel2 {
+                                               to_x: "center_padding";
+                                               relative: 0.0 0.0;
+                                       }
+                                       text {
+                                               style: "my_textblock_count_style";
+                                               min: 1 1;
+                                               max: 0 1;
+                                       }
+                                       visible: 0;
+                               }
+                               description { state: "show" 0.0;
                                        fixed: 1 1;
                                        min: 0 0;
                                        align: 0.0 0.5;
@@ -1068,9 +1111,34 @@ collections {
                                                min: 1 1;
                                                max: 0 1;
                                        }
+                                       visible: 1;
                                }
                        }
                }
+               programs {
+                       program {
+                               name: "show_image_name";
+                               signal: "show_image_title_name";
+                               source: "base";
+                               action: STATE_SET "show" 0.0;
+                               target: "right_dynamic_padding";
+                               target: "elm.text.bg";
+                               target: "elm.text";
+                               target: "center_padding";
+                               target: "elm.sub.text";
+                       }
+                       program {
+                               name: "hide_image_name";
+                               signal: "hide_image_title_name";
+                               source: "base";
+                               action: STATE_SET "default" 0.0;
+                               target: "right_dynamic_padding";
+                               target: "elm.text.bg";
+                               target: "elm.text";
+                               target: "center_padding";
+                               target: "elm.sub.text";
+                       }
+               }
        }
 
        group { name: "ceter_algined_text_layout";

diff --git a/res/edje/gl-gengrid-item-albums.edc b/res/edje/gl-gengrid-item-albums.edc
index 484846ff7b2fc996cfedeef03cc23c50136c271d..f5124326bd8350a13516ead2401736c3afacb9e1 100755 (executable)
--- a/res/edje/gl-gengrid-item-albums.edc
+++ b/res/edje/gl-gengrid-item-albums.edc
@@ -431,15 +431,15 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 0;
-                               rel1 { relative: 0.725 0.67; to: "elm.icon.clipper"; }
-                               rel2 { relative: 0.90 0.84; to: "elm.icon.clipper"; }
+                               rel1 { relative: 0.03 0.03; to: "elm.icon.clipper"; }
+                               rel2 { relative: 0.23 0.23; to: "elm.icon.clipper"; }
                                image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
                        }
                        description {
                                state: "show" 0.0;
                                visible: 1;
-                               rel1 { relative: 0.725 0.67; to: "elm.icon.clipper"; }
-                               rel2 { relative: 0.90 0.84; to: "elm.icon.clipper"; }
+                               rel1 { relative: 0.03 0.03; to: "elm.icon.clipper"; }
+                               rel2 { relative: 0.23 0.23; to: "elm.icon.clipper"; }
                                image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
                        }
                }
@@ -605,16 +605,16 @@ group {
                                state: "default" 0.0;
                                visible: 0;
                                align: 0.5 0.5;
-                               rel1 { relative: 0.78 0.75; to: "elm.swallow.icon"; }
-                               rel2 { relative: 0.98 0.95; to: "elm.swallow.icon"; }
+                               rel1 { relative: 0.03 0.05; to: "elm.swallow.icon"; }
+                               rel2 { relative: 0.23 0.25; to: "elm.swallow.icon"; }
                                image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
                        }
                        description {
                                state: "show" 0.0;
                                visible: 1;
                                align: 0.5 0.5;
-                               rel1 { relative: 0.78 0.75; to: "elm.swallow.icon"; }
-                               rel2 { relative: 0.98 0.95; to: "elm.swallow.icon"; }
+                               rel1 { relative: 0.03 0.05; to: "elm.swallow.icon"; }
+                               rel2 { relative: 0.23 0.25; to: "elm.swallow.icon"; }
                                image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
                        }
                }

diff --git a/res/edje/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
index 4111cfc65f28ddffe18a16505e73d0de7ec7c3bc..3acb943c1be041bb53c82aa22bff9f1451554d8d 100755 (executable)
--- a/res/edje/gl-gengrid-item-thumbview.edc
+++ b/res/edje/gl-gengrid-item-thumbview.edc
@@ -212,8 +212,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 1;
-                               rel1 {relative: 1 1; offset: -52 -42; to: bg; }
-                               rel2 {relative: 1 1; offset: -18 -8; to: bg; }
+                               rel1 { relative: 0.03 0.0285; to: "bg"; }
+                               rel2 { relative: 0.23 0.2285; to: "bg"; }
                                min: 36 36;
                                max: 36 36;
                                color: 0 0 0 0;
@@ -466,8 +466,8 @@ group {
                        type: SWALLOW;
                        description {
                                state: "default" 0.0;
-                               rel1 {relative: 0.95 0.85; to_x: "padding.end.left"; to_y: "padding.end.top"; }
-                               rel2 {relative: 0.95 0.85; to_x: "padding.end.right"; to_y: "padding.end.bottom"; }
+                               rel1 {relative: 0.95 0.9; to_x: "padding.end.left"; to_y: "padding.end.top"; }
+                               rel2 {relative: 0.95 0.9; to_x: "padding.end.right"; to_y: "padding.end.bottom"; }
                        }
                }
                part {
@@ -478,8 +478,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 1;
-                               rel1 {relative: 1 1; offset: -42 -42; to: bg; }
-                               rel2 {relative: 1 1; offset: -8 -8; to: bg; }
+                               rel1 {relative: 0.115 0.135; to: elm.swallow.icon; }
+                               rel2 {relative: 0.115 0.135; to: elm.swallow.icon; }
                                min: 36 36;
                                max: 36 36;
                                color: 0 0 0 0;
@@ -519,7 +519,7 @@ group {
                        }
                        description {
                                state: "show" 0.0;
-                               visible: 1;
+                               visible: 0;
                                rel1 {relative: 0 0; to: sd_card_icon_rect; }
                                rel2 {relative: 1 1; to: sd_card_icon_rect; }
                                image.normal: GALLERY_EDC_SD_CARD_ICON;

diff --git a/src/2dview/gl-thumbs.c b/src/2dview/gl-thumbs.c
index e011da263a1c1a832abff64925b01a7d6580b3d5..75ca596fe367311300d77667bfc92db68bbf03d5 100755 (executable)
--- a/src/2dview/gl-thumbs.c
+++ b/src/2dview/gl-thumbs.c
@@ -471,6 +471,11 @@ static Evas_Object *__gl_thumbs_get_content(void *data, Evas_Object * obj,
                                                                                                         ad->gridinfo.icon_w,
                                                                                                         ad->gridinfo.icon_h);
 
+               if (gitem->item->storage_type == GL_STORE_T_MMC) {
+                       elm_object_item_signal_emit(gitem->elm_item,
+                                                                               "show_sd_card_icon",
+                                                                               "sd_card_icon_img");
+               }
                return layout;
        } else if (!g_strcmp0(part, GL_THUMB_CHECKBOX)) {
                Evas_Object *ck = NULL;
@@ -539,6 +544,9 @@ static Evas_Object *__gl_thumbs_get_content(void *data, Evas_Object * obj,
                        elm_object_mirrored_set(layout, EINA_FALSE);
                        free(path);
                        elm_layout_text_set(layout, "elm.text", elm_entry_utf8_to_markup(_gl_str(gitem->item->display_name)));
+                       elm_object_signal_emit(layout,
+                                                                               "show_image_title_name",
+                                                                               "base");
                        return layout;
                } else if(ad->gridinfo.split_view_mode == SPLIT_VIEW) {
                        Evas_Object *layout = elm_layout_add(obj);
@@ -548,8 +556,9 @@ static Evas_Object *__gl_thumbs_get_content(void *data, Evas_Object * obj,
                        elm_object_mirrored_automatic_set(layout, EINA_FALSE);
                        elm_object_mirrored_set(layout, EINA_FALSE);
                        free(path);
-                       elm_layout_text_set(layout, "elm.text",
-                       elm_entry_utf8_to_markup(_gl_str("")));
+                       elm_object_signal_emit(layout,
+                                                                               "hide_image_title_name",
+                                                                               "base");
                        return layout;
                }
        }

diff --git a/src/widget/gl-thumb.c b/src/widget/gl-thumb.c
index 3427a86907dc7c07da43b5eb28e8e181f5333d3d..788e2cd3af7f31993e3b11a0f897ccb691f0fd7f 100755 (executable)
--- a/src/widget/gl-thumb.c
+++ b/src/widget/gl-thumb.c
@@ -366,13 +366,13 @@ int _gl_thumb_split_set_size(void *data, Evas_Object * view)
        }
 
        if (cnt == 1) {
-               elm_gengrid_align_set(view, 0.0398, 0.0);
+               elm_gengrid_align_set(view, 0.012, 0.0);
        } else if (cnt == 2) {
-               elm_gengrid_align_set(view, 0.055, 0.0);
+               elm_gengrid_align_set(view, 0.049, 0.0);
        } else if (cnt == 3) {
                elm_gengrid_align_set(view, 0.082, 0.0);
        } else if (cnt == 4) {
-               elm_gengrid_align_set(view, 0.17, 0.0);
+               elm_gengrid_align_set(view, 0.08, 0.0);
        } else {
                elm_gengrid_align_set(view, 0.49, 0.0);
        }