8 files changed, 22 insertions(+), 25 deletions(-)

M module-apps/apps-common/popups/TetheringOffPopup.cpp
M module-gui/gui/widgets/StatusBar.cpp
M module-gui/gui/widgets/status-bar/Style.hpp
M module-gui/gui/widgets/status-bar/Tethering.cpp
M module-gui/gui/widgets/status-bar/Tethering.hpp
M products/PurePhone/CMakeLists.txt
M products/PurePhone/assets/assets_common.json
M pure_changelog.md

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, 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
 
 #include "TetheringOffPopup.hpp"


@@ 23,6 23,8 @@ namespace gui
         appConfiguration.disable(status_bar::Indicator::Battery);
         appConfiguration.disable(status_bar::Indicator::Signal);
         appConfiguration.disable(status_bar::Indicator::SimCard);
+        appConfiguration.enable(status_bar::Indicator::Tethering);
+
         return appConfiguration;
     }
 

@@ 146,10 146,8 @@ namespace gui::status_bar
         phoneMode->setMaximumSize(phonemode::maxX, this->drawArea.h);
         phoneMode->setMargins(gui::Margins(margins::between, 0, 0, margins::textBottom));
         phoneMode->setAlignment(Alignment(Alignment::Horizontal::Left, Alignment::Vertical::Bottom));
-        tethering = new Tethering(leftBox, 0, 0, 0, 0);
-        tethering->setMaximumSize(tethering::maxX, this->drawArea.h);
-        tethering->setMargins(gui::Margins(margins::between, 0, 0, margins::textBottom));
-        tethering->setAlignment(Alignment(Alignment::Horizontal::Left, Alignment::Vertical::Bottom));
+        tethering = new Tethering(leftBox, 0, 0);
+        tethering->setMargins(gui::Margins(margins::between, 0, 0, margins::tethering));
 
         // center
         centralBox = new HBox(this, 0, 0, 0, 0);


@@ 394,11 392,15 @@ namespace gui::status_bar
     {
         if (tetheringEnabled && configuration.getTetheringState() != sys::phone_modes::Tethering::Off) {
             phoneMode->hide();
+            signal->hide();
+            networkAccessTechnology->hide();
             tethering->show();
         }
         else {
             tethering->hide();
+            signal->show();
             phoneModeEnabled ? phoneMode->show() : phoneMode->hide();
+            showNetworkAccessTechnology(configuration.isEnabled(Indicator::NetworkAccessTechnology));
         }
     }
 

@@ 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


@@ 18,6 18,7 @@ namespace style::status_bar
         inline constexpr auto iconBottom = 4u;
         inline constexpr auto textBottom = 4u;
         inline constexpr auto between    = 10u;
+        inline constexpr auto tethering  = 2u;
     }; // namespace margins
     namespace time
     {


@@ 35,11 36,6 @@ namespace style::status_bar
         inline constexpr auto maxX = 157u;
         inline constexpr auto font = style::window::font::verysmall;
     }; // namespace phonemode
-    namespace tethering
-    {
-        inline constexpr auto maxX = 180u;
-        inline constexpr auto font = style::window::font::verysmall;
-    }; // namespace tethering
     namespace signal
     {
         inline constexpr auto font = style::window::font::verysmall;

@@ 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
 
 #include "Tethering.hpp"


@@ 11,13 11,10 @@
 
 namespace gui::status_bar
 {
-    Tethering::Tethering(Item *parent, std::uint32_t x, std::uint32_t y, std::uint32_t w, std::uint32_t h)
-        : StatusBarWidgetBase(parent, x, y, w, h)
+    constexpr auto tethering_status = "tethering_status";
+
+    Tethering::Tethering(Item *parent, std::uint32_t x, std::uint32_t y) : StatusBarWidgetBase(parent, x, y, 0, 0)
     {
-        setEdges(RectangleEdge::None);
-        setFont(style::status_bar::tethering::font);
-        setTextEllipsisType(TextEllipsis::Right);
-        setText(utils::translate("statusbar_tethering"));
-        setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center));
+        set(tethering_status, style::status_bar::imageTypeSpecifier);
     }
 } // namespace gui::status_bar

@@ 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


@@ 10,7 10,7 @@
 namespace gui::status_bar
 {
     /// widget drawn on the status bar showing current tethering state:
-    class Tethering : public StatusBarWidgetBase<Label>
+    class Tethering : public StatusBarWidgetBase<Image>
     {
 
       public:


@@ 18,9 18,7 @@ namespace gui::status_bar
         /// @param parent parent item pointer
         /// @param x widget x position
         /// @param y widget y position
-        /// @param w widget width
-        /// @param h widget height
-        Tethering(Item *parent, std::uint32_t x, std::uint32_t y, std::uint32_t w, std::uint32_t h);
+        Tethering(Item *parent, std::uint32_t x, std::uint32_t y);
     };
 
 } // namespace gui::status_bar

@@ 160,7 160,7 @@ download_asset_release_json(json-common-target
                             ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json
                             ${SYSROOT_PATH}/
                             MuditaOSPublicAssets
-                            0.0.8
+                            0.0.9
                             ${MUDITA_CACHE_DIR}
     )
 download_asset_release_json(json-community-target

@@ 99,6 99,7 @@
         {"name":"release.tgz", "tarfile": "./image/assets/images/status-bar/bt_status_W_G.vpi", "output": "system_a/assets/images/status-bar/bt_status_W_G.vpi" },
         {"name":"release.tgz", "tarfile": "./image/assets/images/status-bar/alarmclock_status_W_G.vpi", "output": "system_a/assets/images/status-bar/alarmclock_status_W_G.vpi" },
         {"name":"release.tgz", "tarfile": "./image/assets/images/status-bar/bt_status_W_M.vpi", "output": "system_a/assets/images/status-bar/bt_status_W_M.vpi" },
+        {"name":"release.tgz", "tarfile": "./image/assets/images/status-bar/tethering_status_W_G.vpi", "output": "system_a/assets/images/status-bar/tethering_status_W_G.vpi" },
         {"name":"release.tgz", "tarfile": "./image/assets/images/dot_12px_hard_alpha_W_G.vpi", "output": "system_a/assets/images/dot_12px_hard_alpha_W_G.vpi" },
         {"name":"release.tgz", "tarfile": "./image/assets/images/arrow_left_20px_W_M.vpi", "output": "system_a/assets/images/arrow_left_20px_W_M.vpi" },
         {"name":"release.tgz", "tarfile": "./image/assets/images/arrow_right_empty_32px_W_G.vpi", "output": "system_a/assets/images/arrow_right_empty_32px_W_G.vpi" },

@@ 17,6 17,7 @@
 * Changed responses in contacts and messages endpoints used to communicate with Center
 * Added SMS template call rejection window for case when no templates are defined
 * Changed unknown character glyph to the one matching the design
+* Changed tethering icon on status bar
 
 ### Fixed