From: minho.sun Date: Mon, 20 Nov 2017 10:16:43 +0000 (+0900) Subject: Support 360x360 resoruce package for wearable X-Git-Tag: dali_1.3.2~8^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a96d7258741bc8d531dfbcc7e57ad7b129ed2336 Support 360x360 resoruce package for wearable Support 360x360 resource package for wearable. Make special PushButton for wearable. Change-Id: Id50c30e5db0f33125f78ea2ade51e572212dc431 Signed-off-by: minho.sun --- diff --git a/dali-toolkit/styles/360x360/dali-toolkit-default-theme.json b/dali-toolkit/styles/360x360/dali-toolkit-default-theme.json new file mode 100644 index 0000000..735b0e5 --- /dev/null +++ b/dali-toolkit/styles/360x360/dali-toolkit-default-theme.json @@ -0,0 +1,385 @@ +/* + * Copyright (c) 2016 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 480x800 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": + { + "alwaysShowFocus":false, + "clearFocusOnEscape":true + }, + "styles": + { + "TextLabel": + { + "pointSize":18, + "enableAutoScroll":false, + "autoScrollLoopCount":2, + "autoScrollGap":50, + "autoScrollSpeed":80 + }, + + "TextLabelFontSize0": + { + "pointSize":8 + }, + "TextLabelFontSize1": + { + "pointSize":10 + }, + "TextLabelFontSize2": + { + "pointSize":15 + }, + "TextLabelFontSize3": + { + "pointSize":19 + }, + "TextLabelFontSize4": + { + "pointSize":25 + }, + "TextField": + { + "pointSize":18, + "primaryCursorColor":[0.0,0.72,0.9,1.0], + "secondaryCursorColor":[0.0,0.72,0.9,1.0], + "cursorWidth":3, + "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":true + }, + + "TextFieldFontSize0": + { + "pointSize":10 + }, + "TextFieldFontSize1": + { + "pointSize":10 + }, + "TextFieldFontSize2": + { + "pointSize":10 + }, + "TextFieldFontSize3": + { + "pointSize":10 + }, + "TextFieldFontSize4": + { + "pointSize":10 + }, + "TextSelectionPopup": + { + "popupMaxSize":[656,72], + "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": { + "visualType": "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":8 + }, + "unselectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "" + }, + "selectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "" + } + }, + "TextSelectionToolbar": + { + "enableOvershoot":true, + "enableScrollBar":true, + "scrollView": + { + "overshootAnimationSpeed":360.0, + "overshootSize":[720.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":360.0, + "overshootSize":[720.0,130.0] + }, + "ItemView": + { + "overshootEffectColor":"B018", + "overshootAnimationSpeed":360.0, + "overshootSize":[720.0,130.0] + }, + "ScrollBar": + { + "indicatorShowDuration":0.25, + "indicatorHideDuration":0.25, + "color":[0.0,0.72,0.9,0.7] + }, + "TextEditor": + { + "pointSize":18, + "primaryCursorColor":[0.0,0.72,0.9,1.0], + "secondaryCursorColor":[0.0,0.72,0.9,1.0], + "cursorWidth":3, + "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":true + }, + "Popup": + { + "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png", + "tailUpImage":"{DALI_IMAGE_DIR}popup_tail_up.png", + "tailDownImage":"{DALI_IMAGE_DIR}popup_tail_down.png", + "tailLeftImage":"{DALI_IMAGE_DIR}popup_tail_left.png", + "tailRightImage":"{DALI_IMAGE_DIR}popup_tail_right.png", + "popupBackgroundBorder":[17,17,13,13] + }, + "ConfirmationPopup": + { + "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png", + "tailUpImage":"{DALI_IMAGE_DIR}popup_tail_up.png", + "tailDownImage":"{DALI_IMAGE_DIR}popup_tail_down.png", + "tailLeftImage":"{DALI_IMAGE_DIR}popup_tail_left.png", + "tailRightImage":"{DALI_IMAGE_DIR}popup_tail_right.png", + "popupBackgroundBorder":[17,17,13,13] + }, + "Slider": + { + "showPopup": true, + "showValue": true, + "valuePrecision": 0, + "trackVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin.9.png", + "size":[27,27] + }, + "progressVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png", + "size":[27,27] + }, + "handleVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin-handle.png", + "size":[72,72] + }, + "popupVisual":"{DALI_IMAGE_DIR}slider-popup.9.png", + "popupArrowVisual":"{DALI_IMAGE_DIR}slider-popup-arrow.9.png", + "disableColor":[0.5, 0.5, 0.5, 1.0], + "popupTextColor":[0.5,0.5,0.5,1.0], + "hitRegion":[0, 72], + "marks":[], + "snapToMarks":false, + "markTolerance":0.05 + }, + "SliderHandleTextLabel": + { + "textColor":[0.8,0.8,1,1] + }, + "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 + }, + "Button": + { + "initialAutoRepeatingDelay":2.0, + "nextAutoRepeatingDelay":0.9 + // Note: Visuals added to Button will be used in all derived buttons unless overridden. + }, + "PushButton": + { + "anchorPoint": [ 0.5, 1.0, 0.5 ], + "parentOrigin": [ 0.5, 1.0, 0,5 ], + "label": + { + "visualType": "TEXT", + "text" : "BOTTOM_BTN", + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER", + "pointSize" : 6.0, + "textColor": [0.98,0.98,0.98,1.0] + }, + "background": + { + "visualType": "IMAGE", + "url": "{DALI_STYLE_IMAGE_DIR}tw_bottom_btn_bg.png", + "mixColor": [0.0,0.21,0.29,0.9] + }, + "selectedStateImage": + { + "visualType": "IMAGE", + "url": "{DALI_STYLE_IMAGE_DIR}tw_bottom_btn_bg.png", + "mixColor": [0.0,0.57,0.8,0.3] + } + }, + "CheckBoxButton": + { + "styles":["Button"], + "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ], + "label": + { + "visualType": "TEXT", + "pointSize" : 10.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" : 10.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/360x360/images/cursor_handler_drop_center.png b/dali-toolkit/styles/360x360/images/cursor_handler_drop_center.png new file mode 100644 index 0000000..a9a2b9e Binary files /dev/null and b/dali-toolkit/styles/360x360/images/cursor_handler_drop_center.png differ diff --git a/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png b/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png new file mode 100644 index 0000000..d9ed8b8 Binary files /dev/null and b/dali-toolkit/styles/360x360/images/selection_handle_drop_left.png differ diff --git a/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png b/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png new file mode 100644 index 0000000..f66b26b Binary files /dev/null and b/dali-toolkit/styles/360x360/images/selection_handle_drop_right.png differ diff --git a/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png b/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png new file mode 100755 index 0000000..55522be Binary files /dev/null and b/dali-toolkit/styles/360x360/images/tw_bottom_btn_bg.png differ diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 6d8b558..1ca37e3 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -51,9 +51,20 @@ user interface functionality. ############################## # resource ############################## +%package resources_360x360 +Summary: default resource files for 360x360 +Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-resources_480x800 +Conflicts: %{name}-resources_720x1280 +Conflicts: %{name}-resources_1920x1080 +%description resources_360x360 +dali-toolkit default resource files for 360x360 +Contain po / sounds / common images / style / style images + %package resources_480x800 Summary: default resource files for 480x800 Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-resources_360x360 Conflicts: %{name}-resources_720x1280 Conflicts: %{name}-resources_1920x1080 %description resources_480x800 @@ -63,6 +74,7 @@ Contain po / sounds / common images / style / style images %package resources_720x1280 Summary: default resource files for 720x1280 Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-resources_360x360 Conflicts: %{name}-resources_480x800 Conflicts: %{name}-resources_1920x1080 %description resources_720x1280 @@ -72,6 +84,7 @@ Contain po / sounds / common images / style / style images %package resources_1920x1080 Summary: default resource files for 1920x1080 Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-resources_360x360 Conflicts: %{name}-resources_480x800 Conflicts: %{name}-resources_720x1280 %description resources_1920x1080 @@ -227,6 +240,8 @@ rm -rf %{buildroot}%{dali_toolkit_style_files}/* # Make folder to contain style and style images # After making folder, copy local style and style images to new folder +mkdir -p %{buildroot}%{dali_toolkit_style_files}/360x360 +cp -r dali-toolkit/styles/360x360/* %{buildroot}%{dali_toolkit_style_files}/360x360 mkdir -p %{buildroot}%{dali_toolkit_style_files}/480x800 cp -r dali-toolkit/styles/480x800/* %{buildroot}%{dali_toolkit_style_files}/480x800 mkdir -p %{buildroot}%{dali_toolkit_style_files}/720x1280 @@ -241,6 +256,15 @@ cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_st # Pre Install ############################## +%pre resources_360x360 +case "$1" in + 2) + pushd %{dali_toolkit_style_files} + rm -rf ./* + popd + ;; +esac + %pre resources_480x800 case "$1" in 2) @@ -275,6 +299,11 @@ esac /sbin/ldconfig exit 0 +%post resources_360x360 +pushd %{dali_toolkit_style_files}/360x360 +for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done +popd + %post resources_480x800 pushd %{dali_toolkit_style_files}/480x800 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done @@ -294,6 +323,17 @@ popd # Pre Uninstall ############################## +%preun resources_360x360 +case "$1" in + 0) + %preun resources_360x360 + pushd %{dali_toolkit_style_files} + mv images ./360x360 + mv dali-toolkit-default-theme.json ./360x360 + popd + ;; +esac + %preun resources_480x800 case "$1" in 0) @@ -334,6 +374,15 @@ esac /sbin/ldconfig exit 0 +%postun resources_360x360 +case "$1" in + 0) + pushd %{dali_toolkit_style_files} + rm -rf * + popd + ;; +esac + %postun resources_480x800 case "$1" in 0) @@ -393,6 +442,15 @@ esac %{dev_include_path}/dali-toolkit/* %{_libdir}/pkgconfig/dali-toolkit.pc +%files resources_360x360 +%manifest dali-toolkit-resources.manifest +%defattr(-,root,root,-) +%{dali_toolkit_image_files}/* +%{dali_toolkit_sound_files}/* +%{dali_toolkit_style_files}/360x360/* +%{dali_toolkit_style_files}/default-feedback-theme.json +%{_datadir}/locale/*/LC_MESSAGES/* + %files resources_480x800 %manifest dali-toolkit-resources.manifest %defattr(-,root,root,-)