From a934bdf1585c718818861038d988e5671597af0a Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Fri, 22 Apr 2022 15:05:43 +0900 Subject: [PATCH] add theme to TextSelectionPopup according to 7.0 UX Change-Id: Ia39f62cb8183109be4bd5c6046b488aeed3f682b Signed-off-by: Bowon Ryu --- .../720x1280/dali-toolkit-default-theme.json | 27 ++++++++++----------- .../IoT-selection-popup-background.9.png | Bin 253 -> 395 bytes .../images-common/IoT-selection-popup-border.9.png | Bin 0 -> 597 bytes 3 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index 3b5d1ce..62b232d 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -98,36 +98,35 @@ }, "TextSelectionPopup": { - "popupMaxSize":[656,36], - "optionDividerSize":[1,0], - "optionDividerPadding":[0.0,0.0,6.0,6.0], - "popupDividerColor":[1.0,1.0,1.0,1.0], + "popupMaxSize":[656,40], + "optionDividerSize":[0,0], + "optionDividerPadding":[0.0,0.0,0.0,0.0], + "popupDividerColor":[0.0,0.0,0.0,1.0], "popupIconColor":[1.0,1.0,1.0,1.0], "popupPressedColor":[0.24,0.72,0.8,0.11], "background": { "visualType": "IMAGE", - "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png", - "mixColor":[0.0,0.05,0.17,0.9] + "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png" }, "backgroundBorder": { "visualType": "IMAGE", - "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png", - "mixColor":[0.0,0.0,0.0,0.0] + "url": "{DALI_IMAGE_DIR}IoT-selection-popup-border.9.png", + "mixColor":[1.0,1.0,1.0,1.0] }, "popupFadeInDuration":0.25, "popupFadeOutDuration":0.25 }, "TextSelectionPopupButton": { - "minimumSize":[0,36], - "labelPadding":[0.0,0.0,0.0,0.0], + "minimumSize":[0,40], + "labelPadding":[-4.0,-4.0,0.0,0.0], "label": { "visualType":"TEXT", - "pointSize":18, - "textColor":[1.0,1.0,1.0,1.0], - "fontFamily":"BreezeSans", - "fontStyle" : {"weight":"light"} + "pointSize":6.0, + "textColor":[0.04,0.06,0.13,1.0], + "fontFamily":"SamsungOneUI", + "fontStyle" : {"weight":"regular"} }, "unselectedBackgroundVisual": { diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png index 7903ae28fb7a2b99218946cd9803e0914bd64cdb..b27254bbaa5d33e0242729a9b95a012c6541c99a 100644 GIT binary patch literal 395 zcmV;60d)R}P)n#{PMog)RA&@>hzI8`+=X)0(oYRC9F$V6tM~$PXl|VN3UZwL;uFY` zaO2h(K@eKwu3}NCV|J7Hi$jW6Z{nfEOapQ}eaJq? z!}DH2d~W1w-tI^r1cvgMM<3l+ear=Q$S^$FPy=IN*yF7pQ@|8x*1W*&l(_alKQaJq p6ZvMLwtX@*uctSyT0DZVs26?}>KneRTfYDR002ovPDHLkV1mZppppOp literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK^0#=pIEGmG zKb`VW@Q?vVYhqKGi1`Y?YgUn^%;p>CD(ow7nl&$T-J|`_`s^9^DeE_!`sK;JecB;o zcdwTn2jt2cwze+e{BC|DGE`q|a-4z#TXRU)nL90p?>RSl9n)>;zagBkxH%%}yYdUJ zfaeQ-cd42FV+nY@;OYA-lZ@>hoCH+33RBn@Z17ko=$P|6?Q;0u=JbYH`^{C_P3@G- z@;@&8`ux@hp%bP-mvY+rvr~R-b4yyQyNLh7$`EG5sk6TW-Ou3Z>gTe~DWM4f#D8RD diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png new file mode 100644 index 0000000000000000000000000000000000000000..553056e890e6f03e7a09f958a21d0c5708d33a4f GIT binary patch literal 597 zcmV-b0;>IqP)$Epz>7EO0PH|+UVLB&Sb`#z!MfBfuZwe-a;jh*w1{2=zRz8UFBDB*cz;SPuNUaYACJ zD#a5^xinElsTC_+lX035uQ1|&r>xpI04>pDF|ihKnF3$H>ws4wv-Po?Y$t~