Peter M. Groen / dali-demo

Commit 0b4216171a0df04f7170fe4b61a5fdc04930bbe4

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 69e0edeb f64ea946

Merge "(Android) Ensure fonts are correct size on target" into devel/master

Inline Side-by-side
Showing 5 changed files with 218 additions and 13 deletions
build/android/dali/build_toolkit.sh
  View file @0b42161
... ... @@ -27,7 +27,7 @@ else
27 27 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files
28 28 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files
29 29  
30   - ${ANDROID_SDK}/cmake/3.22.1/bin/cmake ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='720x1280' -DANDROID_HOST_COMPILER="$CXX"
  30 + ${ANDROID_SDK}/cmake/3.22.1/bin/cmake ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='2048x1080' -DANDROID_HOST_COMPILER="$CXX"
31 31 fi
32 32  
33 33 make -j8 || exit 1
... ...
build/tizen/CMakeLists.txt
  View file @0b42161
... ... @@ -195,19 +195,19 @@ ENDIF()
195 195 #Create resources location file
196 196 CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp )
197 197  
198   -MESSAGE("Installing from: ${LOCAL_STYLE_DIR}")
199   -FILE(GLOB LOCAL_STYLES_LIST "${LOCAL_STYLE_DIR}/*.json")
200   -FOREACH(flag ${LOCAL_STYLES_LIST})
201   - INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR})
202   -ENDFOREACH(flag)
203   -MESSAGE("Installed ${LOCAL_STYLES_LIST} to ${STYLE_DIR}")
204   -
205 198 IF(ANDROID)
206   -FILE(GLOB LOCAL_STYLES_ANDROID_LIST "${LOCAL_STYLE_ANDROID_DIR}/*.json")
207   -FOREACH(flag ${LOCAL_STYLES_ANDROID_LIST})
208   - INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR})
209   -ENDFOREACH(flag)
210   -MESSAGE("Installed ${LOCAL_STYLES_ANDROID_LIST} to ${STYLE_DIR}")
  199 + FILE(GLOB LOCAL_STYLES_ANDROID_LIST "${LOCAL_STYLE_ANDROID_DIR}/*.json")
  200 + FOREACH(flag ${LOCAL_STYLES_ANDROID_LIST})
  201 + INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR})
  202 + ENDFOREACH(flag)
  203 + MESSAGE("Installed ${LOCAL_STYLES_ANDROID_LIST} to ${STYLE_DIR}")
  204 +ELSE()
  205 + MESSAGE("Installing from: ${LOCAL_STYLE_DIR}")
  206 + FILE(GLOB LOCAL_STYLES_LIST "${LOCAL_STYLE_DIR}/*.json")
  207 + FOREACH(flag ${LOCAL_STYLES_LIST})
  208 + INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR})
  209 + ENDFOREACH(flag)
  210 + MESSAGE("Installed ${LOCAL_STYLES_LIST} to ${STYLE_DIR}")
