From eccc47c478b82d32e3b069d20bc79d9640e48eaa Mon Sep 17 00:00:00 2001 From: "aman.jeph" Date: Fri, 4 Sep 2020 15:09:02 +0530 Subject: [PATCH] Fixed following issue in the changes 1. Added new icon for Video-Player [TIZENIOT-1915] 2. Selected tab issue [TIZENIOT-1909] 3. Playback speed popup design [TIZENIOT-1795] 4. Volume/Brightness gesture issue with quickpanle [TIZENIOT-1790] Change-Id: I4c3ced1cbbc58dd5c41aaca9010e48cd30ba5db0 Signed-off-by: aman.jeph --- packaging/org.tizen.videos.spec | 4 ++-- playview/src/feature/vp-play-speed.c | 13 +++++++------ src/view/mp-video-list-view-main.c | 1 + vp-main/res/edje/custom/pv-custom-layout.edc | 2 +- vp-main/shared/res/org.tizen.video-player.png | Bin 6717 -> 2619 bytes 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packaging/org.tizen.videos.spec b/packaging/org.tizen.videos.spec index d941e85..c6ea1bf 100755 --- a/packaging/org.tizen.videos.spec +++ b/packaging/org.tizen.videos.spec @@ -3,7 +3,7 @@ Summary: video library & store Version: 1.0.40 Release: 1 Group: Applications -License: Flora-1.1 +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz %if "%{?tizen_profile_name}" == "wearable" || "%{?tizen_profile_name}" == "tv" @@ -70,7 +70,7 @@ Description: chapter video manange app for video-player. %package -n org.tizen.video-player Summary: video file video-player. Group: Applications -License: Flora-1.1 +License: Apache-2.0 %description -n org.tizen.video-player diff --git a/playview/src/feature/vp-play-speed.c b/playview/src/feature/vp-play-speed.c index ced4d6c..539d588 100755 --- a/playview/src/feature/vp-play-speed.c +++ b/playview/src/feature/vp-play-speed.c @@ -297,11 +297,12 @@ static void _vp_play_speed_update_text(PlaySpeedPopup * pPlaySpeedPopup) } char szValue[4] = { 0, }; - - snprintf(szValue, 4, "%0.1f", (double) pPlaySpeedPopup->fSpeedVal); - elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title", - szValue); - + if(pPlaySpeedPopup->fSpeedVal > 0.94999999 && pPlaySpeedPopup->fSpeedVal <= 1.05000001 ) { + elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title", "1"); + } else { + snprintf(szValue, 4, "%0.1f", (double) pPlaySpeedPopup->fSpeedVal); + elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title", szValue); + } } /** @@ -351,7 +352,7 @@ static Evas_Object *_vp_play_speed_popup_create_cancel_button(Evas_Object Evas_Object *pObj = NULL; pObj = elm_button_add(pParent); - elm_object_style_set(pObj, "popup_button/default"); + elm_object_style_set(pObj, "border"); elm_object_domain_translatable_text_set(pObj, VP_SYS_STR_PREFIX, VP_PLAY_STRING_COM_CANCEL); elm_object_part_content_set(pParent, "button1", pObj); diff --git a/src/view/mp-video-list-view-main.c b/src/view/mp-video-list-view-main.c index bbfe18b..dce12d1 100755 --- a/src/view/mp-video-list-view-main.c +++ b/src/view/mp-video-list-view-main.c @@ -1212,6 +1212,7 @@ Evas_Object* mp_list_view_create_toolbar(Evas_Object* naviframe) elm_object_style_set(toolbar, "tabbar"); elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND); elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE); + elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS); g_pToolbarItemData.videos_item = elm_toolbar_item_append(toolbar, NULL, TOOLBAR_BUTTON_VIDEOS, toolbar_videos_item_cb, NULL); g_pToolbarItemData.folders_item = elm_toolbar_item_append(toolbar, NULL, TOOLBAR_BUTTOn_FOLDERS, toolbar_folders_item_cb, NULL); diff --git a/vp-main/res/edje/custom/pv-custom-layout.edc b/vp-main/res/edje/custom/pv-custom-layout.edc index dd78f5f..6622704 100755 --- a/vp-main/res/edje/custom/pv-custom-layout.edc +++ b/vp-main/res/edje/custom/pv-custom-layout.edc @@ -33,7 +33,7 @@ scale: 1; description { state: "default" 0.0; - rel1 { relative: 0.0 0.0; } + rel1 { relative: 0.0 0.0; offset: 0 50; } rel2 { relative: 1.0 1.0; } } } diff --git a/vp-main/shared/res/org.tizen.video-player.png b/vp-main/shared/res/org.tizen.video-player.png index 7b568a6084fd0f1aa600e8aff7a33bc4365e2efc..7c41621bbda4c9371fcb01f3f82bd4392fa810ca 100755 GIT binary patch literal 2619 zcmV-B3dHq^P)~E!{hq%$bLTw1bFNT9mzCBzDC0$FKpCw{L++j)_o(t7uw8`r za`&?DKFfAublJ_asZ!FCC;BQ#G~+$C{JmO$M@Fo_@?RdUq9@6 zu@O38>qVVPhI4=gBFq9}UIKTlqht^^sq!b{JZ3k^KOO7(AQ%eZSug0YL2)h<pzuf#a`Ovc=hl+s$KJ_J?s2P@_T!t{rVNBtODIX%-FL8eM>`dtl z%4r~go6tyvFGna5AO81}^gI_+Zk@L2hOxBI-77Pk{Rq+-^W0Xm6&?Eo9e#tqxr) z!ZNp?O6e71`iKLUnJ)dV z-6Fqrg2EBtWQVq@@bsb96>|cpkW6lP9p@x_rld>RC<*waSG1va53eGOE@iAg{a=;0 zt76P}rdf9Om3QBORmDp4tbo;@;5p4z;W0ZQXL|;0rSxWjo18lAk8%nt?1Zc>mV40_ zoJ{F7l-CjB{SlnwoRv%_&R71{BySYbDGJ!?&?iKg@7Pg47F6X)yG2fO4A@HR*`oZh zA2V~Ex+>qWTjYt}iUnJ+mD0Barn>ghpB0oh+goH>Nx%cG*Ly2bVWHhDk9N0kKnu1~ z`jWs2-re+HO;yr%izJEy9%#MgH;&%V;vOwHnbH>^R}3<6c_*;3Jt6xCX8Qrp-l~Vy z>|zH{C^k?Ao%G!4n%9f60Z^Cz`w)j85~jPcn?k7q#pMY^C%9fd`|A zYtQ!gcx}nmWIq0+hx_5D%;ug*)to+>isDOzBqOfMH%( zz}*7Qef6rU7yuX&P|)u4g)ySA2<`PUx4$en?7^n(#xr;8|s`!0Fvg1POJ|7l?WFHVBfJx zzX2P^)x(E#)c3FAh*M@ej>B(3h4lt-74dAzdiGF`Q+}PW?Y7ILbjO5(dEF@dsl3?0xHSnhC5+swj3D1k#7qK3b2`* zn9z0!BTsFOWP;voH!y%N5n)4U->Blo^`85@_jFg*jk9tMf zFfRwNDN<>?vW@zd$|_P(W!J74Bl3%$k#^O*0Ioj#aKdkJ}b3)zut%&cfVcXMD(DFS&=JldtZ{0gk#ZZQG4E^Fc?dWa1;{CTYBUF*PGc zl$4E9z&sup%2@k2`KWv8)T07tMG;u%`UiOTcYi4A+6-;YKw;?A$x(#o+UEhKQ^rD+ ztIK=d-Oj6RSCienyGJs$M~078|3&?n*xmUKo%gK&qI~tJiHuC1 z%$RTYxyLU`hJE?|OouSSJRXctj{>hsSf8s@YEI+oy``%s;DPO1PB|8p>vIc%(Mopc zHiXb7Ov}!wvJAY`o{%0Ro&$FoRlwv=WifLeP4^$Syw(AL&sB}@NU>$06*~uOBvpB9 zRDxrFFOuo5S!}0gq$4|bsa1w_p-qSf^dh>4YIW!{B80cTQW=~)Md5lgc<#r}9A^Np zL|rrCDdTXJ_I#dY`lea(W+AtIZgi-G($;WUx%cMzK#sgCE2ZWzq=RPHOf9x z#(19lnvTxw<{u)A@f^vasHkj@$Cy^$p-B6{Bs+92!c&1CXn*j05Ltz}c0x?iPM??K z&1M77pC@bt1xx19C z>w!iogH~GG$g-}|-<44+kD~uqGAdkPC*%>YHaxfByu)NlXDd8-5WY8~Pi6}52rOz( z$n##|y6#03b7Z}&^|F_TfqCTwQz^O%k5a{A`vfuDE6TdcZo&J#o0D2oTr6-WLS+{& z6ho%GkFct}nGJ5wYA$Ne>jR3>lDA6kr^TIw+?rLw5`+|bn-EL@r^G^4@ za`G$@&P16L_yN%7m6Pzi!sCbRD<_M!lsT{J@T$*PAXygp`O;KiC(4rs>fS;8xnI3B zwdmJUHFolgjE=_`CmF_}j6)a)jMx0V`TIrhy$hvF%wM5P%{}}_<8)=RbUoL^c0{sa dJOWDj_#b<2VWRqmAj1Fv002ovPDHLkV1jI&GrRx* literal 6717 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 N>dIP5uveDh{|`|hUyA?$ -- 2.34.1