[EGD-3993] Integrate ButtonOnOff with OptionSetting (#931)

pawel-olejniczak · web-flow · commit 9684d5eebdd1 · 2020-10-29T15:31:08.000+01:00
diff --git a/module-apps/application-settings-new/windows/AddDeviceWindow.cpp b/module-apps/application-settings-new/windows/AddDeviceWindow.cpp
@@ -41,7 +41,7 @@ namespace gui
                 },
                 nullptr,
                 nullptr,
-                RightIcon::Bt));
+                RightItem::Bt));
         }
 
         sys::Bus::SendUnicast(
diff --git a/module-apps/application-settings-new/windows/AllDevicesWindow.cpp b/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
@@ -63,7 +63,7 @@ namespace gui
                 },
                 nullptr,
                 nullptr,
-                RightIcon::Bt));
+                RightItem::Bt));
         }
 
         topBar->setActive(TopBar::Elements::SIGNAL, false);
diff --git a/module-apps/application-settings-new/windows/BluetoothWindow.cpp b/module-apps/application-settings-new/windows/BluetoothWindow.cpp
@@ -35,12 +35,14 @@ namespace gui
             },
             [=](gui::Item &item) {
                 if (item.focus) {
-                    this->setBottomBarText(utils::localize.get(style::strings::common::Switch),
+                    this->setBottomBarText(utils::translateI18(style::strings::common::Switch),
                                            BottomBar::Side::CENTER);
                 }
                 return true;
             },
-            this));
+            this,
+            isBluetoothSwitchOn ? RightItem::On : RightItem::Off));
+
         if (isBluetoothSwitchOn) {
             optionsList.emplace_back(std::make_unique<gui::OptionSettings>(
                 utils::translateI18("app_settings_bluetooth_all_devices_indent"),
@@ -50,13 +52,13 @@ namespace gui
                 },
                 [=](gui::Item &item) {
                     if (item.focus) {
-                        this->setBottomBarText(utils::localize.get(style::strings::common::select),
+                        this->setBottomBarText(utils::translateI18(style::strings::common::select),
                                                BottomBar::Side::CENTER);
                     }
                     return true;
                 },
                 nullptr,
-                RightIcon::Border));
+                RightItem::ArrowWhite));
             optionsList.emplace_back(std::make_unique<gui::OptionSettings>(
                 utils::translateI18("app_settings_bluetooth_phone_visibility"),
                 [=](gui::Item &item) {
@@ -65,12 +67,13 @@ namespace gui
                 },
                 [=](gui::Item &item) {
                     if (item.focus) {
-                        this->setBottomBarText(utils::localize.get(style::strings::common::Switch),
+                        this->setBottomBarText(utils::translateI18(style::strings::common::Switch),
                                                BottomBar::Side::CENTER);
                     }
                     return true;
                 },
-                this));
+                this,
+                isPhoneVisibilitySwitchOn ? RightItem::On : RightItem::Off));
             if (isPhoneVisibilitySwitchOn) {
                 optionsList.emplace_back(std::make_unique<gui::OptionSettings>(
                     utils::translateI18("app_settings_bluetooth_phone_name_indent"),
@@ -80,13 +83,13 @@ namespace gui
                     },
                     [=](gui::Item &item) {
                         if (item.focus) {
-                            this->setBottomBarText(utils::localize.get(style::strings::common::select),
+                            this->setBottomBarText(utils::translateI18(style::strings::common::select),
                                                    BottomBar::Side::CENTER);
                         }
                         return true;
                     },
                     nullptr,
-                    RightIcon::Border));
+                    RightItem::ArrowWhite));
             }
         }
 
diff --git a/module-apps/application-settings-new/windows/MessagesWindow.cpp b/module-apps/application-settings-new/windows/MessagesWindow.cpp
@@ -44,7 +44,7 @@ namespace gui
                     return true;
                 },
                 nullptr,
-                showUnreadMessagesFirst ? RightIcon::On : RightIcon::Off));
+                showUnreadMessagesFirst ? RightItem::On : RightItem::Off));
         };
 
         auto addMenu = [&](UTF8 name, std::string window) {
@@ -60,7 +60,7 @@ namespace gui
                 },
                 nullptr,
                 nullptr,
-                RightIcon::Border));
+                RightItem::ArrowWhite));
         };
 
         bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::select));
