9 files changed, 31 insertions(+), 11 deletions(-)

M module-gui/gui/widgets/Style.hpp
M products/BellHybrid/CMakeLists.txt
M products/BellHybrid/apps/application-bell-settings/windows/BellSettingsLayoutWindow.cpp
M products/BellHybrid/apps/common/include/common/widgets/LayoutVertical.hpp
M products/BellHybrid/apps/common/include/common/widgets/TimeSetSpinnerVertical.hpp
M products/BellHybrid/apps/common/src/layouts/HomeScreenLayoutVerticalWithAmPm.cpp
M products/BellHybrid/apps/common/src/widgets/LayoutVertical.cpp
M products/BellHybrid/assets/assets_community.json
M products/BellHybrid/assets/assets_proprietary.json

@@ 58,6 58,7 @@ namespace style
         inline constexpr auto default_rect_yaps            = 10U;
         namespace font
         {
+            inline constexpr auto colossal         = "colossal";
             inline constexpr auto huge             = "huge";
             inline constexpr auto supersizeme      = "supersizeme";
             inline constexpr auto supersizemelight = "supersizemelight";

@@ 108,14 108,14 @@ download_asset_release_json(json-common-target
                             ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json
                             ${CMAKE_BINARY_DIR}/sysroot/sys/current/
                             MuditaOSPublicAssets
-                            0.0.7
+                            0.0.8
                             ${MUDITA_CACHE_DIR}
     )
 download_asset_release_json(json-community-target
                             ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_community.json
                             ${CMAKE_BINARY_DIR}/sysroot/sys/current/
                             MuditaOSPublicAssets
-                            0.0.7
+                            0.0.8
                             ${MUDITA_CACHE_DIR}
     )
 download_asset_json(json-rt1051-target

@@ 8,8 8,7 @@
 
 namespace
 {
-    inline constexpr auto arrowsWidth      = 580U;
-    inline constexpr auto arrowsLeftMargin = 10U;
+    inline constexpr auto arrowsOuterMargin = 48U;
 } // namespace
 
 namespace gui


@@ 40,7 39,7 @@ namespace gui
         auto selectedLayout = presenter->getSelectedLayout();
         spinner->setCurrentValue(selectedLayout);
 
-        createArrowsOverlay(0, 0, arrowsWidth, style::window_height);
+        createArrowsOverlay(0, 0, style::window_width, style::window_height);
         arrowLeft->setVisible(!spinner->isAtMin());
         arrowRight->setVisible(!spinner->isAtMax());
 


@@ 53,23 52,26 @@ namespace gui
 
     void BellSettingsLayoutWindow::createArrowsOverlay(unsigned int x, unsigned y, unsigned int w, unsigned int h)
     {
-        auto arrowsOverlay = new HBox{this, arrowsLeftMargin, y, w, h};
+        auto arrowsOverlay = new HBox{this, x, y, w, h};
         arrowsOverlay->setEdges(gui::RectangleEdge::None);
         arrowLeft = new Image("bell_arrow_left_W_M");
         arrowLeft->setAlignment(Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center));
         arrowLeft->activeItem = false;
         arrowLeft->setEdges(RectangleEdge::None);
+        arrowLeft->setMargins(Margins{arrowsOuterMargin, 0, 0, 0});
         arrowsOverlay->addWidget(arrowLeft);
 
         arrowRight = new Image("bell_arrow_right_W_M");
         arrowRight->setAlignment(Alignment(Alignment::Horizontal::Right, Alignment::Vertical::Center));
         arrowRight->activeItem = false;
         arrowRight->setEdges(RectangleEdge::None);
+        arrowRight->setMargins(Margins{0, 0, arrowsOuterMargin, 0});
 
         auto rectFiller = new gui::Rect(arrowsOverlay,
                                         0U,
                                         0U,
-                                        arrowsOverlay->getWidth() - arrowLeft->getWidth() - arrowRight->getWidth(),
+                                        arrowsOverlay->getWidth() - arrowLeft->getWidth() - arrowRight->getWidth() -
+                                            (2 * arrowsOuterMargin),
                                         arrowsOverlay->getHeight());
 
         rectFiller->setMaximumSize(arrowsOverlay->getWidth(), arrowsOverlay->getHeight());

@@ 9,8 9,10 @@
 
 namespace style::homescreen_vertical
 {
-    constexpr inline auto side_box_w   = 180U;
+    constexpr inline auto side_box_w   = 120U;
     constexpr inline auto center_box_w = 240U;
+    constexpr inline auto leftMargin   = 60U;
+    constexpr inline auto rightMargin  = 60U;
 } // namespace style::homescreen_vertical
 
 namespace gui

@@ 19,6 19,7 @@ namespace style::time_set_spinner_vertical
 
     inline constexpr auto small_margin = 6U;
     inline constexpr auto big_margin   = 44U;
+    inline constexpr auto colossal_margin = -40;
 } // namespace style::time_set_spinner_vertical
 
 namespace gui


@@ 64,7 65,8 @@ namespace gui
             {style::window::font::verybiglight, {0, 0, 0, style::time_set_spinner_vertical::small_margin}},
             {style::window::font::largelight, {0, 0, 0, style::time_set_spinner_vertical::small_margin}},
             {style::window::font::supersizemelight, {0, 0, 0, style::time_set_spinner_vertical::big_margin}},
-            {style::window::font::huge, {0, 0, 0, style::time_set_spinner_vertical::big_margin}}};
+            {style::window::font::huge, {0, 0, 0, style::time_set_spinner_vertical::big_margin}},
+            {style::window::font::colossal, {0, 0, 0, style::time_set_spinner_vertical::colossal_margin}}};
 
         void handleContentChanged() override;
 

