[EGD-2629] Add Phone name window (#887)

[EGD-2629] Update changelog and minor fixes

Author: pawel-olejniczak

changelog.md

@@ -1,5 +1,15 @@
 # MuditaOS changelog
 
+## Current release
+
+### Added
+* `[settings][bluetooth]` Add "Phone name" window.
+
+
+### Fixed
+
+### Other
+
 ## [0.43.1 2020-10-23]
 
 ### Added

image/assets/lang/lang_en.json

@@ -236,6 +236,7 @@
     "app_settings_bluetooth_all_devices_indent" : "  All devices",
     "app_settings_bluetooth_searching_devices" : "Searching devices... \nIt may take a moment.",
     "app_settings_bluetooth_main" : "Bluetooth",
+    "app_settings_bluetooth_phone_name" : "Phone name",
     "app_settings_bluetooth_phone_name_indent" : "  Phone name",
     "app_settings_bluetooth_phone_visibility" : "Phone visibility",
     "app_settings_net" : "Network",

module-apps/CMakeLists.txt

@@ -22,7 +22,7 @@ set( SOURCES
     "windows/OptionsWindowOption.cpp"
     "windows/Dialog.cpp"
     "windows/NoEvents.cpp"
-    "widgets/SearchBox.cpp"
+    "widgets/InputBox.cpp"
     "windows/OptionSetting.cpp"
     )
 

module-apps/application-messages/windows/SearchStart.cpp

@@ -4,7 +4,7 @@
 #include "SearchStart.hpp"
 #include "../ApplicationMessages.hpp"
 #include <i18/i18.hpp>
-#include <widgets/SearchBox.hpp>
+#include <widgets/InputBox.hpp>
 #include <cassert>
 
 namespace gui
@@ -21,7 +21,7 @@ namespace gui
         body = new gui::Item();
         body->setBoundingBox(bodySize());
         addWidget(body);
-        auto text = searchBox(this, utils::localize.get("common_search_uc"), "search");
+        auto text = inputBox(this, utils::localize.get("common_search_uc"), "search");
 
         inputCallback = [=](Item &, const InputEvent &inputEvent) -> bool {
             auto app = dynamic_cast<app::ApplicationMessages *>(application);

module-apps/application-phonebook/windows/PhonebookSearch.cpp

@@ -3,7 +3,7 @@
 
 #include "PhonebookSearch.hpp"
 #include "application-phonebook/ApplicationPhonebook.hpp"
-#include "widgets/SearchBox.hpp"
+#include "widgets/InputBox.hpp"
 
 #include <Utils.hpp>
 
@@ -21,7 +21,7 @@ namespace gui
 
         setTitle(utils::localize.get("app_phonebook_title_main"));
 
-        inputField = searchBox(this, utils::localize.get("common_search_uc"), "search");
+        inputField = inputBox(this, utils::localize.get("common_search_uc"), "search");
         bottomBar->setActive(BottomBar::Side::LEFT, false);
         bottomBar->setActive(BottomBar::Side::CENTER, true);
         bottomBar->setActive(BottomBar::Side::RIGHT, true);

module-apps/application-settings-new/ApplicationSettings.cpp

@@ -16,6 +16,7 @@
 #include "windows/AppsAndToolsWindow.hpp"
 #include "windows/NetworkWindow.hpp"
 #include "windows/MessagesWindow.hpp"
+#include "windows/PhoneNameWindow.hpp"
 
 #include "Dialog.hpp"
 
@@ -115,6 +116,9 @@ namespace app
         windowsFactory.attach(gui::window::name::messages, [](Application *app, const std::string &name) {
             return std::make_unique<gui::MessagesWindow>(app);
         });
+        windowsFactory.attach(gui::window::name::phone_name, [](Application *app, const std::string &name) {
+            return std::make_unique<gui::PhoneNameWindow>(app);
+        });
     }
 
     void ApplicationSettingsNew::destroyUserInterface()

module-apps/application-settings-new/CMakeLists.txt

@@ -29,6 +29,7 @@ target_sources( ${PROJECT_NAME}
         windows/AppsAndToolsWindow.cpp
         windows/NetworkWindow.cpp
         windows/MessagesWindow.cpp
+        windows/PhoneNameWindow.cpp
         widgets/UpDown.cpp
         widgets/Toggle.cpp
 

module-apps/application-settings-new/windows/BluetoothWindow.cpp

@@ -13,7 +13,10 @@ namespace gui
 {
 
     BluetoothWindow::BluetoothWindow(app::Application *app) : OptionWindow(app, gui::window::name::bluetooth)
-    {}
+    {
+        topBar->setActive(TopBar::Elements::BATTERY, false);
+        topBar->setActive(TopBar::Elements::SIM, false);
+    }
 
     void BluetoothWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {

module-apps/application-settings-new/windows/NetworkWindow.cpp

@@ -2,11 +2,11 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "NetworkWindow.hpp"
+#include "application-settings-new/ApplicationSettings.hpp"
 
-#include <i18/i18.hpp>
-#include "OptionsStyle.hpp"
 #include "OptionSetting.hpp"
-#include <application-settings-new/ApplicationSettings.hpp>
+
+#include <i18/i18.hpp>
 
 namespace gui
 {
@@ -33,16 +33,13 @@ namespace gui
                 return true;
             },
             [=](gui::Item &item) {
-                auto nlb = dynamic_cast<gui::Label *>(&item);
-                if (nullptr != nlb) {
-                    if (item.focus) {
-                        this->setBottomBarText(utils::localize.get(style::strings::common::Switch),
-                                               BottomBar::Side::CENTER);
-                    }
-                    else {
-                        this->setBottomBarText(utils::localize.get(style::strings::common::select),
-                                               BottomBar::Side::CENTER);
-                    }
+                if (item.focus) {
+                    this->setBottomBarText(utils::localize.get(style::strings::common::Switch),
+                                           BottomBar::Side::CENTER);
+                }
+                else {
+                    this->setBottomBarText(utils::localize.get(style::strings::common::select),
+                                           BottomBar::Side::CENTER);
                 }
                 return true;
             },

module-apps/application-settings-new/windows/PhoneNameWindow.cpp

@@ -0,0 +1,41 @@
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "PhoneNameWindow.hpp"
+#include "application-settings-new/ApplicationSettings.hpp"
+#include "widgets/InputBox.hpp"
+
+#include <Utils.hpp>
+
+namespace gui
+{
+    PhoneNameWindow::PhoneNameWindow(app::Application *app) : AppWindow(app, gui::window::name::phone_name)
+    {
+        buildInterface();
+    }
+
+    void PhoneNameWindow::buildInterface()
+    {
+        AppWindow::buildInterface();
+        topBar->setActive(TopBar::Elements::SIM, false);
+        topBar->setActive(TopBar::Elements::TIME, true);
+
+        setTitle(utils::localize.get("app_settings_bluetooth_phone_name"));
+
+        inputField = inputBox(this, utils::localize.get("app_settings_bluetooth_phone_name"));
+        bottomBar->setActive(BottomBar::Side::LEFT, false);
+        bottomBar->setActive(BottomBar::Side::CENTER, true);
+        bottomBar->setActive(BottomBar::Side::RIGHT, true);
+
+        bottomBar->setText(BottomBar::Side::CENTER, utils::localize.get(style::strings::common::save));
+        bottomBar->setText(BottomBar::Side::RIGHT, utils::localize.get(style::strings::common::back));
+
+        setFocusItem(inputField);
+    }
+
+    void PhoneNameWindow::onBeforeShow(ShowMode mode, SwitchData *data)
+    {
+        inputField->clear();
+        setFocusItem(inputField);
+    }
+} // namespace gui