diff --git a/module-apps/application-settings-new/windows/NetworkWindow.cpp b/module-apps/application-settings-new/windows/NetworkWindow.cpp
@@ -53,7 +53,7 @@ namespace gui
             },
             nullptr,
             nullptr,
-            operatorsOn ? RightIcon::On : RightIcon::Off));
+            operatorsOn ? RightItem::On : RightItem::Off));
         if (operatorsOn) {
             optList.emplace_back(std::make_unique<gui::OptionSettings>(
                 utils::translateI18("app_settings_network_all_operators"),
@@ -63,7 +63,7 @@ namespace gui
                 },
                 nullptr,
                 nullptr,
-                RightIcon::Border));
+                RightItem::ArrowWhite));
         }
         optList.emplace_back(gui::Option{
             utils::translateI18("app_settings_network_import_contacts_from_sim_card"), [=](gui::Item &item) {
diff --git a/module-apps/widgets/ButtonOnOff.cpp b/module-apps/widgets/ButtonOnOff.cpp
@@ -6,18 +6,9 @@
 #include <Style.hpp>
 #include <i18/i18.hpp>
 
-namespace style
-{
-    namespace buttonOnOff
-    {
-        constexpr uint32_t w = 56;
-        constexpr uint32_t h = 32;
-    } // namespace buttonOnOff
-} // namespace style
-
 namespace gui
 {
-    ButtonOnOff::ButtonOnOff(Item *parent, ButtonType buttonType) : Label{parent}
+    ButtonOnOff::ButtonOnOff(Item *parent, const ButtonState buttonState) : Label{parent}
     {
         setMinimumSize(style::buttonOnOff::w, style::buttonOnOff::h);
 
@@ -27,16 +18,27 @@ namespace gui
         setPenWidth(2);
         setFilled(true);
         setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
-        if (buttonType == ButtonType::On) {
+        setFont(style::window::font::small);
+        switchState(buttonState);
+    }
+
+    void ButtonOnOff::switchState(const ButtonState newButtonState)
+    {
+        currentState = newButtonState;
+        if (currentState == ButtonState::On) {
             setFillColor(ColorFullBlack);
             setText(utils::translateI18("app_settings_toggle_on"));
             setTextColor(ColorFullWhite);
         }
-        else if (buttonType == ButtonType::Off) {
+        else if (currentState == ButtonState::Off) {
             setFillColor(ColorFullWhite);
             setText(utils::translateI18("app_settings_toggle_off"));
             setTextColor(ColorFullBlack);
         }
     }
+    void ButtonOnOff::toggleState()
+    {
+        switchState(static_cast<ButtonState>(!static_cast<bool>(currentState)));
+    }
 
 } /* namespace gui */
diff --git a/module-apps/widgets/ButtonOnOff.hpp b/module-apps/widgets/ButtonOnOff.hpp
@@ -5,18 +5,32 @@
 
 #include "Label.hpp"
 
+namespace style
+{
+    namespace buttonOnOff
+    {
+        constexpr uint32_t w = 56;
+        constexpr uint32_t h = 32;
+    } // namespace buttonOnOff
+} // namespace style
+
 namespace gui
 {
-    enum class ButtonType
+    enum class ButtonState : bool
     {
-        On,
-        Off
+        Off,
+        On
     };
 
     class ButtonOnOff : public Label
     {
       public:
-        ButtonOnOff(Item *parent, ButtonType buttonType);
+        ButtonOnOff(Item *parent, const ButtonState buttonState);
+        void switchState(const ButtonState);
+        void toggleState();
+
+      private:
+        ButtonState currentState;
     };
 
 } /* namespace gui */
diff --git a/module-apps/windows/OptionSetting.cpp b/module-apps/windows/OptionSetting.cpp
@@ -2,45 +2,52 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "OptionSetting.hpp"
-#include "OptionsStyle.hpp"
+#include "widgets/ButtonOnOff.hpp"
 
 namespace gui
 {
     auto OptionSettings::build() const -> Item *
     {
-        auto *label = new gui::Label(nullptr,
-                                     style::window::default_left_margin,
-                                     0,
-                                     style::window_width - 2 * style::window::default_left_margin,
-                                     style::window::label::big_h,
-                                     text);
-        style::window::decorateOption(label);
-        label->activatedCallback = activatedCallback;
-        std::string img;
-        switch (rIcon) {
-        case RightIcon::Enabled:
-            img = "right_label_arrow";
+        auto optionBodyHBox = new HBox(nullptr, 0, 0, style::window::default_body_width, style::window::label::big_h);
+        optionBodyHBox->setAlignment(Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
+        optionBodyHBox->activatedCallback    = activatedCallback;
+        optionBodyHBox->focusChangedCallback = focusCb;
+        style::window::decorate(optionBodyHBox);
+
+        auto optionNameLabel = new Label(optionBodyHBox, 0, 0, 0, 0, text);
+        optionNameLabel->setMinimumSize(style::window::default_body_width - style::buttonOnOff::w,
+                                        style::window::label::big_h);
+        optionNameLabel->setEdges(RectangleEdge::None);
+        optionNameLabel->setAlignment(Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center));
+        optionNameLabel->setFont(style::window::font::big);
+
+        std::string imageName;
+        switch (rightItem) {
+        case RightItem::ArrowBlack:
+            imageName = "right_label_arrow";
             break;
-        case RightIcon::Border:
-            img = "right_label_arrow_border";
+        case RightItem::ArrowWhite:
+            imageName = "right_label_arrow_border";
             break;
-        case RightIcon::On:
-            img = "btn_on";
+        case RightItem::On:
+            new ButtonOnOff(optionBodyHBox, ButtonState::On);
             break;
-        case RightIcon::Off:
-            img = "btn_off";
+        case RightItem::Off:
+            new ButtonOnOff(optionBodyHBox, ButtonState::Off);
             break;
-        case RightIcon::Bt:
-            img = "bt";
+        case RightItem::Bt:
+            imageName = "bt";
             break;
         default:
             break;
         }
 
-        if (!img.empty()) {
-            new gui::Image(label, style::option::arrow_position_x, style::option::arrow_positon_y, 0, 0, img);
+        if (!imageName.empty()) {
+            auto image = new gui::Image(optionBodyHBox, 0, 0, 0, 0, imageName);
+            optionNameLabel->setMinimumSize(style::window::default_body_width - image->getWidth(),
+                                            style::window::label::big_h);
         }
-        label->focusChangedCallback = focusCb;
-        return label;
+
+        return optionBodyHBox;
     }
 } // namespace gui
diff --git a/module-apps/windows/OptionSetting.hpp b/module-apps/windows/OptionSetting.hpp
@@ -8,11 +8,11 @@
 
 namespace gui
 {
-    enum class RightIcon : uint8_t
+    enum class RightItem
     {
         Disabled,
-        Enabled,
-        Border,
+        ArrowBlack,
+        ArrowWhite,
         On,
         Off,
         Bt
@@ -25,15 +25,15 @@ namespace gui
         std::function<bool(Item &)> activatedCallback = nullptr;
         std::function<bool(Item &)> focusCb           = nullptr;
         AppWindow *app                                = nullptr;
-        RightIcon rIcon                               = RightIcon::Disabled;
+        RightItem rightItem                           = RightItem::Disabled;
 
       public:
         OptionSettings(const UTF8 text,
                        std::function<bool(Item &)> cb,
                        std::function<bool(Item &)> cbFocus,
                        AppWindow *app,
-                       RightIcon rIcon = RightIcon::Disabled)
-            : text(text), activatedCallback(std::move(cb)), focusCb(std::move(cbFocus)), app(app), rIcon(rIcon)
+                       RightItem rightItem = RightItem::Disabled)
+            : text(text), activatedCallback(std::move(cb)), focusCb(std::move(cbFocus)), app(app), rightItem(rightItem)
         {}
         [[nodiscard]] auto build() const -> Item * override;
     };
diff --git a/module-apps/windows/OptionsStyle.hpp b/module-apps/windows/OptionsStyle.hpp

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ namespace gui`
`41`	`41`	`},`
`42`	`42`	`nullptr,`
`43`	`43`	`nullptr,`
`44`		`- RightIcon::Bt));`
	`44`	`+ RightItem::Bt));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`sys::Bus::SendUnicast(`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ namespace gui`
`63`	`63`	`},`
`64`	`64`	`nullptr,`
`65`	`65`	`nullptr,`
`66`		`- RightIcon::Bt));`
	`66`	`+ RightItem::Bt));`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`topBar->setActive(TopBar::Elements::SIGNAL, false);`