@@ 37,6 37,7 @@ namespace gui
         leftTopBox->addWidget(alarmMainIcon);
         leftTopBox->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
         alarmMainIcon->setMargins(Margins{0, style::homescreen_vertical_ampm::alarm_margin_top, 0, 0});
+        alarmMainIcon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
 
         leftBottomBox->addWidget(battery);
         leftBottomBox->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Bottom));


@@ 45,7 46,7 @@ namespace gui
         rightBox->setAlignment(Alignment(Alignment::Horizontal::Right, Alignment::Vertical::Bottom));
         fmt = new TextFixedSize(rightBox, 0, 0, 0, 0);
         fmt->setMaximumSize(style::bell_base_layout::outer_layouts_w, style::bell_base_layout::outer_layouts_h);
-        fmt->setFont(mainWindow::bottomDescription::font_small);
+        fmt->setFont(mainWindow::bottomDescription::font_normal);
         fmt->setEdges(RectangleEdge::None);
         fmt->activeItem = false;
         fmt->drawUnderline(false);

@@ 33,13 33,14 @@ namespace gui
         leftBox = new VBox(mainScreen, 0, 0, 0, 0);
         leftBox->setMinimumSize(style::homescreen_vertical::side_box_w, style::window_height);
         leftBox->setEdges(RectangleEdge::None);
+        leftBox->setMargins(Margins({style::homescreen_vertical::leftMargin, 0, 0, 0}));
 
         auto centerBox = new VBox(mainScreen, 0, 0, 0, 0);
         centerBox->setMinimumSize(style::homescreen_vertical::center_box_w, style::window_height);
         centerBox->setEdges(RectangleEdge::None);
 
         time = new TimeSetSpinnerVertical(centerBox);
-        time->setFont(mainWindow::time::font);
+        time->setFont(style::window::font::colossal);
         time->setMinimumSize(style::homescreen_vertical::center_box_w, style::window_height);
         time->setEdges(RectangleEdge::None);
         time->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));


@@ 47,6 48,7 @@ namespace gui
         rightBox = new VBox(mainScreen, 0, 0, 0, 0);
         rightBox->setMinimumSize(style::homescreen_vertical::side_box_w, style::window_height);
         rightBox->setEdges(RectangleEdge::None);
+        rightBox->setMargins(Margins({0, 0, style::homescreen_vertical::rightMargin, 0}));
 
         alarmMainIcon = new AlarmIcon(nullptr);
         alarmMainIcon->setMinimumSize(style::bell_base_layout::outer_layouts_w,

@@ 12,6 12,11 @@
         },
         {
             "name": "release.tgz",
+            "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_light_200.mpf",
+            "output": "assets/fonts/dejavu_sans/dejavu_sans_light_200.mpf"
+        },
+        {
+            "name": "release.tgz",
             "tarfile": "image/assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf",
             "output": "assets/fonts/dejavu_sans/dejavu_sans_regular_90.mpf"
         },

@@ 30,6 30,11 @@
             "output": "assets/fonts/gt_pressura/gt_pressura_regular_190.mpf"
         },
         {
+            "name": "./fonts/bell/gt_pressura_light_200.mpf",
+            "ref": "6e0731ffcc08a682010bb7724a5e1f230a273e2a",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_200.mpf"
+        },
+        {
             "name": "./fonts/common/gt_pressura_light_30.mpf",
             "ref": "10c74fcb09c2022325767cad735c0183b6f5393a",
             "output": "assets/fonts/gt_pressura/gt_pressura_light_30.mpf"