From 4743c85044b4466ebda432d92d20b21a68f7630b Mon Sep 17 00:00:00 2001 From: Seoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com> Date: Tue, 20 Apr 2021 14:46:29 +0900 Subject: [PATCH] [NUI] Update NUI Slider default and dark themes (#2925) - Update default theme and dark theme of Slider component. Signed-off-by: Seoyeon Kim --- .../Theme/DefaultThemeCommon.cs | 35 +++++++++++++++------ src/Tizen.NUI.Components/Theme/ThemeDark.cs | 35 +++++++++++++-------- .../res/IoT_progressindicator_empty.png | Bin 0 -> 879 bytes .../res/IoT_progressindicator_progress.png | Bin 0 -> 709 bytes .../res/IoT_progressindicator_progress_dark.png | Bin 0 -> 572 bytes .../res/IoT_progressindicator_progressdisabled.png | Bin 0 -> 731 bytes .../res/IoT_slider_handler_normal.png | Bin 0 -> 968 bytes .../res/IoT_slider_handler_normalW.png | Bin 0 -> 739 bytes .../res/IoT_slider_status_empty_track.png | Bin 0 -> 331 bytes .../res/IoT_slider_status_track.png | Bin 0 -> 219 bytes .../res/IoT_slider_status_trackW.png | Bin 0 -> 196 bytes .../res/IoT_slider_status_track_disabled.png | Bin 0 -> 208 bytes 12 files changed, 47 insertions(+), 23 deletions(-) create mode 100755 src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png create mode 100755 src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png create mode 100755 src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png create mode 100755 src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png create mode 100755 src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png create mode 100755 src/Tizen.NUI.Components/res/IoT_slider_handler_normalW.png create mode 100755 src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png create mode 100755 src/Tizen.NUI.Components/res/IoT_slider_status_track.png create mode 100755 src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png create mode 100755 src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png diff --git a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs index 9649e8c..a51a2fa 100755 --- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs +++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs @@ -119,9 +119,10 @@ namespace Tizen.NUI.Components theme.AddStyleWithoutClone("Tizen.NUI.Components.Progress", new ProgressStyle() { - Size = new Size(200, 5), + Size = new Size(200, 25), Track = new ImageViewStyle() { + ResourceUrl = FrameworkInformation.ResourcePath + "IoT_progressindicator_empty.png", BackgroundColor = new Color(0, 0, 0, 0.1f), }, Buffer = new ImageViewStyle() @@ -130,6 +131,11 @@ namespace Tizen.NUI.Components }, Progress = new ImageViewStyle() { + ResourceUrl = new Selector() + { + Normal = FrameworkInformation.ResourcePath + "IoT_progressindicator_progress.png", + Disabled = FrameworkInformation.ResourcePath + "IoT_progressindicator_progressdisabled.png", + }, BackgroundColor = new Color(0.05f, 0.63f, 0.9f, 1), }, IndeterminateImageUrl = FrameworkInformation.ResourcePath + "nui_component_default_progress_indeterminate.png", @@ -164,29 +170,38 @@ namespace Tizen.NUI.Components theme.AddStyleWithoutClone("Tizen.NUI.Components.Slider", new SliderStyle() { Size = new Size(200, 50), - TrackThickness = 5, + TrackThickness = 8, Track = new ImageViewStyle() { - BackgroundColor = new Color(0, 0, 0, 0.1f), + Size = new Size(100, 8), + ResourceUrl = new Selector() + { + Normal = FrameworkInformation.ResourcePath + "IoT_slider_status_empty_track.png", + Disabled = FrameworkInformation.ResourcePath + "IoT_slider_status_track_disabled.png", + }, + BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 0.1f), }, Progress = new ImageViewStyle() { - BackgroundColor = new Color(0.5f, 0.63f, 0.9f, 1), + Size = new Size(100, 8), + ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_status_track.png", + BackgroundColor = new Color(0.03f, 0.05f, 0.3f, 1), }, Thumb = new ImageViewStyle() { - Size = new Size(50, 50), - ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_n.png", - BackgroundImage = new Selector() + Size = new Size(36, 36), + ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_handler_normal.png", + // TODO : Should check later when UX guide provides the pressed image + /*BackgroundImage = new Selector() { Normal = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png", Pressed = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png", - } + }*/ }, ValueIndicatorImage = new ImageViewStyle() { - Size = new Size(83, 54), - ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_value_indicator.png", + Size = new Size(49, 24), + BackgroundColor = new Color(0.0f, 0.04f, 0.16f, 1.0f), }, }); diff --git a/src/Tizen.NUI.Components/Theme/ThemeDark.cs b/src/Tizen.NUI.Components/Theme/ThemeDark.cs index 0f3b6c3..4c31c32 100755 --- a/src/Tizen.NUI.Components/Theme/ThemeDark.cs +++ b/src/Tizen.NUI.Components/Theme/ThemeDark.cs @@ -118,9 +118,10 @@ namespace Tizen.NUI.Components theme.AddStyleWithoutClone("Tizen.NUI.Components.Progress", new ProgressStyle() { - Size = new Size(200, 5), + Size = new Size(200, 25), Track = new ImageViewStyle() { + ResourceUrl = FrameworkInformation.ResourcePath + "IoT_progressindicator_empty.png", BackgroundColor = new Color(0, 0, 0, 0.1f), }, Buffer = new ImageViewStyle() @@ -129,6 +130,11 @@ namespace Tizen.NUI.Components }, Progress = new ImageViewStyle() { + ResourceUrl = new Selector() + { + Normal = FrameworkInformation.ResourcePath + "IoT_progressindicator_progress_dark.png", + Disabled = FrameworkInformation.ResourcePath + "IoT_progressindicator_progressdisabled.png", + }, BackgroundColor = new Color(0.05f, 0.63f, 0.9f, 1), }, IndeterminateImageUrl = FrameworkInformation.ResourcePath + "nui_component_default_progress_indeterminate.png", @@ -163,29 +169,32 @@ namespace Tizen.NUI.Components theme.AddStyleWithoutClone("Tizen.NUI.Components.Slider", new SliderStyle() { Size = new Size(200, 50), - TrackThickness = 5, + TrackThickness = 8, Track = new ImageViewStyle() { - BackgroundColor = new Color(0, 0, 0, 0.1f), + Size = new Size(100, 8), + ResourceUrl = new Selector() + { + Normal = FrameworkInformation.ResourcePath + "IoT_slider_status_empty_track.png", + Disabled = FrameworkInformation.ResourcePath + "IoT_slider_status_track_disabled.png", + }, + BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 0.1f), }, Progress = new ImageViewStyle() { - BackgroundColor = new Color(0.5f, 0.63f, 0.9f, 1), + Size = new Size(100, 8), + ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_status_trackW.png", + BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 1), }, Thumb = new ImageViewStyle() { - Size = new Size(50, 50), - ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_n.png", - BackgroundImage = new Selector() - { - Normal = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png", - Pressed = FrameworkInformation.ResourcePath + "nui_component_default_slider_thumb_bg_p.png", - } + Size = new Size(36, 36), + ResourceUrl = FrameworkInformation.ResourcePath + "IoT_slider_handler_normalW.png", }, ValueIndicatorImage = new ImageViewStyle() { - Size = new Size(83, 54), - ResourceUrl = FrameworkInformation.ResourcePath + "nui_component_default_slider_value_indicator.png", + Size = new Size(49, 24), + BackgroundColor = new Color(1.0f, 1.0f, 1.0f, 1.0f), }, }); diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_empty.png new file mode 100755 index 0000000000000000000000000000000000000000..2c6abaa2914809bd31e85e365f17c7fbbc6680a5 GIT binary patch literal 879 zcmV-#1CacQP)i4JB*4jw z2d^3vjR_Z`@$SJtKruadFlyS}TGEF|yCp3 zz6ICgxyF!4e6kKeKZ6npwl_Q8@^>#XHX{%kpFASvw0?v0{eZXW`M>ci40#ZpXecLA zO-Gw^bTd)WUOItrEIp_LzUuKhrwVFCL(G{$DLpRCC>=D9f|5)PP$bix&CVBQUfz&= z%~+%t{2tde9x)MX4FM&gUYT!kTsMlgo;M_tOb;3bd_vR=YXI}A$gzo|Mxl3fv^qyI zlt|T=5$S+ohRiD@;;kbPN~F6as(nN`ruOKJ&2_iARO{r05-)*JTy@!yRid$eowaGY z?DI8#;1v<^))7z=nS%hd9p$)sxlCWUAr5`k!QGD1En{PKXpvn+Iia36ipkCGh=?3( z37B38L#$<5lG<-W#FAAKM5~gEOIFw@>Oh&&>2UWV7jZR;SHyb2)BSh zB$28CMo#%X&bxU-%nKBa?79^2x<@R~7ZRKV=7^(092SfIsyr-VL4>J|wYGh>JVo%VYgrwb`- zu5iOo)Dwh4FQa;}!`t|Ji`pWLgMe8xD8qiL!M(!F*w7HOA;_3ik<9c_VDrH6vxGSN zZYN~VIUG5TensdX0_LIb@DkW5da&k&HeJnl)oJq;+4N6oQmkrWOgUW&n1^ z&~82hVw8$!KpaC23CTYLLS$J3cJ{lmwe9u)U7}V?{Q~EpKwQChOlbfB002ovPDHLk FV1hQbjjR9w literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_progress.png new file mode 100755 index 0000000000000000000000000000000000000000..8e02cb62042f0695993c50c4d6b7cbb1ef463bec GIT binary patch literal 709 zcmV;$0y_PPP)ez=5QS&X2K$Wf(t!j>2q?%upaVsqB)%YmC_xBl5b3BX z5-1QQWt0j8h!Oz`PK*LVlyp=;fkZ(Nbi___7ZY}PX9;X#$MW56$82fuytTg3+nwDp zQ{QoNsOayQWZ|!x(P^~L@um17U7uo z=u8Ng{9pzdoQ5lUJ4d-%B>>hKJRPl8Z$TKl8*K1rg`!_M?+`zlt=Q;Z3swc1k4A+8rZ!6r3nbrls$L_ma|hK=eOrt;`+ zmvi6r+(^XF`sDaD2@S3lrE+kU9GbPhf(j-lU}%b6uksr1IG#LOBkU898cN;D4-{KN z_Qh2(IRROT9TLGIh2+5+VVeMskqu3VZK|2{Vu$#_XVkt2GU;fr6#{U`M>s_9AXaEv z5Q*<1a7g7E6W_6*rxIBS#AWYJZ*(}%`S)41G(I~4(=-QLPbVmS7g73-WtUWiv;^8u zCr~JO<45q)`%cT>v^cZH#pNz-<_?G9{BryG-3u-`On0+MYjhd{hU8*YU$`H~{?mv; zgX#u8n@J<8F{ugMT(4JS?yb?)87z6@r}1Zo2in3-4S2vnssAE#Zlhj%-WkxdRqMKy z{ha4nr0djx>N+h60ik)>l&LUW__8&uZ|}TV4vskvjiB9o6ji_>BxoP*EafC?|L=2! rWR--!GRr6II&Y1kSLmU?*^bL^;6l9T`icA$00000NkvXXu0mjfL;*N! literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_progress_dark.png new file mode 100755 index 0000000000000000000000000000000000000000..f08c7c0fd72ba507edf4db7993f4b03a2ae00ccc GIT binary patch literal 572 zcmV-C0>k}@P)7PYYs8U1rHGy|VTSLo$dCD9) z3kWd!*k}jU_-aE3%S_;fjxnG_(^sT`0791M(HzQo=4htAC*UUYUIL6P{{#<^QQmL+ zKBW#=OahYt*+>BaMmKMcQF$?Y>o&e8@WF_^KsoWgngFuLi(E}hSQW zzZ>RABxjc2kdOeGW?|L19W@{cgaybM3tgH=AQCtdAkSElJ92I26Nn2CxpS;A??oMu zKth28>vQ0pA$NFc3YITx-P{Ney$1;n|A+vY!Ou!?JX!6;yX=)Z$CcGF1n1zJzaO0( z;;AP%zN~ce_2@(nowKBkmrK3;HTFSBFmo$FV(Ime2|Cw}S+aZLabRpp1iuPVoGAp49VSVxk|VL^lu?8;g%MPlyFCYagaVuzCSrMvXMLi?k}w;Ye(Pb$iu+6 z&rG0T?VPW$PIi!LVh3tL4XDc682@(QZ|wGfZqWrg1;ly2p*{f@mWCVZzwI*s0000< KMNUMnLSTYft@|VZ literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png b/src/Tizen.NUI.Components/res/IoT_progressindicator_progressdisabled.png new file mode 100755 index 0000000000000000000000000000000000000000..d8f57dcac7d87a4b521f87cf1efbb9c9f484f64f GIT binary patch literal 731 zcmV<10wn#3P)d}1(UY-T90n=d$7M?HlS zCrucjxnwka8B@zE$CO?AD(j{ux_E~{0UNq8oz36o9qqLDIO3@b1H3~TXF;vEJnzPI z0VO#6FhD8HnAUgR>vs7GBfgq2K(LN!)7n6Uc1<7&3?B>-K}iJlL7;Z7Zie!aRquouz;?#t@yO?$4Aku%dShBq zM`4^C3iF1k7l=;ql-zM(X>7%Z6a8Y&zwpLqmAf!41-LL28_3pz@)ujg#{_dUPgei{ N002ovPDHLkV1oa%M>7Bb literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png b/src/Tizen.NUI.Components/res/IoT_slider_handler_normal.png new file mode 100755 index 0000000000000000000000000000000000000000..84238df9cf37e9aab0553d2dd2c5cfda00971200 GIT binary patch literal 968 zcmV;(12_DMP)pRc$ z+vj^;rlQv&U5{2Z3ehoUswSq*B)riT!!k)izeH$+iC3N8Kvk!D%sz*SpE_q$1=#4 z*jmBlpoA<~zZaHj&WBn69(@ONccU`6% zF$box*rMlM;mSKvJF%o2RyqS9^d_S!4wzEE6s$%Lpp=#P5n(+VYbK4lkmePu5#-}D zQ=+JaBSx%K6K(}mz)O)*+I>d+d_s2Zop03vL(xapD`Vqu*S4TZ+^`lIhlR`(B0H3s zWddB8G0I+tKnx}vQKUUnD<;DL11O_fi9*^(%_h{KhrkKAFruF+xd4tM5#7*} zXdNX%nkdscX2PzY$_=wyNKOaZTt%K*$$_&jP{gRO(OB!nWpLvMQN0x(_>hZaw2)y~ z=wJ|TLxp~a(WA!EodXJmj_)Z6m-PZ_$Nz*vAdjVOirMzSmjyu14Tk)74Efi9x#_<^ ziA<)Ix}KVTaXYJT>1$A>`4~;50cA;FODJTO1wGwXvj2R(o@J|HI9h)PLEf@fP!0^H zpL?mqVEf`9UHDbH(tN~1M}2o6+$6$7i!D>oW%uR@XIz7+wz<@3Y;t9HHSviDI3QzuiR`Zv^;lI-8h98Idui%QPC-m zaSBCr{_zC|R#{aJ1REFwd(bOyIz`V*l6VICD{Oz69^KlABb5`F5~@+uwg7CtOvnW4 q*iWStj`Rp|GV2`a&3OUI?)d|-+fbMn*^Ar&0000AS%{BLMM4TgAUO_23zd`-Efste z))qn_fh3Jel3o$Kc-n-3jT-F~C0LpiDNFs z-#otY)~&KstJTd^IflB>A=H9)`ffh(xrkn%Y4pJJydSG+!m~97q!ZiAsEB@|tqFC% z@_PY2M1z1mv1uz22#^Cfx{Y?D9X3uQY(DbtEjka_>v}%w0s(WC$`?_4gCHxbz2n6w zP(yM4Vu66UM z0Qk;B1*p>|Q3%M78O2T7!xY!i8onE5Ox1w=+4LyI0Ja_NISflcy-@`dNQ>D)TQ4cw z%>Z{l*< zayMkT3+miWd!5`SaM!obD7dkCX*ZAzkVHwgCxj{sI)? V(>aVM6w3er002ovPDHLkV1g=iOSJ$1 literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png b/src/Tizen.NUI.Components/res/IoT_slider_status_empty_track.png new file mode 100755 index 0000000000000000000000000000000000000000..541142c666c13401b2729b9cddc744c2cdb94b45 GIT binary patch literal 331 zcmV-R0kr;!P)duZb<$A`#Y84-~TWMMg}dA*eIY=2>fTb#=yk5ijkRh zwvCa-Ge%HkF#P$s>i>U+J^%l+tg^GvzD6gfj9LQ>fkP**YB4hY31ehraA9C!4`V!h z`f@$PzkiIj=K2kzAvACy0E-94LnkhNW?*13AI%v97a1U%AvxvmYR1E-E*)oNWUR9> z)!jX?P8!*^!z1L-$;-J64F6T_%=Pj{c90CL@8Lz(;Y*hU|9@xL0&HEKV*Jmvz}8&n z;=np>WZ4eR8O;Ae8UO!t1y|}I@1HsIjO)k$*J=O%F(v>bMt@`l$pHHn)a+&WznYPi deHN(M3jmbxVlhofKW_j4002ovPDHLkV1mfRk#qn6 literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_track.png b/src/Tizen.NUI.Components/res/IoT_slider_status_track.png new file mode 100755 index 0000000000000000000000000000000000000000..7cd5ccb8b4ad184adfe382f59bf476478eedb952 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^DL~A@!3HGxuSAssDVAa<&kznEsNqQI0P-h!x;Tb- zcqgYYFzLmeZ}`u{^RuU?hs|LfgGY|Y1$~x(|NqxBbV%3N+$?Mm6p`fV>3RJ!{qG9j z9ZnDK@2~IcnX_jedxPcSI+Gb}b}S7$pC~Ac&llgYMT)gqg~hJN?Sw)nXNU2>dKukK zY=JEfU286S)n0Jn+!5rS^-avc$cSO~-kv|r$6A$-C@z@8c!YOBnm$8SyRqWzu4geo P*D-jy`njxgN@xNAGY3rk literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png b/src/Tizen.NUI.Components/res/IoT_slider_status_trackW.png new file mode 100755 index 0000000000000000000000000000000000000000..ffffbdaaa98d633ecc5c2871b194de111c3f1899 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^DL~A@!3HGxuSAssDVAa<&kznEsNqQI0P?FnT^vI^ zypvNHn*RU)&(5&2M!}3BiE+XWjRn~pG7Pt_oj7r#qCrqf^7YHCzbjIAI2{laQCx6i zqdf0oM?ofbN5N0^0T!uO1Q!VWFpyGg)>f>M(cQ!r-qO&m6TqFlB}iUI@bQU`D{pig r%&LE~x8HV~qRq!tdz&Ha8xsS+k@~gy1u>~WXE1oW`njxgN@xNAsarpZ literal 0 HcmV?d00001 diff --git a/src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png b/src/Tizen.NUI.Components/res/IoT_slider_status_track_disabled.png new file mode 100755 index 0000000000000000000000000000000000000000..9607d9c102a5999ed6cbef4a76ee98d5599cb40f GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^DL~A@!3HGxuSAssDVAa<&kznEsNqQI0P@>CT^vI^ zypvNHnw-`3Sq+Sgp8QY$k$>RC0SyKrY1R_nMrNL#p5ATCcCkw=oVan`x@-MWZMG~D zlCqNg^LLdnXk^<F=@<4rDuX*DCSosLq~PGazM^>bP0l+XkK DYa~Jx literal 0 HcmV?d00001 -- 2.7.4