From b8f582263af943b45099221fb5acaa7607f6d48b Mon Sep 17 00:00:00 2001 From: "aman.jeph" Date: Mon, 19 Oct 2020 16:49:21 +0530 Subject: [PATCH] [TIZENIOT-1962] [TIZENIOT-1963] [TIZENIOT-1971] fixed following issues 1. fixed done button always enable in subtitle settings 2. add white background files or folder for which thumbnail is not available 3. added external storage icon Change-Id: I75e20b6e1d48a120c867168ea67c3a851c870144 Signed-off-by: aman.jeph --- playview/src/feature/vp-subtitle.c | 24 +++++++++ res/edje/vp-videolist-custom-gengrid.edc | 48 ++++++++++++++++- res/images/default_thumbnail.png | Bin 2634 -> 3261 bytes res/images/icon_external_drive.png | Bin 0 -> 691 bytes src/common/mp-util-media-service.c | 52 +++++++++++++++++-- src/view/mp-video-list-remove-view.c | 26 ++++++++++ src/view/mp-video-list-share-via-view.c | 12 +++++ src/view/mp-video-list-view-folder.c | 15 ++++++ src/view/mp-video-list-view-item-of-folder.c | 16 ++++++ src/view/mp-video-list-view-select.c | 15 +++++- src/view/mp-video-list-view-thumbnail.c | 13 +++++ 11 files changed, 215 insertions(+), 6 deletions(-) create mode 100755 res/images/icon_external_drive.png diff --git a/playview/src/feature/vp-subtitle.c b/playview/src/feature/vp-subtitle.c index 06892d4..1cc79d8 100755 --- a/playview/src/feature/vp-subtitle.c +++ b/playview/src/feature/vp-subtitle.c @@ -64,6 +64,18 @@ static void _vp_subtitle_cancel_button_cb(void *data, Evas_Object * obj, const c static void _vp_subtitle_page_back_key_cb(void *data, Evas_Object *obj, void *event_info); +static void _vp_subtitle_done_button_disable_state_update(Evas_Object *layout, Eina_Bool disable) { + if(layout == NULL) { + VideoLogError("Layout is invalid, can't change done button state"); + return; + } + if(disable) { + elm_object_signal_emit(layout, "done_button,state,disable", "vp"); + } else { + elm_object_signal_emit(layout, "done_button,state,enable", "vp"); + } +} + /* callback functions */ /** * @@ -96,6 +108,8 @@ static void __vp_subtitle_check_change_cb(void *pUserData, (void *) pSubtitle->pUserData); } } + Evas_Object *layout = elm_object_part_content_get(pSubtitle->pPageLayout, "title_content"); + _vp_subtitle_done_button_disable_state_update(layout, EINA_FALSE); } /** @@ -404,6 +418,7 @@ static Evas_Object* _vp_subtitle_create_title_content(Evas_Object* parent, Subti elm_object_signal_callback_add(layout, "cancel_button,clicked", "vp", _vp_subtitle_cancel_button_cb, (void*)pSubtitle); elm_object_signal_callback_add(layout, "done_button,clicked", "vp", _vp_subtitle_done_button_cb, (void*)pSubtitle ); + _vp_subtitle_done_button_disable_state_update(layout, EINA_TRUE); evas_object_show(layout); @@ -419,6 +434,8 @@ static void _vp_subtitle_alignement_selected(void *data, Evas_Object * obj, con if (pSubtitle->pCloseCb) { pSubtitle->pCloseCb((int)VP_SUBTITLE_MODE_ALIGNMENT, TRUE, (void *) pSubtitle->pUserData); } + Evas_Object *layout = elm_object_part_content_get(pSubtitle->pPageLayout, "title_content"); + _vp_subtitle_done_button_disable_state_update(layout, EINA_FALSE); } static void _vp_subtitle_font_size_selected(void *data, Evas_Object * obj, const char *emission, const char *source) @@ -428,6 +445,8 @@ static void _vp_subtitle_font_size_selected(void *data, Evas_Object * obj, cons if (pSubtitle->pCloseCb) { pSubtitle->pCloseCb((int) VP_SUBTITLE_MODE_SIZE, TRUE, (void *) pSubtitle->pUserData); } + Evas_Object *layout = elm_object_part_content_get(pSubtitle->pPageLayout, "title_content"); + _vp_subtitle_done_button_disable_state_update(layout, EINA_FALSE); } static void _vp_subtite_update_subtitle_settings_layout(Evas_Object *layout, SubtitlePopup *pSubtitle) @@ -507,6 +526,11 @@ static Evas_Object* _vp_subtitle_create_base_layout(Evas_Object *parent, Subtitl elm_object_part_content_set(layout, "on_off_button", pSubtitle->pActivationCheck); _vp_subtite_update_subtitle_settings_layout(layout, pSubtitle); + if(bShow) { + elm_object_signal_emit(layout, "subtitle,on", "vp"); + } else { + elm_object_signal_emit(layout, "subtitle,off", "vp"); + } elm_object_signal_callback_add(layout, "alignment,clicked", "vp", _vp_subtitle_alignement_selected, (void*)pSubtitle); elm_object_signal_callback_add(layout, "font_size,clicked", "vp", _vp_subtitle_font_size_selected, (void*)pSubtitle); diff --git a/res/edje/vp-videolist-custom-gengrid.edc b/res/edje/vp-videolist-custom-gengrid.edc index 37b1fd1..1803313 100755 --- a/res/edje/vp-videolist-custom-gengrid.edc +++ b/res/edje/vp-videolist-custom-gengrid.edc @@ -272,7 +272,7 @@ group { "videolist/progressbar" group { "elm/gengrid/item/videolist/default"; inherit: "elm/gengrid/item/videolist_event/default"; - data.item: "contents" "elm.icon elm.progress elm.check"; + data.item: "contents" "elm.icon elm.progress elm.check elm.storage.icon"; data.item: "texts" "elm.text elm.sub.text"; parts { @@ -396,6 +396,10 @@ group { "elm/gengrid/item/videolist/default"; } color: 0 0 0 0; } + desc { "white_bg"; + inherit: "default"; + color: 255 255 255 255; + } } swallow { "elm.icon"; mouse; scale; desc { "default"; @@ -410,6 +414,22 @@ group { "elm/gengrid/item/videolist/default"; color_class: "gengrid_item/default/icon_disabled"; } } + swallow { "elm.storage.icon"; nomouse; scale; + desc { "default"; + rel1.to: "elm.icon"; + rel1.relative: 0.0 0.0; + rel2.to: "elm.icon"; + rel2.relative: 0.0 0.0; + min: 40 40; + max: 40 40; + align: 0.0 0.0; + hid; + } + desc { "show"; + inherit: "default"; + vis; + } + } swallow { "elm.check"; nomouse; scale; desc { "default"; min: 38 38; @@ -533,7 +553,32 @@ group { "elm/gengrid/item/videolist/default"; action: STATE_SET "default"; target: "elm.check"; } + program { "show_storage_icon"; + signal: "elm,state,elm.storage.icon,visible"; + source: "elm"; + action: STATE_SET "show"; + target: "elm.storage.icon"; + } + program { "hide_storage_icon"; + signal: "elm,state,elm.storage.icon,hidden"; + source: "elm"; + action: STATE_SET "default"; + target: "elm.storage.icon"; + } + program { "icon_white_bg_set"; + signal: "icon,white_bg"; + source: "vp"; + action: STATE_SET "white_bg"; + target: "icon_area"; + } + program { "icon_default_bg_set"; + signal: "icon,default_bg"; + source: "vp"; + action: STATE_SET "default"; + target: "icon_area"; + } GENGRID_PROGRAM_DEFAULT( + target: "icon_area"; target: "elm.icon"; target: "effect_cover"; target: "elm.text"; @@ -541,6 +586,7 @@ group { "elm/gengrid/item/videolist/default"; target: "event"; target: "elm.check"; target: "elm.progress"; + target: "elm.storage.icon"; ) } } diff --git a/res/images/default_thumbnail.png b/res/images/default_thumbnail.png index 5b4044fa87d8c7a3da50f98c5f4da05bef687b9d..2800f40c1a72326e3dd03fd47f518831ee2a3647 100755 GIT binary patch literal 3261 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 && path)) { + return true; + } + + if (strncmp(path, storage_rec->file_url, strlen(path)) == 0) { + storage_rec->storage_id = storage_id; + return false; + } + return true; +} + /** * Get folder storage of the video @@ -2120,13 +2139,38 @@ MpMediaStorageType mp_util_svc_get_video_storage(const int nVideoItemIndex) return storage_local; } - if (nVideoItemIndex < 0 - || nVideoItemIndex >= - mp_util_svc_get_video_list_size_for_checking_index()) { + if (nVideoItemIndex < 0 || nVideoItemIndex >= mp_util_svc_get_video_list_size_for_checking_index()) { VideoLogError("Error number of list item."); return storage_local; } + char *file_path = mp_util_svc_get_video_url(nVideoItemIndex); + + + storage_rec_s storage_rec; + storage_rec.storage_id = -1; + storage_rec.file_url = file_path; + storage_type_e storage_type = 0; + int ret = storage_foreach_device_supported(mp_util_svc_storage_callback, &storage_rec); + if(ret != STORAGE_ERROR_NONE) { + VideoLogError("Failed to get storage status, [Error Code: %d]", ret); + MP_FREE_STRING(file_path); + return storage_local; + } + + MP_FREE_STRING(file_path); + + ret = storage_get_type(storage_rec.storage_id, &storage_type); + if (ret != STORAGE_ERROR_NONE) { + VideoLogError("Failed to get storage type [Error Code: %d]", ret); + return storage_local; + } + + if (storage_type == STORAGE_TYPE_INTERNAL) { + storage_local = MP_MEDIA_TYPE_STORAGE_INTERNAL; + } else if (storage_type == STORAGE_TYPE_EXTERNAL) { + storage_local = MP_MEDIA_TYPE_STORAGE_EXTERNAL; + } return storage_local; } diff --git a/src/view/mp-video-list-remove-view.c b/src/view/mp-video-list-remove-view.c index 94c8c23..60f6fe8 100755 --- a/src/view/mp-video-list-remove-view.c +++ b/src/view/mp-video-list-remove-view.c @@ -852,6 +852,7 @@ static Evas_Object *__mp_remove_folder_view_get_grid_icon_cb(void *pUserData, Ev free(path); elm_image_aspect_fixed_set(img, EINA_TRUE); elm_image_file_set(img, edj_path, NULL); + elm_object_item_signal_emit(item_data->item, "icon,white_bg", "vp"); } else { elm_image_fill_outside_set(img, EINA_TRUE); elm_image_file_set(img, pThumbIconUri, NULL); @@ -883,6 +884,20 @@ static Evas_Object *__mp_remove_folder_view_get_grid_icon_cb(void *pUserData, Ev item_data->checkbox = checkbox; return checkbox; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_folder_storage(nFolderItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) + { + char edj_path[1024] = {0, }; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + free(path); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } @@ -994,6 +1009,17 @@ static Evas_Object *__mp_remove_view_get_grid_icon_cb(void *pUserData, Evas_Obje item_data->checkbox = checkbox; return checkbox; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_video_storage(nVideoItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) { + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } #endif diff --git a/src/view/mp-video-list-share-via-view.c b/src/view/mp-video-list-share-via-view.c index d246feb..16b5883 100755 --- a/src/view/mp-video-list-share-via-view.c +++ b/src/view/mp-video-list-share-via-view.c @@ -1010,6 +1010,18 @@ static Evas_Object *__mp_share_view_get_grid_icon_cb(void *pUserData, item_data->checkbox = checkbox; return checkbox; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_video_storage(nVideoItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) { + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + free(path); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } #endif diff --git a/src/view/mp-video-list-view-folder.c b/src/view/mp-video-list-view-folder.c index 14ec6b0..bef69c7 100755 --- a/src/view/mp-video-list-view-folder.c +++ b/src/view/mp-video-list-view-folder.c @@ -279,6 +279,7 @@ static Evas_Object *mp_folder_view_get_icon_of_folder_cb(void *pUserData,Evas_Ob free(path); elm_image_aspect_fixed_set(img, EINA_TRUE); elm_image_file_set(img, edj_path, NULL); + elm_object_item_signal_emit(item_data->item, "icon,white_bg", "vp"); } else { elm_image_fill_outside_set(img, EINA_TRUE); elm_image_file_set(img, pThumbIconUri, NULL); @@ -293,6 +294,20 @@ static Evas_Object *mp_folder_view_get_icon_of_folder_cb(void *pUserData,Evas_Ob return img; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_folder_storage(nFolderItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) + { + char edj_path[1024] = {0, }; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + free(path); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } diff --git a/src/view/mp-video-list-view-item-of-folder.c b/src/view/mp-video-list-view-item-of-folder.c index cea661e..cd1ced3 100755 --- a/src/view/mp-video-list-view-item-of-folder.c +++ b/src/view/mp-video-list-view-item-of-folder.c @@ -345,6 +345,10 @@ Evas_Object *__mp_folder_item_view_get_icon_of_video_item_cb(void } else if(!strcmp(pPart, "elm.progress")) { + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "edje", VIDEO_CUSTOM_THEME); + free(path); + Evas_Object *progessbar = elm_layout_add(pObject); elm_layout_file_set(progessbar, edj_path, "videolist/progressbar"); evas_object_size_hint_weight_set(progessbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -355,6 +359,18 @@ Evas_Object *__mp_folder_item_view_get_icon_of_video_item_cb(void __mp_folder_item_view_set_playback_progress(nVideoItemIndex, item_data); return progessbar; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_video_storage(nVideoItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) { + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + free(path); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } diff --git a/src/view/mp-video-list-view-select.c b/src/view/mp-video-list-view-select.c index e287f28..2540dc2 100755 --- a/src/view/mp-video-list-view-select.c +++ b/src/view/mp-video-list-view-select.c @@ -342,7 +342,7 @@ static void __mp_select_view_gengrid_item_selected_cb(void *pUserData, VideoLogInfo("Show rename popup"); g_pRenameLayout = mp_rename_ctrl_show(g_pSelectHandle->pNaviFrameHandle, NULL, - (void *)__mp_select_view_result_view_update_cb, + __mp_select_view_result_view_update_cb, nSelectedIndex); } } @@ -414,6 +414,19 @@ static Evas_Object *__mp_select_view_get_grid_icon_cb(void *pUserData, Evas_Obje item_data->icon = img; return img; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_video_storage(nVideoItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) { + char edj_path[1024] = {0,}; + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + free(path); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } diff --git a/src/view/mp-video-list-view-thumbnail.c b/src/view/mp-video-list-view-thumbnail.c index ca5b265..21384fb 100755 --- a/src/view/mp-video-list-view-thumbnail.c +++ b/src/view/mp-video-list-view-thumbnail.c @@ -909,6 +909,19 @@ static Evas_Object *__mp_thumbnail_view_get_grid_icon_cb(void *pUserData, Evas_O return progessbar; } + else if(!strcmp(pPart, "elm.storage.icon") && (mp_util_svc_get_video_storage(nVideoItemIndex) == MP_MEDIA_TYPE_STORAGE_EXTERNAL)) + { + char *path = app_get_resource_path(); + snprintf(edj_path, 1024, "%s%s/%s", path, "images", "icon_external_drive.png"); + free(path); + + Evas_Object *img = elm_image_add(pObject); + elm_image_file_set(img, edj_path, NULL); + evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); + + return img; + } return NULL; } -- 2.34.1