From 7f543f7a806d2e8ab4ebe1cb1fe0de8e2c751257 Mon Sep 17 00:00:00 2001 From: Lukasz Mastalerz Date: Fri, 15 Dec 2023 14:12:25 +0100 Subject: [PATCH] [BH-1807] Increase clock font Increase clock font in Relaxation, Meditation, Power nap mode --- harmony_changelog.md | 1 + module-apps/apps-common/widgets/TimeSetSpinner.hpp | 9 ++++++++- products/BellHybrid/CMakeLists.txt | 4 ++-- .../apps/common/include/common/data/StyleCommon.hpp | 4 ++-- products/BellHybrid/assets/assets_common.json | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/harmony_changelog.md b/harmony_changelog.md index 23dca354b7547dc04316603d87f746450ec5cac5..29ebbf7da8de090100ccf64c0c406e522aa7e479 100644 --- a/harmony_changelog.md +++ b/harmony_changelog.md @@ -5,6 +5,7 @@ ### Fixed * Fixed eink crash while refreshing * Fixed problem with occasional background playback after song has finished +* Increase clock font in Relaxation, Meditation, Power nap mode ### Added * Added brightness fade in functionality diff --git a/module-apps/apps-common/widgets/TimeSetSpinner.hpp b/module-apps/apps-common/widgets/TimeSetSpinner.hpp index 16cd9d96abcbe5f9cf7b28ea63577eb373d9f2db..ebc11593c5936679f3c67633340609c874a68d72 100644 --- a/module-apps/apps-common/widgets/TimeSetSpinner.hpp +++ b/module-apps/apps-common/widgets/TimeSetSpinner.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -21,6 +21,7 @@ namespace style::time_set_spinner inline constexpr auto big_margin = 6U; inline constexpr auto gargantuan_margin_left = 14U; inline constexpr auto gargantuan_margin_right = 7U; + inline constexpr auto align_margin = -12; } // namespace style::time_set_spinner namespace gui @@ -50,6 +51,7 @@ namespace gui {style::window::font::verybiglight, "alarm_colon_W_M"}, {style::window::font::veryverybiglight, "alarm_colon_W_M"}, {style::window::font::largelight, "alarm_colon_W_M"}, + {style::window::font::large, "alarm_large_colon_W_M"}, {style::window::font::supersizeme, "alarm_colon_select_W_M"}, {style::window::font::supersizemelight, "alarm_colon_select_W_M"}, {style::window::font::huge, "alarm_colon_clock_W_M"}, @@ -62,6 +64,11 @@ namespace gui {style::time_set_spinner::very_small_margin, 0, style::time_set_spinner::very_small_margin, 0}}, {style::window::font::largelight, {style::time_set_spinner::small_margin, 0, style::time_set_spinner::small_margin, 0}}, + {style::window::font::large, + {style::time_set_spinner::small_margin, + 0, + style::time_set_spinner::small_margin, + style::time_set_spinner::align_margin}}, {style::window::font::supersizeme, {style::time_set_spinner::big_margin, 0, style::time_set_spinner::big_margin, 0}}, {style::window::font::supersizemelight, diff --git a/products/BellHybrid/CMakeLists.txt b/products/BellHybrid/CMakeLists.txt index d099dd1b6471b0ff9f003df6f8a3ec7e21973cca..cc8a28e2b2bef129c073a4fd8a7edd1808c506f4 100644 --- a/products/BellHybrid/CMakeLists.txt +++ b/products/BellHybrid/CMakeLists.txt @@ -143,14 +143,14 @@ download_asset_release_json(json-common-target ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json ${SYSROOT_PATH}/system_a/ MuditaOSPublicAssets - 0.0.19 + 0.0.20 ${MUDITA_CACHE_DIR} ) download_asset_release_json(json-community-target ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json ${SYSROOT_PATH}/system_a/ MuditaOSPublicAssets - 0.0.19 + 0.0.20 ${MUDITA_CACHE_DIR} ) download_asset_json(json-rt1051-target diff --git a/products/BellHybrid/apps/common/include/common/data/StyleCommon.hpp b/products/BellHybrid/apps/common/include/common/data/StyleCommon.hpp index e9af0934f9b2c9da768d74f6510a6eb98345ba59..572360c95205e4a4e215a943ef4a550488a14301 100644 --- a/products/BellHybrid/apps/common/include/common/data/StyleCommon.hpp +++ b/products/BellHybrid/apps/common/include/common/data/StyleCommon.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -11,7 +11,7 @@ namespace gui::bell_style inline constexpr auto font = ::style::window::font::supersizemelight; inline constexpr auto font_center = ::style::window::font::largelight; inline constexpr auto font_top = ::style::window::font::largelight; - inline constexpr auto statusClockFont = style::window::font::verybiglight; + inline constexpr auto statusClockFont = style::window::font::large; inline constexpr auto popup_icon_top_margin = 120; inline constexpr auto popup_icon_bottom_margin = 30; diff --git a/products/BellHybrid/assets/assets_common.json b/products/BellHybrid/assets/assets_common.json index a342761747314c456a66f9600b1fedc33e6d61f1..a0fed42149c909d4749e638d6313385f7ff7821d 100644 --- a/products/BellHybrid/assets/assets_common.json +++ b/products/BellHybrid/assets/assets_common.json @@ -28,6 +28,7 @@ {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl4_W_M.vpi", "output": "assets/images/bell_battery_lvl4_W_M.vpi"}, {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_charging_W_M.vpi", "output": "assets/images/bell_battery_charging_W_M.vpi"}, {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_colon_W_M.vpi", "output": "assets/images/alarm_colon_W_M.vpi"}, + {"name": "release.tgz", "tarfile" :"image/assets/images/bell/alarm_large_colon_W_M.vpi", "output": "assets/images/alarm_large_colon_W_M.vpi"}, {"name": "release.tgz", "tarfile" :"image/assets/images/bell/big_check_W_M.vpi", "output": "assets/images/big_check_W_M.vpi"}, {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_lightning_W_M.vpi", "output": "assets/images/bell_lightning_W_M.vpi"}, {"name": "release.tgz", "tarfile" :"image/assets/images/bell/bell_battery_lvl5_W_M.vpi", "output": "assets/images/bell_battery_lvl5_W_M.vpi"},