211 211 ENDIF()
212 212  
213 213 FILE(GLOB LOCAL_STYLE_IMAGES_LIST "${LOCAL_STYLE_DIR}/images/*.png")
... ...
resources/style/android/demo-theme.json 0 → 100644
  View file @0b42161
  1 +/*
  2 + * Copyright (c) 2024 Samsung Electronics Co., Ltd.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +{
  19 + "includes":
  20 + [
  21 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  22 + ],
  23 +
  24 + "styles":
  25 + {
  26 + "DemoTile":
  27 + {
  28 + "styles":[ "DemoTileBase" ]
  29 + },
  30 +
  31 + "LauncherBackground":
  32 + {
  33 + "background":
  34 + {
  35 + "visualType": "GRADIENT",
  36 + "center": [240, 400],
  37 + "radius": 932,
  38 + "units": "USER_SPACE",
  39 + "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
  40 + }
  41 + },
  42 +
  43 + "BubbleColor1":
  44 + {
  45 + "color": [ 0.3255, 0.3412, 0.6353, 0.32 ]
  46 + },
  47 +
  48 + "BubbleColor2":
  49 + {
  50 + "color": [ 0.3647, 0.7569, 0.8157, 0.32 ]
  51 + },
  52 +
  53 + "BubbleColor3":
  54 + {
  55 + "color": [ 0.3804, 0.7412, 0.6510, 0.32 ]
  56 + },
  57 +
  58 + "BubbleColor4":
  59 + {
  60 + "color": [ 1, 1, 1, 0.13 ]
  61 + }
  62 +
  63 + }
  64 +}
... ...
resources/style/android/examples-theme.json 0 → 100644
  View file @0b42161
  1 +/*
  2 + * Copyright (c) 2024 Samsung Electronics Co., Ltd
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +{
  19 + "includes":
  20 + [
  21 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  22 + ],
  23 +
  24 + "styles":
  25 + {
  26 + "DemoTile":
  27 + {
  28 + "styles": ["DemoTileBase"],
  29 + "states":
  30 + {
  31 + "NORMAL":
  32 + {
  33 + "color":[0.9, 0.4, 0.4, 0.6]
  34 + }
  35 + }
  36 + },
  37 +
  38 + "LauncherBackground":
  39 + {
  40 + "background":
  41 + {
  42 + "visualType": "GRADIENT",
  43 + "center": [240, 400],
  44 + "radius": 932,
  45 + "units": "USER_SPACE",
  46 + "stopColor": [[0,0,0,1.0],[0.556863,0.054902,0,1.0]]
  47 + }
  48 + },
  49 +
  50 + "BubbleColor1":
  51 + {
  52 + "color": [ 0.8255, 0.2412, 0.1353, 0.32 ]
  53 + },
  54 +
  55 + "BubbleColor2":
  56 + {
  57 + "color": [ 0.8647, 0.4569, 0.3157, 0.32 ]
  58 + },
  59 +
  60 + "BubbleColor3":
  61 + {
  62 + "color": [ 0.9804, 0.5412, 0.5510, 0.32 ]
  63 + },
  64 +
  65 + "BubbleColor4":
  66 + {
  67 + "color": [ 1, 0, 0, 0.13 ]
  68 + }
  69 +
  70 + }
  71 +}
... ...
resources/style/android/tests-theme.json 0 → 100644
  View file @0b42161
  1 +/*
  2 + * Copyright (c) 2024 Samsung Electronics Co., Ltd
  3 + * Licensed under the Apache License, Version 2.0 (the "License");
  4 + * you may not use this file except in compliance with the License.
  5 + * You may obtain a copy of the License at
  6 + *
  7 + * http://www.apache.org/licenses/LICENSE-2.0
  8 + *
  9 + * Unless required by applicable law or agreed to in writing, software
  10 + * distributed under the License is distributed on an "AS IS" BASIS,
  11 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12 + * See the License for the specific language governing permissions and
  13 + * limitations under the License.
  14 + *
  15 + */
  16 +
  17 +{
  18 + "includes":
  19 + [
  20 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  21 + ],
  22 +
  23 + "styles":
  24 + {
  25 + "DemoTile":
  26 + {
  27 + "styles": ["DemoTileBase"],
  28 + "states":
  29 + {
  30 + "NORMAL":
  31 + {
  32 + "color":[0.6, 0.4, 0.9, 0.6]
  33 + }
  34 + }
  35 + },
  36 +
  37 + "LauncherBackground":
  38 + {
  39 + "background":
  40 + {
  41 + "visualType": "GRADIENT",
  42 + "center": [240, 400],
  43 + "radius": 932,
  44 + "units": "USER_SPACE",
  45 + "stopColor": [[0.392157,0.254902,0.647059,1.0],[0.164706,0.0313725,0.270588,1.0]]
  46 + }
  47 + },
  48 +
  49 + "BubbleColor1":
  50 + {
  51 + "color": [ 0.8255, 0.2412, 0.9353, 0.32 ]
  52 + },
  53 +
  54 + "BubbleColor2":
  55 + {
  56 + "color": [ 0.8647, 0.4569, 0.8157, 0.32 ]
  57 + },
  58 +
  59 + "BubbleColor3":
  60 + {
  61 + "color": [ 0.9804, 0.5412, 0.9510, 0.32 ]
  62 + },
  63 +
  64 + "BubbleColor4":
  65 + {
  66 + "color": [ 1, 1, 1, 0.13 ]
  67 + }
  68 +
  69 + }
  70 +}
... ...