~aleteoryx/muditaos

7f543f7a806d2e8ab4ebe1cb1fe0de8e2c751257 — Lukasz Mastalerz 2 years ago 993c2c4
[BH-1807] Increase clock font

Increase clock font in Relaxation, Meditation, Power nap mode
M harmony_changelog.md => harmony_changelog.md +1 -0
@@ 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

M module-apps/apps-common/widgets/TimeSetSpinner.hpp => module-apps/apps-common/widgets/TimeSetSpinner.hpp +8 -1
@@ 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,

M products/BellHybrid/CMakeLists.txt => products/BellHybrid/CMakeLists.txt +2 -2
@@ 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

M products/BellHybrid/apps/common/include/common/data/StyleCommon.hpp => products/BellHybrid/apps/common/include/common/data/StyleCommon.hpp +2 -2
@@ 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;

M products/BellHybrid/assets/assets_common.json => products/BellHybrid/assets/assets_common.json +1 -0
@@ 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"},