From: David Steele Date: Tue, 9 Nov 2021 10:30:45 +0000 (+0000) Subject: Merge "Adding theme for Raspberry Pi" into devel/master X-Git-Tag: dali_2.0.52~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=38155eb12b3336adcbde7e6d4a36346c342190a1;hp=6ed6ac87231267f52ac320bf2fd1e7e3ec439ba5 Merge "Adding theme for Raspberry Pi" into devel/master --- diff --git a/dali-toolkit/styles/1920x1080_rpi/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080_rpi/dali-toolkit-default-theme.json new file mode 100644 index 0000000..d862b80 --- /dev/null +++ b/dali-toolkit/styles/1920x1080_rpi/dali-toolkit-default-theme.json @@ -0,0 +1,541 @@ +/* + * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * + * This file is part of Dali Toolkit + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +//****************************************************************************** +// +// Default Reference style theme for a 1920x1080 resolution, The values determined by UX design specification. +// This file can be copied to a new folder within the styles/ directory and amended with new default values. +// Can be overriden if StyleManager applies another style sheet. +// +//****************************************************************************** + +{ + "config": + { + "brokenImageUrl":"{DALI_IMAGE_DIR}broken.png", + "alwaysShowFocus":true, + "clearFocusOnEscape":false + }, + "styles": + { + "Tooltip": + { + "tooltip": + { + "content": + { + "pointSize":24 + }, + "waitTime":0.5, + "background": + { + "visual":"{DALI_IMAGE_DIR}tooltip.9.png", + "border":[1,5,5,1] + }, + "tail": + { + "visibility":false, + "aboveVisual":"{DALI_IMAGE_DIR}tooltip-tail-above.png", + "belowVisual":"{DALI_IMAGE_DIR}tooltip-tail-below.png" + }, + "position":"BELOW", + "hoverPointOffset":[10,10], + "movementThreshold":5, + "disappearOnMovement":false + } + }, + "TextLabel": + { + "pointSize":24, + "enableAutoScroll":false, + "autoScrollLoopCount":2, + "autoScrollGap":50, + "autoScrollSpeed":80, + "ignoreSpacesAfterText":false + }, + + "TextLabelFontSize0": + { + "pointSize":24 + }, + "TextLabelFontSize1": + { + "pointSize":28 + }, + "TextLabelFontSize2": + { + "pointSize":32 + }, + "TextLabelFontSize3": + { + "pointSize":36 + }, + "TextLabelFontSize4": + { + "pointSize":40 + }, + + "TextField": + { + "pointSize":28, + "primaryCursorColor":[0.0,0.72,0.9,1.0], + "secondaryCursorColor":[0.0,0.72,0.9,1.0], + "cursorWidth":6, + "selectionHighlightColor":[0.75,0.96,1.0,1.0], + "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", + "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, + "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }, + "enableSelection":false + }, + + "TextFieldFontSize0": + { + "pointSize":24 + }, + "TextFieldFontSize1": + { + "pointSize":28 + }, + "TextFieldFontSize2": + { + "pointSize":32 + }, + "TextFieldFontSize3": + { + "pointSize":36 + }, + "TextFieldFontSize4": + { + "pointSize":40 + }, + "TextSelectionPopup": + { + "popupMaxSize":[1700,100], + "optionDividerSize":[2,0], + "popupDividerColor":[0.23,0.72,0.8,0.11], + "popupIconColor":[1.0,1.0,1.0,1.0], + "popupPressedColor":[0.24,0.72,0.8,0.11], + "background": { + "rendererType": "image", + "url": "{DALI_IMAGE_DIR}selection-popup-background.9.png" + }, + "backgroundBorder": { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png", + "mixColor":[0.24,0.72,0.8,1.0] + }, + "popupFadeInDuration":0.25, + "popupFadeOutDuration":0.25 + }, + "TextSelectionPopupButton": + { + "label": + { + "visualType":"TEXT", + "pointSize":24 + }, + "unselectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "" + }, + "selectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "" + } + }, + "TextSelectionToolbar": + { + "enableOvershoot":true, + "enableScrollBar":true, + "scrollView": + { + "overshootAnimationSpeed":360.0, + "overshootSize":[1920.0,130.0] + } + }, + "TextSelectionScrollBar": + { + "indicatorShowDuration":0.25, + "indicatorHideDuration":0.25, + "indicatorTransientDuration":1.0 + }, + "TextSelectionScrollIndicator": + { + "image": + { + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png" + }, + "color":[0.0,0.72,0.9,0.7] + }, + "ScrollView": + { + "overshootEffectColor":"B018", + "overshootAnimationSpeed":960.0, + "overshootSize":[1920.0,130.0] + }, + "ItemView": + { + "overshootEffectColor":"B018", + "overshootAnimationSpeed":960.0, + "overshootSize":[1920.0,130.0] + }, + "ScrollBar": + { + "indicatorShowDuration":0.25, + "indicatorHideDuration":0.25, + "color":[0.0,0.72,0.9,0.7] + }, + "TextEditor": + { + "pointSize":24, + "primaryCursorColor":[0.0,0.72,0.9,1.0], + "secondaryCursorColor":[0.0,0.72,0.9,1.0], + "cursorWidth":6, + "selectionHighlightColor":[0.75,0.96,1.0,1.0], + "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", + "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, + "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }, + "enableScrollBar":true, + "scrollBarShowDuration":0.8, + "scrollBarFadeDuration":0.5, + "enableSelection":false + }, + "ProgressBar": + { + "trackVisual":{ + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png" + }, + "progressVisual":{ + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-progress.9.png" + }, + "secondaryProgressVisual":{ + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-secondary-progress.9.png" + }, + "indeterminateVisual":{ + "visualType":"IMAGE", + "pixelArea":[0.0, 0.0, 10.0, 1.0], + "wrapModeU":"REPEAT", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-indeterminate.png" + }, + "indeterminateVisualAnimation": + [ + { + "target":"indeterminateVisual", + "property":"pixelArea", + "initialValue":[0.0, 0.0, 10.0, 1.0], + "targetValue":[-1.0, 0.0, 10.0, 1.0], + "animator": + { + "alphaFunction":"DEFAULT", + "timePeriod": + { + "duration":0.8, + "delay":0 + } + } + } + ], + "labelVisual":{ + "visualType": "TEXT", + "textColor": [ 1.0, 1.0, 1.0, 1.0 ], + "pointSize" : 12.0, // Point size must always be provided to Text Visual + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER" + }, + "progressValue": 0.0, + "secondaryProgressValue":0.0, + "indeterminate": false + }, + "CircularProgressBar": + { + "size":[64,64], + "trackVisual":{ + "visualType":"ARC", + "mixColor":[0.0,0.165,0.302,1.0], + "thickness":4.0, + "startAngle":0.0, + "cap":"ROUND" + }, + "progressVisual":{ + "visualType":"ARC", + "mixColor":[0.0,0.549,1.0,1.0], + "thickness":4.0, + "startAngle":0.0, + "cap":"ROUND" + }, + "secondaryProgressVisual":{ + "visualType":"ARC", + "mixColor":[0.0,0.549,1.0,0.3], + "thickness":4.0, + "startAngle":0.0, + "cap":"ROUND" + }, + "indeterminateVisual":{ + "visualType":"ARC", + "mixColor":[0.02,0.71,0.525,1.0], + "thickness":4.0, + "startAngle":267.0, + "sweepAngle":75.0, + "cap":"ROUND" + }, + "indeterminateVisualAnimation": + [ + { + "target":"trackVisual", + "property":"opacity", + "targetValue": 0, + "animator": + { + "alphaFunction":"DEFAULT", + "timePeriod": + { + "duration":0, + "delay":0 + } + } + }, + { + "target":"secondaryProgressVisual", + "property":"opacity", + "targetValue": 0, + "animator": + { + "alphaFunction":"DEFAULT", + "timePeriod": + { + "duration":0, + "delay":0 + } + } + }, + { + "target":"progressVisual", + "property":"sweepAngle", + "initialValue": 75, + "targetValue": 180, + "animator": + { + "alphaFunction":[0.439, 0.0, 0.718, 0.428], + "timePeriod": + { + "duration":1.0, + "delay":0.0 + } + } + }, + { + "target":"progressVisual", + "property":"sweepAngle", + "targetValue": 75, + "animator": + { + "alphaFunction":[0.224, 0.571, 0.53, 1.0], + "timePeriod": + { + "duration":1.0, + "delay":2.0 + } + } + }, + { + "target":"progressVisual", + "property":"startAngle", + "initialValue": 87, + "targetValue": 1887, + "animator": + { + "alphaFunction":[0.33, 0.0, 0.3, 1.0], + "timePeriod": + { + "duration":3.0, + "delay":0.0 + } + } + }, + { + "target":"indeterminateVisual", + "property":"sweepAngle", + "initialValue": 75, + "targetValue": 180, + "animator": + { + "alphaFunction":[0.439, 0.0, 0.718, 0.428], + "timePeriod": + { + "duration":1.0, + "delay":0.0 + } + } + }, + { + "target":"indeterminateVisual", + "property":"sweepAngle", + "targetValue": 75, + "animator": + { + "alphaFunction":[0.224, 0.571, 0.53, 1.0], + "timePeriod": + { + "duration":1.0, + "delay":2.0 + } + } + }, + { + "target":"indeterminateVisual", + "property":"startAngle", + "initialValue": 267, + "targetValue": 2067, + "animator": + { + "alphaFunction":[0.33, 0.0, 0.3, 1.0], + "timePeriod": + { + "duration":3.0, + "delay":0.0 + } + } + } + ], + "labelVisual":{ + "visualType": "TEXT", + "textColor": [ 1.0, 1.0, 1.0, 1.0 ], + "pointSize" : 32.0, // Point size must always be provided to Text Visual + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER" + }, + "progressValue": 0.2, + "secondaryProgressValue":0.4, + "indeterminate": false + }, + "Button": + { + "styles":["Tooltip"], + "initialAutoRepeatingDelay":2.0, + "nextAutoRepeatingDelay":0.9 + // Note: Visuals added to Button will be used in all derived buttons unless overridden. + }, + "PushButton": + { + "styles":["Button"], + "autoRepeating":false, + "togglable":false, + "labelPadding":[ 12.0, 12.0, 12.0, 12.0 ], + "label": + { + "visualType": "TEXT", + "horizontalAlignment": "CENTER", + "pointSize" : 24.0, // Point size must always be provided to Text Visual + "verticalAlignment": "CENTER" + }, + "unselectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}button-up.9.png" + }, + "selectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}button-down.9.png" + }, + "disabledSelectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}button-down-disabled.9.png" + }, + "disabledUnselectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}button-disabled.9.png" + } + }, + "ToggleButton": + { + "styles":["Button"] + }, + "CheckBoxButton": + { + "styles":["Button"], + "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ], + "label": + { + "visualType": "TEXT", + "pointSize" : 24.0, // Point size must always be provided to Text Visual + "verticalAlignment": "CENTER" + }, + "unselectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}checkbox-unselected.png" + }, + "selectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}checkbox-selected.png" + }, + "disabledUnselectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png" + }, + "disabledSelectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png" + } + }, + "RadioButton": + { + "styles":["Button"], + "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ], + "label": + { + "visualType": "TEXT", + "pointSize" : 24.0, // Point size must always be provided to Text Visual + "verticalAlignment": "CENTER" + }, + "unselectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}radio-button-unselected.png" + }, + "selectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}radio-button-selected.png" + }, + "disabledUnselectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png" + }, + "disabledSelectedVisual": + { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png" + } + } + } +} diff --git a/dali-toolkit/styles/1920x1080_rpi/images/cursor_handler_drop_center.png b/dali-toolkit/styles/1920x1080_rpi/images/cursor_handler_drop_center.png new file mode 100644 index 0000000..244096f Binary files /dev/null and b/dali-toolkit/styles/1920x1080_rpi/images/cursor_handler_drop_center.png differ diff --git a/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_left.png b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_left.png new file mode 100644 index 0000000..244096f Binary files /dev/null and b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_left.png differ diff --git a/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_right.png b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_right.png new file mode 100644 index 0000000..244096f Binary files /dev/null and b/dali-toolkit/styles/1920x1080_rpi/images/selection_handle_drop_right.png differ diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index c572142..ad23b75 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -34,6 +34,7 @@ Requires: %{name} = %{version}-%{release} Conflicts: %{name}-resources_480x800 Conflicts: %{name}-resources_720x1280 Conflicts: %{name}-resources_1920x1080 +Conflicts: %{name}-resources_1920x1080_rpi %description resources_360x360 dali-toolkit default resource files for 360x360 Contain po / sounds / common images / style / style images @@ -44,6 +45,7 @@ Requires: %{name} = %{version}-%{release} Conflicts: %{name}-resources_360x360 Conflicts: %{name}-resources_720x1280 Conflicts: %{name}-resources_1920x1080 +Conflicts: %{name}-resources_1920x1080_rpi %description resources_480x800 dali-toolkit default resource files for 480x800 Contain po / sounds / common images / style / style images @@ -54,6 +56,7 @@ Requires: %{name} = %{version}-%{release} Conflicts: %{name}-resources_360x360 Conflicts: %{name}-resources_480x800 Conflicts: %{name}-resources_1920x1080 +Conflicts: %{name}-resources_1920x1080_rpi %description resources_720x1280 dali-toolkit default resource files for 720x1280 Contain po / sounds / common images / style / style images @@ -64,10 +67,23 @@ Requires: %{name} = %{version}-%{release} Conflicts: %{name}-resources_360x360 Conflicts: %{name}-resources_480x800 Conflicts: %{name}-resources_720x1280 +Conflicts: %{name}-resources_1920x1080_rpi %description resources_1920x1080 dali-toolkit default resource files for 1920x1080 Contain po / sounds / common images / style / style images +%package resources_1920x1080_rpi +Summary: default resource files for 1920x1080 on Raspberry Pi 4 +Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-resources_360x360 +Conflicts: %{name}-resources_480x800 +Conflicts: %{name}-resources_720x1280 +Conflicts: %{name}-resources_1920x1080 +%description resources_1920x1080_rpi +dali-toolkit default resource files for 1920x1080 on Raspberry Pi 4 +Contain po / sounds / common images / style / style images + + ############################## # devel ############################## @@ -199,6 +215,8 @@ mkdir -p %{buildroot}%{dali_toolkit_style_files}/720x1280 cp -r dali-toolkit/styles/720x1280/* %{buildroot}%{dali_toolkit_style_files}/720x1280 mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080 cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080 +mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080_rpi +cp -r dali-toolkit/styles/1920x1080_rpi/* %{buildroot}%{dali_toolkit_style_files}/1920x1080_rpi # Copy default feedback theme cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_style_files} @@ -244,6 +262,15 @@ case "$1" in ;; esac +%pre resources_1920x1080_rpi +case "$1" in + 2) + pushd %{dali_toolkit_style_files} + rm -rf ./* + popd + ;; +esac + ############################## # Post Install ############################## @@ -271,6 +298,11 @@ pushd %{dali_toolkit_style_files}/1920x1080 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done popd +%post resources_1920x1080_rpi +pushd %{dali_toolkit_style_files}/1920x1080_rpi +for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done +popd + ############################## # Pre Uninstall ############################## @@ -319,6 +351,17 @@ case "$1" in ;; esac +%preun resources_1920x1080_rpi +case "$1" in + 0) + %preun resources_1920x1080_rpi + pushd %{dali_toolkit_style_files} + mv images ./1920x1080_rpi + mv dali-toolkit-default-theme.json ./1920x1080_rpi + popd + ;; +esac + ############################## # Post Uninstall ############################## @@ -362,6 +405,15 @@ case "$1" in ;; esac +%postun resources_1920x1080_rpi +case "$1" in + 0) + pushd %{dali_toolkit_style_files} + rm -rf * + popd + ;; +esac + ############################## # Files in Binary Packages ############################## @@ -417,6 +469,15 @@ esac %{dali_toolkit_style_files}/default-feedback-theme.json %{_datadir}/locale/*/LC_MESSAGES/* +%files resources_1920x1080_rpi +%manifest dali-toolkit-resources.manifest +%defattr(-,root,root,-) +%{dali_toolkit_image_files}/* +%{dali_toolkit_sound_files}/* +%{dali_toolkit_style_files}/1920x1080_rpi/* +%{dali_toolkit_style_files}/default-feedback-theme.json +%{_datadir}/locale/*/LC_MESSAGES/* + %files -n %{dali2_scene_loader} %if 0%{?enable_dali_smack_rules} %manifest dali-scene-loader.manifest-smack