From 7597d388526c3f1d3c666964514db33bfcd6cf4d Mon Sep 17 00:00:00 2001 From: Przemyslaw Brudny Date: Tue, 26 Oct 2021 09:09:37 +0200 Subject: [PATCH] [EGD-7857] Renamed BottomBar to NavBar Renamed BottomBar to NavBar. --- .../models/CustomRepeatModel.cpp | 4 +- .../models/NewEditAlarmModel.cpp | 12 +-- .../widgets/AlarmMusicOptionsItem.cpp | 27 +++--- .../widgets/AlarmMusicOptionsItem.hpp | 8 +- .../widgets/AlarmRRuleOptionsItem.cpp | 16 ++-- .../widgets/AlarmRRuleOptionsItem.hpp | 8 +- .../widgets/AlarmTimeItem.cpp | 12 +-- .../widgets/AlarmTimeItem.hpp | 8 +- .../widgets/CustomCheckBoxWithLabel.cpp | 20 ++-- .../widgets/CustomCheckBoxWithLabel.hpp | 4 +- .../windows/AlarmClockMainWindow.cpp | 16 ++-- .../windows/CustomRepeatWindow.cpp | 8 +- .../windows/NewEditAlarmWindow.cpp | 8 +- .../windows/AlgoParamsWindow.cpp | 10 +- .../windows/AntennaMainWindow.cpp | 10 +- .../windows/ScanModesWindow.cpp | 12 +-- .../windows/CalculatorMainWindow.cpp | 14 +-- .../windows/CalendarMainWindow.cpp | 4 +- .../application-call/windows/CallWindow.cpp | 49 +++++----- .../windows/EmergencyCallWindow.cpp | 4 +- .../windows/EnterNumberWindow.cpp | 4 +- .../application-call/windows/NumberWindow.cpp | 12 +-- .../application-calllog/CalllogModel.cpp | 4 +- .../application-calllog/data/CallLogStyle.hpp | 2 +- .../windows/CallLogDetailsWindow.cpp | 4 +- .../windows/CallLogMainWindow.cpp | 14 +-- .../models/ActiveNotificationsModel.cpp | 21 ++-- .../models/ActiveNotificationsModel.hpp | 2 +- .../windows/ChargingBatteryWindow.cpp | 2 +- .../windows/DeadBatteryWindow.cpp | 2 +- .../windows/DesktopMainWindow.cpp | 9 +- .../windows/LogoWindow.cpp | 2 +- .../windows/MenuWindow.cpp | 12 +-- .../windows/MmiPullWindow.cpp | 8 +- .../windows/MmiPushWindow.cpp | 2 +- .../windows/MeditationOptionsWindows.cpp | 8 +- .../windows/MeditationTimerWindow.cpp | 20 ++-- .../windows/MeditationTimerWindow.hpp | 2 +- .../windows/MeditationWindow.cpp | 16 ++-- .../widgets/SMSInputWidget.cpp | 10 +- .../windows/MessagesMainWindow.cpp | 24 ++--- .../windows/NewMessage.cpp | 28 +++--- .../windows/NewMessage.hpp | 2 +- .../windows/SMSTemplatesWindow.cpp | 4 +- .../windows/SMSThreadViewWindow.cpp | 6 +- .../windows/SearchResults.cpp | 8 +- .../windows/SearchStart.cpp | 12 +-- .../models/SongsModel.cpp | 12 +-- .../models/SongsModel.hpp | 8 +- .../models/SongsModelInterface.hpp | 8 +- .../presenters/SongsPresenter.cpp | 12 +-- .../presenters/SongsPresenter.hpp | 8 +- .../widgets/SongItem.cpp | 10 +- .../widgets/SongItem.hpp | 8 +- .../windows/MusicPlayerAllSongsWindow.cpp | 10 +- .../windows/MusicPlayerAllSongsWindow.hpp | 4 +- .../windows/MusicPlayerMainWindow.cpp | 42 ++++---- .../windows/MusicPlayerMainWindow.hpp | 4 +- .../windows/NoteCreateWindow.cpp | 4 +- .../windows/NoteEditWindow.cpp | 16 ++-- .../windows/NoteMainWindow.cpp | 20 ++-- .../windows/NotePreviewWindow.cpp | 12 +-- .../windows/SearchEngineWindow.cpp | 8 +- .../windows/SearchResultsWindow.cpp | 8 +- .../ConfigurationSuccessfulDialogWindow.cpp | 4 +- .../windows/EULALicenseWindow.cpp | 10 +- .../windows/NoConfigurationDialogWindow.cpp | 4 +- .../windows/NoSimSelectedDialogWindow.cpp | 4 +- .../windows/OnBoardingDateAndTimeWindow.cpp | 14 +-- .../windows/OnBoardingDateAndTimeWindow.hpp | 2 +- .../windows/OnBoardingLanguagesWindow.cpp | 2 +- .../windows/OnBoardingSimSelectWindow.cpp | 6 +- .../windows/StartConfigurationWindow.cpp | 6 +- .../windows/UpdateDialogWindow.cpp | 4 +- .../models/NewContactModel.cpp | 42 ++++---- .../widgets/InformationWidget.cpp | 2 +- .../InputBoxWithLabelAndIconWidget.cpp | 30 +++--- .../InputBoxWithLabelAndIconWidget.hpp | 8 +- .../widgets/InputLinesWithLabelIWidget.cpp | 8 +- .../widgets/InputLinesWithLabelIWidget.hpp | 10 +- .../windows/PhonebookContactDetails.cpp | 4 +- .../windows/PhonebookIceContacts.cpp | 8 +- .../windows/PhonebookMainWindow.cpp | 24 ++--- .../windows/PhonebookNewContact.cpp | 6 +- .../windows/PhonebookSearch.cpp | 14 +-- .../windows/PhonebookSearchResults.cpp | 18 ++-- .../models/apps/SoundsModel.cpp | 30 +++--- .../models/display-keypad/CategoriesModel.cpp | 4 +- .../models/display-keypad/QuotesModel.cpp | 4 +- .../models/network/NewApnModel.cpp | 30 +++--- .../models/network/SimContactsImportModel.cpp | 4 +- .../models/system/DateAndTimeModel.cpp | 4 +- .../widgets/SpinBoxOptionSettings.cpp | 12 +-- .../widgets/SpinBoxOptionSettings.hpp | 8 +- .../widgets/display-keypad/CategoryWidget.cpp | 14 +-- .../widgets/display-keypad/CategoryWidget.hpp | 8 +- .../widgets/display-keypad/QuoteWidget.cpp | 14 +-- .../widgets/display-keypad/QuoteWidget.hpp | 8 +- .../widgets/network/ApnInputWidget.cpp | 8 +- .../widgets/network/ApnInputWidget.hpp | 10 +- .../network/SimContactImportSelectWidget.cpp | 15 +-- .../network/SimContactImportSelectWidget.hpp | 4 +- .../widgets/system/SettingsTimeItem.cpp | 6 +- .../widgets/system/SettingsTimeItem.hpp | 4 +- .../windows/OptionsWidgetMaker.cpp | 6 +- .../windows/advanced/ColorTestWindow.cpp | 12 +-- .../windows/advanced/EinkModeWindow.cpp | 8 +- .../windows/advanced/InformationWindow.cpp | 4 +- .../advanced/StatusBarImageTypeWindow.cpp | 8 +- .../windows/advanced/UITestWindow.cpp | 12 +-- .../windows/apps/AlarmClockWindow.cpp | 4 +- .../windows/apps/PhoneWindow.cpp | 4 +- .../windows/apps/SoundSelectWindow.cpp | 4 +- .../windows/bluetooth/AddDeviceWindow.cpp | 2 +- .../windows/bluetooth/AllDevicesWindow.cpp | 12 +-- .../bluetooth/BluetoothCheckPasskeyWindow.cpp | 8 +- .../windows/bluetooth/BluetoothWindow.cpp | 12 +-- .../windows/bluetooth/PhoneNameWindow.cpp | 10 +- .../display-keypad/DisplayAndKeypadWindow.cpp | 3 +- .../display-keypad/DisplayLightWindow.cpp | 7 +- .../display-keypad/EditQuotesWindow.cpp | 9 +- .../display-keypad/InputLanguageWindow.cpp | 3 +- .../display-keypad/KeypadLightWindow.cpp | 3 +- .../display-keypad/QuoteCategoriesWindow.cpp | 4 +- .../display-keypad/QuotesAddWindow.cpp | 12 +-- .../display-keypad/QuotesMainWindow.cpp | 6 +- .../display-keypad/QuotesOptionsWindow.cpp | 4 +- .../display-keypad/WallpaperWindow.cpp | 6 +- .../windows/network/ApnSettingsWindow.cpp | 10 +- .../windows/network/NetworkWindow.cpp | 2 +- .../windows/network/NewApnWindow.cpp | 6 +- .../windows/network/SimCardsWindow.cpp | 6 +- .../network/SimContactsImportWindow.cpp | 42 ++++---- .../windows/network/SimPINSettingsWindow.cpp | 4 +- .../phone-modes/ConnectionFrequencyWindow.cpp | 4 +- .../phone-modes/DoNotDisturbWindow.cpp | 4 +- .../windows/phone-modes/OfflineWindow.cpp | 4 +- .../windows/phone-modes/PhoneModesWindow.cpp | 8 +- .../windows/security/AutolockWindow.cpp | 3 +- .../windows/security/SecurityMainWindow.cpp | 4 +- .../windows/system/CertificationWindow.cpp | 2 +- .../system/ChangeDateAndTimeWindow.cpp | 8 +- .../windows/system/DateAndTimeMainWindow.cpp | 8 +- .../windows/system/DateAndTimeMainWindow.hpp | 2 +- .../windows/system/SARInfoWindow.cpp | 4 +- .../system/TechnicalInformationWindow.cpp | 4 +- .../windows/SpecialInputMainWindow.cpp | 10 +- .../locks/widgets/PhoneLockBox.cpp | 16 ++-- .../locks/widgets/PhoneLockBox.hpp | 2 +- .../apps-common/locks/widgets/SimLockBox.cpp | 8 +- .../locks/windows/LockInputWindow.cpp | 20 ++-- .../locks/windows/LockInputWindow.hpp | 4 +- .../options/type/OptionWithActiveIcons.cpp | 2 +- module-apps/apps-common/popups/AlarmPopup.cpp | 12 +-- .../apps-common/popups/HomeModesWindow.cpp | 2 +- .../apps-common/popups/PowerOffWindow.cpp | 4 +- .../apps-common/popups/VolumeWindow.cpp | 2 +- .../lock-popups/PhoneLockInputWindow.cpp | 8 +- .../lock-popups/PhoneLockedInfoWindow.cpp | 24 ++--- .../popups/lock-popups/PhoneLockedWindow.cpp | 22 ++--- .../popups/lock-popups/SimLockInputWindow.cpp | 8 +- .../popups/lock-popups/SimNotReadyWindow.cpp | 2 +- .../apps-common/widgets/ActiveIconFactory.cpp | 7 +- .../apps-common/widgets/ActiveIconFactory.hpp | 2 +- module-apps/apps-common/widgets/SpinBox.cpp | 16 ++-- module-apps/apps-common/widgets/SpinBox.hpp | 8 +- .../apps-common/widgets/TimeWidget.cpp | 12 +-- .../apps-common/widgets/TimeWidget.hpp | 8 +- module-apps/apps-common/windows/AppWindow.cpp | 60 ++++++------ module-apps/apps-common/windows/AppWindow.hpp | 21 ++-- module-apps/apps-common/windows/Dialog.cpp | 14 +-- .../apps-common/windows/OptionWindow.cpp | 8 +- module-gui/WINDOW.md | 2 +- .../gui/dom/Item2JsonSerializingVisitor.cpp | 6 +- .../gui/dom/Item2JsonSerializingVisitor.hpp | 2 +- module-gui/gui/dom/ItemDataNames.hpp | 2 +- module-gui/gui/widgets/CMakeLists.txt | 4 +- module-gui/gui/widgets/CheckBox.cpp | 34 +++---- module-gui/gui/widgets/CheckBox.hpp | 14 +-- module-gui/gui/widgets/CheckBoxWithLabel.cpp | 9 +- module-gui/gui/widgets/CheckBoxWithLabel.hpp | 8 +- .../gui/widgets/{BottomBar.cpp => NavBar.cpp} | 95 +++++++++---------- .../gui/widgets/{BottomBar.hpp => NavBar.hpp} | 63 +++++------- module-gui/gui/widgets/Style.hpp | 4 +- module-gui/gui/widgets/Window.hpp | 6 +- module-gui/gui/widgets/visitor/GuiVisitor.hpp | 8 +- .../test-google/test-gui-visitor-call.cpp | 4 +- .../windows/BellAlarmSetWindow.cpp | 2 +- .../windows/BellAlarmWindow.cpp | 2 +- .../windows/BGSoundsVolumeWindow.cpp | 2 +- .../windows/BellBedtimeWindow.cpp | 2 +- .../windows/BellBatteryShutdownWindow.cpp | 2 +- .../windows/BellHomeScreenWindow.cpp | 2 +- .../windows/BellMainSetHour.cpp | 4 +- .../windows/BellSettingsBedtimeToneWindow.cpp | 2 +- .../windows/BellSettingsHomeViewWindow.cpp | 2 +- .../windows/advanced/AboutYourBellWindow.cpp | 2 +- .../advanced/BellSettingsFrontlightWindow.cpp | 2 +- .../advanced/BellSettingsLanguageWindow.cpp | 2 +- .../advanced/BellSettingsTimeUnitsWindow.cpp | 2 +- .../BellSettingsAlarmSettingsSnoozeWindow.cpp | 2 +- .../BellSettingsAlarmSettingsWindow.cpp | 2 +- .../BellSettingsPrewakeUpWindow.cpp | 2 +- .../BellSettingsBedtimeToneSettingsWindow.cpp | 2 +- .../common/src/options/BellOptionWindow.cpp | 2 +- .../src/options/BellShortOptionWindow.cpp | 2 +- .../src/popups/AlarmActivatedWindow.cpp | 2 +- .../src/popups/AlarmDeactivatedWindow.cpp | 2 +- .../src/popups/BedtimeNotificationWindow.cpp | 4 +- .../common/src/popups/BellRebootWindow.cpp | 2 +- .../common/src/windows/BellFactoryReset.cpp | 2 +- .../windows/BellFinishedCallbackWindow.cpp | 2 +- .../common/src/windows/BellFinishedWindow.cpp | 2 +- .../common/src/windows/BellTurnOffWindow.cpp | 2 +- .../common/src/windows/BellWelcomeWindow.cpp | 2 +- 215 files changed, 985 insertions(+), 1031 deletions(-) rename module-gui/gui/widgets/{BottomBar.cpp => NavBar.cpp} (59%) rename module-gui/gui/widgets/{BottomBar.hpp => NavBar.hpp} (59%) diff --git a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp index 6d71f19b5ff40a6e16dea5fd7d491b80c3682291..2e0b0ca6503289648a39bb6d18a968dbfead4809 100644 --- a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp +++ b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp @@ -42,8 +42,8 @@ namespace app::alarmClock internalData.push_back(new gui::CustomCheckBoxWithLabel( utils::translate(day), selected, - [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, - [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); })); + [app](const UTF8 &text) { app->getCurrentWindow()->navBarTemporaryMode(text, false); }, + [app]() { app->getCurrentWindow()->navBarRestoreFromTemporaryMode(); })); } for (auto &item : internalData) { diff --git a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp index 8a7ad874b6abed4be80597013ca57b705613e4ef..fac1cfbdd33fe77af708f8c02ee22e45e750705b 100644 --- a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp +++ b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp @@ -49,15 +49,15 @@ namespace app::alarmClock assert(app != nullptr); internalData.push_back(new gui::AlarmTimeItem( - [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, - [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); })); + [app](const UTF8 &text) { app->getCurrentWindow()->navBarTemporaryMode(text, false); }, + [app]() { app->getCurrentWindow()->navBarRestoreFromTemporaryMode(); })); internalData.push_back(new gui::AlarmMusicOptionsItem( application, utils::translate("app_alarm_clock_sound"), soundsPlayer, - [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, - [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); })); + [app](const UTF8 &text) { app->getCurrentWindow()->navBarTemporaryMode(text, false); }, + [app]() { app->getCurrentWindow()->navBarRestoreFromTemporaryMode(); })); internalData.push_back(new gui::AlarmSnoozeOptionsItem(utils::translate("app_alarm_clock_snooze"))); @@ -65,8 +65,8 @@ namespace app::alarmClock application, utils::translate("app_alarm_clock_repeat"), rRulePresenter, - [app](const UTF8 &text) { app->getCurrentWindow()->bottomBarTemporaryMode(text, false); }, - [app]() { app->getCurrentWindow()->bottomBarRestoreFromTemporaryMode(); })); + [app](const UTF8 &text) { app->getCurrentWindow()->navBarTemporaryMode(text, false); }, + [app]() { app->getCurrentWindow()->navBarRestoreFromTemporaryMode(); })); for (auto &item : internalData) { item->deleteByList = false; diff --git a/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.cpp index e2c3293d2502d3936288c794b0c9a04cdfb0943e..ffdede5e2cff8ab2238c2903c643634e3c092a48 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.cpp +++ b/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.cpp @@ -11,10 +11,10 @@ namespace gui AlarmMusicOptionsItem::AlarmMusicOptionsItem(app::ApplicationCommon *app, const std::string &description, std::shared_ptr player, - std::function bottomBarTemporaryMode, - std::function bottomBarRestoreFromTemporaryMode) - : AlarmOptionsItem(description), bottomBarTemporaryMode(std::move(bottomBarTemporaryMode)), - bottomBarRestoreFromTemporaryMode(std::move(bottomBarRestoreFromTemporaryMode)) + std::function navBarTemporaryMode, + std::function navBarRestoreFromTemporaryMode) + : AlarmOptionsItem(description), navBarTemporaryMode(std::move(navBarTemporaryMode)), + navBarRestoreFromTemporaryMode(std::move(navBarRestoreFromTemporaryMode)) { assert(app != nullptr); @@ -29,18 +29,17 @@ namespace gui if (event.isShortRelease(gui::KeyCode::KEY_LF)) { if (!player->previouslyPlayed(getFilePath(optionSpinner->getCurrentValue())) || player->isInState(SoundsPlayer::State::Stopped)) { - player->play(getFilePath(optionSpinner->getCurrentValue()), [=]() { - this->bottomBarTemporaryMode(utils::translate(style::strings::common::play)); - }); - this->bottomBarTemporaryMode(utils::translate(style::strings::common::pause)); + player->play(getFilePath(optionSpinner->getCurrentValue()), + [=]() { this->navBarTemporaryMode(utils::translate(style::strings::common::play)); }); + this->navBarTemporaryMode(utils::translate(style::strings::common::pause)); } else if (player->isInState(SoundsPlayer::State::Paused)) { player->resume(); - this->bottomBarTemporaryMode(utils::translate(style::strings::common::pause)); + this->navBarTemporaryMode(utils::translate(style::strings::common::pause)); } else { player->pause(); - this->bottomBarTemporaryMode(utils::translate(style::strings::common::play)); + this->navBarTemporaryMode(utils::translate(style::strings::common::play)); } } @@ -52,10 +51,10 @@ namespace gui if (res && player->previouslyPlayed(getFilePath(optionSpinner->getCurrentValue())) && player->isInState(SoundsPlayer::State::Playing)) { - this->bottomBarTemporaryMode(utils::translate(style::strings::common::pause)); + this->navBarTemporaryMode(utils::translate(style::strings::common::pause)); } else if (res) { - this->bottomBarTemporaryMode(utils::translate(style::strings::common::play)); + this->navBarTemporaryMode(utils::translate(style::strings::common::play)); } return res; @@ -65,10 +64,10 @@ namespace gui setFocusItem(focus ? optionSpinner : nullptr); if (focus) { - this->bottomBarTemporaryMode(utils::translate(style::strings::common::play)); + this->navBarTemporaryMode(utils::translate(style::strings::common::play)); } else { - this->bottomBarRestoreFromTemporaryMode(); + this->navBarRestoreFromTemporaryMode(); } // stop preview playback when we loose focus diff --git a/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.hpp b/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.hpp index 9b58e63295bb345cc84293d6f0ef40dfb0f03055..4b87c700572d6e5d9eccf0d243942081b173147a 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.hpp +++ b/module-apps/application-alarm-clock/widgets/AlarmMusicOptionsItem.hpp @@ -16,8 +16,8 @@ namespace gui class AlarmMusicOptionsItem : public AlarmOptionsItem { private: - std::function bottomBarTemporaryMode = nullptr; - std::function bottomBarRestoreFromTemporaryMode = nullptr; + std::function navBarTemporaryMode = nullptr; + std::function navBarRestoreFromTemporaryMode = nullptr; /// pointer to audio operations which allows to make audio preview std::vector alarmSoundList; @@ -27,8 +27,8 @@ namespace gui explicit AlarmMusicOptionsItem(app::ApplicationCommon *app, const std::string &description, std::shared_ptr player, - std::function bottomBarTemporaryMode = nullptr, - std::function bottomBarRestoreFromTemporaryMode = nullptr); + std::function navBarTemporaryMode = nullptr, + std::function navBarRestoreFromTemporaryMode = nullptr); private: [[nodiscard]] std::string getTitle(const std::string &filePath); diff --git a/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp index 9a106d819ed51bae656076c78bff1147301c3abf..36a93c91bbbb05c2e8a24e0daa232c2d94480ca7 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp +++ b/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp @@ -10,11 +10,11 @@ namespace gui AlarmRRuleOptionsItem::AlarmRRuleOptionsItem(app::ApplicationCommon *app, const std::string &description, std::shared_ptr presenter, - std::function bottomBarTemporaryMode, - std::function bottomBarRestoreFromTemporaryMode) + std::function navBarTemporaryMode, + std::function navBarRestoreFromTemporaryMode) : AlarmOptionsItem(description), AlarmRRuleItem(std::move(presenter)), app(app), - bottomBarTemporaryMode(std::move(bottomBarTemporaryMode)), - bottomBarRestoreFromTemporaryMode(std::move(bottomBarRestoreFromTemporaryMode)) + navBarTemporaryMode(std::move(navBarTemporaryMode)), + navBarRestoreFromTemporaryMode(std::move(navBarRestoreFromTemporaryMode)) { printOptions(); @@ -22,13 +22,13 @@ namespace gui auto ret = optionSpinner->onInput(event); if (getRRuleOption(optionSpinner->getCurrentValue()) == RRule::Custom) { - this->bottomBarTemporaryMode(utils::translate(style::strings::common::edit)); + this->navBarTemporaryMode(utils::translate(style::strings::common::edit)); if (event.isShortRelease(gui::KeyCode::KEY_LF)) { this->app->switchWindow(style::alarmClock::window::name::customRepeat); } } else { - this->bottomBarRestoreFromTemporaryMode(); + this->navBarRestoreFromTemporaryMode(); } return ret; @@ -38,10 +38,10 @@ namespace gui setFocusItem(focus ? optionSpinner : nullptr); if (getRRuleOption(optionSpinner->getCurrentValue()) == RRule::Custom) { - this->bottomBarTemporaryMode(utils::translate(style::strings::common::edit)); + this->navBarTemporaryMode(utils::translate(style::strings::common::edit)); } else { - this->bottomBarRestoreFromTemporaryMode(); + this->navBarRestoreFromTemporaryMode(); } return true; diff --git a/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.hpp b/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.hpp index ff4f2c8354cfbd54559265e0bef952e4c50719ce..af5667e0aafa5fc23a479951a78a0e34a6e90a75 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.hpp +++ b/module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.hpp @@ -15,8 +15,8 @@ namespace gui { private: app::ApplicationCommon *app = nullptr; - std::function bottomBarTemporaryMode = nullptr; - std::function bottomBarRestoreFromTemporaryMode = nullptr; + std::function navBarTemporaryMode = nullptr; + std::function navBarRestoreFromTemporaryMode = nullptr; using RRule = app::alarmClock::AlarmRRulePresenter::RRuleOptions; std::vector> rRuleOptions = { @@ -33,7 +33,7 @@ namespace gui explicit AlarmRRuleOptionsItem(app::ApplicationCommon *app, const std::string &description, std::shared_ptr presenter, - std::function bottomBarTemporaryMode = nullptr, - std::function bottomBarRestoreFromTemporaryMode = nullptr); + std::function navBarTemporaryMode = nullptr, + std::function navBarRestoreFromTemporaryMode = nullptr); }; } /* namespace gui */ diff --git a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp index 0ef0277d30980ea6c1659e24ac5ef3561ebaeb59..4f7e9f2f40a90a5a94b067c136a7d60b7909ddb1 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp +++ b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.cpp @@ -13,10 +13,10 @@ namespace gui { namespace timeItem = style::alarmClock::window::item::time; - AlarmTimeItem::AlarmTimeItem(std::function bottomBarTemporaryMode, - std::function bottomBarRestoreFromTemporaryMode) - : mode24H(!stm::api::isTimeFormat12h()), bottomBarTemporaryMode(std::move(bottomBarTemporaryMode)), - bottomBarRestoreFromTemporaryMode(std::move(bottomBarRestoreFromTemporaryMode)) + AlarmTimeItem::AlarmTimeItem(std::function navBarTemporaryMode, + std::function navBarRestoreFromTemporaryMode) + : mode24H(!stm::api::isTimeFormat12h()), navBarTemporaryMode(std::move(navBarTemporaryMode)), + navBarRestoreFromTemporaryMode(std::move(navBarRestoreFromTemporaryMode)) { setMinimumSize(timeItem::width, timeItem::height); @@ -184,10 +184,10 @@ namespace gui }; mode12hInput->focusChangedCallback = [&](Item &item) { if (item.focus) { - bottomBarTemporaryMode(utils::translate("common_switch")); + navBarTemporaryMode(utils::translate("common_switch")); } else { - bottomBarRestoreFromTemporaryMode(); + navBarRestoreFromTemporaryMode(); } return true; }; diff --git a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.hpp b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.hpp index c4953cce998938cc4b34f8101be5e09a9d2c2b00..74cd44ba561d500c52b30acdf670041556351e5c 100644 --- a/module-apps/application-alarm-clock/widgets/AlarmTimeItem.hpp +++ b/module-apps/application-alarm-clock/widgets/AlarmTimeItem.hpp @@ -17,8 +17,8 @@ namespace gui gui::Label *mode12hInput = nullptr; bool mode24H = false; - std::function bottomBarTemporaryMode = nullptr; - std::function bottomBarRestoreFromTemporaryMode = nullptr; + std::function navBarTemporaryMode = nullptr; + std::function navBarRestoreFromTemporaryMode = nullptr; void applyItemSpecificProperties(gui::Text *item); void applyInputCallbacks(); @@ -28,8 +28,8 @@ namespace gui void validateHour(); public: - AlarmTimeItem(std::function bottomBarTemporaryMode = nullptr, - std::function bottomBarRestoreFromTemporaryMode = nullptr); + AlarmTimeItem(std::function navBarTemporaryMode = nullptr, + std::function navBarRestoreFromTemporaryMode = nullptr); }; } /* namespace gui */ diff --git a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp index de89e2c89137e4d0dfc52c4fd295ec66c294bd05..01a788c05f9e0ac54c078e89a090d6dc3e2d4d30 100644 --- a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp +++ b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp @@ -10,26 +10,18 @@ namespace gui { - CustomCheckBoxWithLabel::CustomCheckBoxWithLabel( - const std::string &description, - bool initialState, - const std::function &bottomBarTemporaryMode, - const std::function &bottomBarRestoreFromTemporaryMode) + CustomCheckBoxWithLabel::CustomCheckBoxWithLabel(const std::string &description, + bool initialState, + const std::function &navBarTemporaryMode, + const std::function &navBarRestoreFromTemporaryMode) : initialState(initialState) { setEdges(RectangleEdge::None); setMinimumSize(style::window::default_body_width, style::window::label::big_h); setMargins(gui::Margins(style::widgets::leftMargin, style::margins::big, 0, 0)); - checkBoxWithLabel = new gui::CheckBoxWithLabel(this, - 0, - 0, - 0, - 0, - description, - bottomBarTemporaryMode, - bottomBarRestoreFromTemporaryMode, - BottomBar::Side::LEFT); + checkBoxWithLabel = new gui::CheckBoxWithLabel( + this, 0, 0, 0, 0, description, navBarTemporaryMode, navBarRestoreFromTemporaryMode, nav_bar::Side::Left); inputCallback = [&]([[maybe_unused]] Item &item, const InputEvent &event) { return checkBoxWithLabel->onInput(event); diff --git a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp index b87c222bdfa3f82552ac9f6e5590de271e6f21b5..47c849bf50a0640da585bc806348e03d5b4bde5a 100644 --- a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp +++ b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp @@ -19,8 +19,8 @@ namespace gui public: CustomCheckBoxWithLabel(const std::string &description, bool initialState, - const std::function &bottomBarTemporaryMode = nullptr, - const std::function &bottomBarRestoreFromTemporaryMode = nullptr); + const std::function &navBarTemporaryMode = nullptr, + const std::function &navBarRestoreFromTemporaryMode = nullptr); bool isChecked(); }; } // namespace gui diff --git a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp index 8f48a25365b0ee7f2e8a4b6844b8d8140dc379ed..1a5ca84a58a2124bf0670450a9806fe79cfa7811 100644 --- a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp +++ b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp @@ -32,10 +32,10 @@ namespace app::alarmClock { AppWindow::buildInterface(); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch)); - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); + navBar->setActive(gui::nav_bar::Side::Right, true); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(style::strings::common::back)); + navBar->setText(gui::nav_bar::Side::Center, utils::translate(style::strings::common::Switch)); + navBar->setText(gui::nav_bar::Side::Left, utils::translate(style::strings::common::options)); setTitle(utils::translate("app_alarm_clock_title_main")); header->navigationIndicatorAdd(new gui::header::AddElementAction(), gui::header::BoxSelection::Left); @@ -117,16 +117,16 @@ namespace app::alarmClock void AlarmClockMainWindow::onEmptyList() { emptyListIcon->setVisible(true); - bottomBar->setActive(gui::BottomBar::Side::LEFT, false); - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); + navBar->setActive(gui::nav_bar::Side::Left, false); + navBar->setActive(gui::nav_bar::Side::Center, false); application->refreshWindow(gui::RefreshModes::GUI_REFRESH_DEEP); } void AlarmClockMainWindow::onListFilled() { emptyListIcon->setVisible(false); - bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); + navBar->setActive(gui::nav_bar::Side::Left, true); + navBar->setActive(gui::nav_bar::Side::Center, true); application->refreshWindow(gui::RefreshModes::GUI_REFRESH_DEEP); } } // namespace app::alarmClock diff --git a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp index e04def305a0a75ee2c64af9a0711896a8e318681..b58db677f2e398545153b2cfe92a71f8d8cc7770 100644 --- a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp +++ b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp @@ -23,10 +23,10 @@ namespace app::alarmClock { AppWindow::buildInterface(); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); + navBar->setActive(gui::nav_bar::Side::Right, true); + navBar->setActive(gui::nav_bar::Side::Center, true); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(style::strings::common::back)); + navBar->setText(gui::nav_bar::Side::Center, utils::translate(style::strings::common::save)); setTitle(utils::translate("app_alarm_clock_custom_repeat_title")); list = new gui::ListView(this, diff --git a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp index e87fc7dda4adfe6bb39a16bc8b3938f93556511c..d79bdbda447ac2c01dcc1566a8302f9760d39fd6 100644 --- a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp +++ b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp @@ -18,10 +18,10 @@ namespace app::alarmClock { AppWindow::buildInterface(); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::save)); + navBar->setActive(gui::nav_bar::Side::Right, true); + navBar->setActive(gui::nav_bar::Side::Center, true); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(style::strings::common::back)); + navBar->setText(gui::nav_bar::Side::Center, utils::translate(style::strings::common::save)); list = new gui::ListView(this, style::alarmClock::window::listView_x, diff --git a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp index d7822adeafd44ed92bb95334780f0f477728df2d..906007a1fa15f815d293185fe37369b49a20c831 100644 --- a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp +++ b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp @@ -31,11 +31,11 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::LEFT, true); - bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setActive(nav_bar::Side::Left, true); + navBar->setActive(nav_bar::Side::Center, true); + navBar->setActive(nav_bar::Side::Right, true); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); setTitle(utils::translate("app_desktop_tools_antenna")); diff --git a/module-apps/application-antenna/windows/AntennaMainWindow.cpp b/module-apps/application-antenna/windows/AntennaMainWindow.cpp index 1bc0f556875d7f9869206e7377d735bdf131690b..f92fc366ac2f4f436b2eb8e87faeb852181cf4fb 100644 --- a/module-apps/application-antenna/windows/AntennaMainWindow.cpp +++ b/module-apps/application-antenna/windows/AntennaMainWindow.cpp @@ -40,12 +40,12 @@ namespace gui AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::LEFT, true); + navBar->setActive(nav_bar::Side::Left, true); - bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setActive(nav_bar::Side::Center, true); + navBar->setActive(nav_bar::Side::Right, true); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); setTitle(utils::translate("app_desktop_tools_antenna")); diff --git a/module-apps/application-antenna/windows/ScanModesWindow.cpp b/module-apps/application-antenna/windows/ScanModesWindow.cpp index 709eec782ac1ab8bcf9972b6607c2514eff1cdc1..593da7325cb2b31f5c6ff1b6812d288ba3f948a0 100644 --- a/module-apps/application-antenna/windows/ScanModesWindow.cpp +++ b/module-apps/application-antenna/windows/ScanModesWindow.cpp @@ -29,11 +29,11 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::LEFT, true); - bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setActive(nav_bar::Side::Left, true); + navBar->setActive(nav_bar::Side::Center, true); + navBar->setActive(nav_bar::Side::Right, true); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); setTitle(utils::translate("app_desktop_tools_antenna")); @@ -48,7 +48,7 @@ namespace gui modeButtonParams.insert(std::pair(scanModes::CDMA_and_HDR_only, "CDMA and HDR only")); uint32_t w = this->getWidth() - style::window::default_left_margin * 2; - uint32_t h = this->getHeight() - style::window::default_vertical_pos - bottomBar->getHeight(); + uint32_t h = this->getHeight() - style::window::default_vertical_pos - navBar->getHeight(); modesBox = new gui::VBox(this, style::window::default_left_margin, style::window::default_vertical_pos, w, h); modesBox->setPenWidth(0); diff --git a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp index e8884ed127c4e1bdfd090672fc70ac645e29a5d2..a8c3e7026cba347a638414fd19954ae31f205e4a 100644 --- a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp +++ b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp @@ -19,13 +19,13 @@ namespace gui setTitle(utils::translate("app_calculator_title_main")); - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, calc::symbols::strings::equals_str()); - bottomBar->setText(gui::BottomBar::Side::LEFT, calc::symbols::strings::decimal_separator_str()); - bottomBar->setFont(BottomBar::Side::LEFT, style::window::font::largelight); + navBar->setActive(gui::nav_bar::Side::Center, true); + navBar->setActive(gui::nav_bar::Side::Right, true); + navBar->setActive(gui::nav_bar::Side::Left, true); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(style::strings::common::back)); + navBar->setText(gui::nav_bar::Side::Center, calc::symbols::strings::equals_str()); + navBar->setText(gui::nav_bar::Side::Left, calc::symbols::strings::decimal_separator_str()); + navBar->setFont(nav_bar::Side::Left, style::window::font::largelight); mathOperationInput = new gui::Text(this, style::calculator::window::input_margin, diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.cpp b/module-apps/application-calendar/windows/CalendarMainWindow.cpp index ce2c31f9471ef754933bd2583c1df6670402203c..a53cf0b18dfd5b7b575fbc6305b538d357442af4 100644 --- a/module-apps/application-calendar/windows/CalendarMainWindow.cpp +++ b/module-apps/application-calendar/windows/CalendarMainWindow.cpp @@ -151,8 +151,8 @@ namespace gui this->buildMonth(monthModel); this->buildDateLabel(monthModel->getMonthYearText()); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setActive(gui::nav_bar::Side::Right, true); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(style::strings::common::back)); } void CalendarMainWindow::destroyInterface() diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp index 0bed8b3f8701899610e476996f1c12c849bd9f3a..f6cdf1eaa14ece8eceefab0ccaa50327b6d1813d 100644 --- a/module-apps/application-call/windows/CallWindow.cpp +++ b/module-apps/application-call/windows/CallWindow.cpp @@ -51,12 +51,12 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setActive(BottomBar::Side::RIGHT, true); + navBar->setActive(nav_bar::Side::Center, true); + navBar->setActive(nav_bar::Side::Right, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); - bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(strings::message)); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::select)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); + navBar->setText(gui::nav_bar::Side::Center, utils::translate(strings::message)); // top circle image imageCircleTop = new gui::Image(this, imageCircleTop::x, imageCircleTop::y, 0, 0, imageCircleTop::name); @@ -79,7 +79,7 @@ namespace gui speakerIcon = new SpeakerIcon(this, speakerIcon::x, speakerIcon::y); speakerIcon->focusChangedCallback = [=](gui::Item &item) { LOG_DEBUG("speakerIcon get/lost focus"); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch), false); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::Switch), false); return true; }; speakerIcon->activatedCallback = [=](gui::Item &item) { @@ -107,7 +107,7 @@ namespace gui microphoneIcon = new MicrophoneIcon(this, microphoneIcon::x, microphoneIcon::y); microphoneIcon->focusChangedCallback = [=](gui::Item &item) { LOG_DEBUG("microphoneIcon get/lost focus"); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::Switch), false); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::Switch), false); return true; }; microphoneIcon->activatedCallback = [=](gui::Item &item) { @@ -124,8 +124,7 @@ namespace gui sendSmsIcon = new gui::SendSmsIcon(this, sendMessageIcon::x, sendMessageIcon::y); sendSmsIcon->focusChangedCallback = [=](gui::Item &item) { LOG_DEBUG("Send message get/lost focus"); - bottomBar->setText( - gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::send), item.focus); + navBar->setText(gui::nav_bar::Side::Center, utils::translate(style::strings::common::send), item.focus); return true; }; sendSmsIcon->activatedCallback = [=](gui::Item &item) { @@ -168,19 +167,19 @@ namespace gui switch (state) { case State::INCOMING_CALL: { - bottomBar->setText(gui::BottomBar::Side::LEFT, utils::translate(strings::answer), true); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(strings::reject), true); + navBar->setText(gui::nav_bar::Side::Left, utils::translate(strings::answer), true); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(strings::reject), true); durationLabel->setText(utils::translate(strings::iscalling)); durationLabel->setVisible(true); speakerIcon->setVisible(false); microphoneIcon->setVisible(false); if (phoneNumber.getFormatted().empty()) { - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); + navBar->setActive(gui::nav_bar::Side::Center, false); sendSmsIcon->setVisible(false); setFocusItem(nullptr); } else { - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); + navBar->setActive(gui::nav_bar::Side::Center, true); sendSmsIcon->setVisible(true); setFocusItem(sendSmsIcon); } @@ -188,9 +187,9 @@ namespace gui case State::CALL_ENDED: { interface->stopAudio(); stopCallTimer(); - bottomBar->setActive(gui::BottomBar::Side::LEFT, false); - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, false); + navBar->setActive(gui::nav_bar::Side::Left, false); + navBar->setActive(gui::nav_bar::Side::Center, false); + navBar->setActive(gui::nav_bar::Side::Right, false); durationLabel->setVisible(true); setCallEndMessage(); sendSmsIcon->setVisible(false); @@ -206,9 +205,9 @@ namespace gui interface->startAudioRouting(); } runCallTimer(); - bottomBar->setActive(gui::BottomBar::Side::LEFT, false); - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(strings::endcall), true); + navBar->setActive(gui::nav_bar::Side::Left, false); + navBar->setActive(gui::nav_bar::Side::Center, false); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(strings::endcall), true); durationLabel->setVisible(true); sendSmsIcon->setVisible(false); speakerIcon->setVisible(true); @@ -220,9 +219,9 @@ namespace gui } break; case State::OUTGOING_CALL: { interface->startAudioRouting(); - bottomBar->setActive(gui::BottomBar::Side::LEFT, false); - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); - bottomBar->setText(gui::BottomBar::Side::RIGHT, utils::translate(strings::endcall), true); + navBar->setActive(gui::nav_bar::Side::Left, false); + navBar->setActive(gui::nav_bar::Side::Center, false); + navBar->setText(gui::nav_bar::Side::Right, utils::translate(strings::endcall), true); durationLabel->setText(utils::translate(strings::calling)); durationLabel->setVisible(true); sendSmsIcon->setVisible(false); @@ -235,9 +234,9 @@ namespace gui [[fallthrough]]; default: numberLabel->clear(); - bottomBar->setActive(gui::BottomBar::Side::LEFT, false); - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); - bottomBar->setActive(gui::BottomBar::Side::RIGHT, false); + navBar->setActive(gui::nav_bar::Side::Left, false); + navBar->setActive(gui::nav_bar::Side::Center, false); + navBar->setActive(gui::nav_bar::Side::Right, false); durationLabel->setVisible(false); sendSmsIcon->setVisible(false); speakerIcon->setVisible(false); diff --git a/module-apps/application-call/windows/EmergencyCallWindow.cpp b/module-apps/application-call/windows/EmergencyCallWindow.cpp index cdbac5760656e9a8eff70c292d451c402ffd82d0..56e7f5fae16e60c3eaa264780afebb6a75c0875f 100644 --- a/module-apps/application-call/windows/EmergencyCallWindow.cpp +++ b/module-apps/application-call/windows/EmergencyCallWindow.cpp @@ -20,8 +20,8 @@ namespace gui using namespace callAppStyle; NumberWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_phonebook_ice_contacts_title")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setText(nav_bar::Side::Center, utils::translate("app_phonebook_ice_contacts_title")); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); numberDescriptionLabel->setText(utils::translate("app_call_emergency_text")); } diff --git a/module-apps/application-call/windows/EnterNumberWindow.cpp b/module-apps/application-call/windows/EnterNumberWindow.cpp index 55d95a7350cc3485f12d340c6cf0acaaed402b3b..563d5b0b92cf4549e0d6432b78e79117ccf63c84 100644 --- a/module-apps/application-call/windows/EnterNumberWindow.cpp +++ b/module-apps/application-call/windows/EnterNumberWindow.cpp @@ -32,8 +32,8 @@ namespace gui using namespace callAppStyle::enterNumberWindow; NumberWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate("common_add")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_call_clear")); + navBar->setText(nav_bar::Side::Center, utils::translate("common_add")); + navBar->setText(nav_bar::Side::Right, utils::translate("app_call_clear")); newContactIcon = new gui::AddContactIcon(this, newContactIcon::x, newContactIcon::y); newContactIcon->activatedCallback = [=](gui::Item &item) { return addNewContact(); }; diff --git a/module-apps/application-call/windows/NumberWindow.cpp b/module-apps/application-call/windows/NumberWindow.cpp index 4c26a87682fb393db7e1711ccaa464885243884f..00768a1b3944e10fb59e730d7bcbd3d28e107a69 100644 --- a/module-apps/application-call/windows/NumberWindow.cpp +++ b/module-apps/application-call/windows/NumberWindow.cpp @@ -35,10 +35,10 @@ namespace gui numberLabel->setText(num); if (num.empty()) { - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); return; } - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("app_call_clear")); + navBar->setText(nav_bar::Side::Right, utils::translate("app_call_clear")); } void NumberWindow::buildInterface() @@ -47,11 +47,11 @@ namespace gui using namespace callAppStyle::enterNumberWindow; AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::LEFT, true); - bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setActive(BottomBar::Side::RIGHT, true); + navBar->setActive(nav_bar::Side::Left, true); + navBar->setActive(nav_bar::Side::Center, true); + navBar->setActive(nav_bar::Side::Right, true); - bottomBar->setText(BottomBar::Side::LEFT, utils::translate(callAppStyle::strings::call)); + navBar->setText(nav_bar::Side::Left, utils::translate(callAppStyle::strings::call)); numberLabel = new gui::Label(this, numberLabel::x, numberLabel::y, numberLabel::w, numberLabel::h); numberLabel->setPenWidth(numberLabel::borderW); diff --git a/module-apps/application-calllog/CalllogModel.cpp b/module-apps/application-calllog/CalllogModel.cpp index 3a639a2d70c6a443f11dcbc2b9efb3a452b2457e..4335e307ba6ec42e742b82d7c296312ce07e4d6f 100644 --- a/module-apps/application-calllog/CalllogModel.cpp +++ b/module-apps/application-calllog/CalllogModel.cpp @@ -91,11 +91,11 @@ gui::ListItem *CalllogModel::getItem(gui::Order order) auto &callLogItem = dynamic_cast(item); if (callLogItem.getCall().presentation == PresentationType::PR_UNKNOWN) { // disable call button since the number is unknown - application->getCurrentWindow()->setBottomBarActive(gui::BottomBar::Side::LEFT, false); + application->getCurrentWindow()->setNavBarActive(gui::nav_bar::Side::Left, false); item.inputCallback = nullptr; } else { - application->getCurrentWindow()->setBottomBarActive(gui::BottomBar::Side::LEFT, true); + application->getCurrentWindow()->setNavBarActive(gui::nav_bar::Side::Left, true); item.inputCallback = callCallback; } } diff --git a/module-apps/application-calllog/data/CallLogStyle.hpp b/module-apps/application-calllog/data/CallLogStyle.hpp index 6d643831857482e60d64061cf4d842b736285c0d..8445abcc34637a496dcc91db52505fae8d88971d 100644 --- a/module-apps/application-calllog/data/CallLogStyle.hpp +++ b/module-apps/application-calllog/data/CallLogStyle.hpp @@ -14,7 +14,7 @@ namespace callLogStyle // DETAILS WINDOW namespace detailsWindow { - constexpr inline auto x = style::window::bottomBar::leftMargin; + constexpr inline auto x = style::window::navBar::leftMargin; constexpr inline auto y = style::window::default_vertical_pos; constexpr inline auto w = style::window_width - 2 * x; constexpr inline auto h = style::window::default_body_height; diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp index 26d1f581318891bbe163ca9a21dd61cc71480581..896b2f342334e1d491998525816f6aa9be43005d 100644 --- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp @@ -120,8 +120,8 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::options)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setText(nav_bar::Side::Left, utils::translate(style::strings::common::options)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); auto vBox = new VBox(this, detailsWindow::x + 10, detailsWindow::y, detailsWindow::w, detailsWindow::h); vBox->setEdges(RectangleEdge::None); diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.cpp b/module-apps/application-calllog/windows/CallLogMainWindow.cpp index 3e387f17f45fbab364e6d0a6ed17c8ab5e3c15f7..6138cb3fcd6df004f413f77213c90738e5361450 100644 --- a/module-apps/application-calllog/windows/CallLogMainWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogMainWindow.cpp @@ -45,9 +45,9 @@ namespace gui setTitle(utils::translate("app_calllog_title_main")); - bottomBar->setText(BottomBar::Side::LEFT, utils::translate(style::strings::common::call)); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setText(nav_bar::Side::Left, utils::translate(style::strings::common::call)); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); list = new gui::ListView(this, mainWindow::x, @@ -102,16 +102,16 @@ namespace gui void CallLogMainWindow::onEmptyList() { - bottomBar->setActive(gui::BottomBar::Side::LEFT, false); - bottomBar->setActive(gui::BottomBar::Side::CENTER, false); + navBar->setActive(gui::nav_bar::Side::Left, false); + navBar->setActive(gui::nav_bar::Side::Center, false); emptyListIcon->setVisible(true); application->refreshWindow(gui::RefreshModes::GUI_REFRESH_DEEP); } void CallLogMainWindow::onListFilled() { - bottomBar->setActive(gui::BottomBar::Side::LEFT, true); - bottomBar->setActive(gui::BottomBar::Side::CENTER, true); + navBar->setActive(gui::nav_bar::Side::Left, true); + navBar->setActive(gui::nav_bar::Side::Center, true); emptyListIcon->setVisible(false); application->refreshWindow(gui::RefreshModes::GUI_REFRESH_DEEP); } diff --git a/module-apps/application-desktop/models/ActiveNotificationsModel.cpp b/module-apps/application-desktop/models/ActiveNotificationsModel.cpp index 315c9d7ce8d740e65a16d247907c9840bbcf2b2d..d78a1ba66a7107ac19e9c26689e878b8c38d8f7e 100644 --- a/module-apps/application-desktop/models/ActiveNotificationsModel.cpp +++ b/module-apps/application-desktop/models/ActiveNotificationsModel.cpp @@ -27,8 +27,7 @@ namespace { item->focusChangedCallback = [model](gui::Item &_item) { if (_item.focus) { - model->setParentBottomBar( - {}, utils::translate("app_desktop_show"), utils::translate("app_desktop_clear")); + model->setParentNavBar({}, utils::translate("app_desktop_show"), utils::translate("app_desktop_clear")); return true; } return false; @@ -101,9 +100,9 @@ namespace { item->focusChangedCallback = [model, canCall = provider->hasRecord()](gui::Item &_item) { if (_item.focus) { - UTF8 bottomBarLeftText = canCall ? UTF8{utils::translate("common_call")} : UTF8{}; - model->setParentBottomBar( - bottomBarLeftText, utils::translate("app_desktop_show"), utils::translate("app_desktop_clear")); + UTF8 navBarLeftText = canCall ? UTF8{utils::translate("common_call")} : UTF8{}; + model->setParentNavBar( + navBarLeftText, utils::translate("app_desktop_show"), utils::translate("app_desktop_clear")); } return true; }; @@ -177,7 +176,7 @@ namespace { item->focusChangedCallback = [model](gui::Item &_item) { if (_item.focus) { - model->setParentBottomBar({}, utils::translate("common_disconnect"), {}); + model->setParentNavBar({}, utils::translate("common_disconnect"), {}); return true; } return false; @@ -188,7 +187,7 @@ namespace { item->focusChangedCallback = [model](gui::Item &_item) { if (_item.focus) { - model->setParentBottomBar({}, utils::translate("app_desktop_show"), utils::translate("common_stop")); + model->setParentNavBar({}, utils::translate("app_desktop_show"), utils::translate("common_stop")); } return true; }; @@ -240,11 +239,11 @@ ActiveNotificationsModel::ActiveNotificationsModel(AppWindow *parent) : AsyncCallbackReceiver(parent->getApplication()), parent(parent) {} -void ActiveNotificationsModel::setParentBottomBar(const UTF8 &left, const UTF8 ¢er, const UTF8 &right) +void ActiveNotificationsModel::setParentNavBar(const UTF8 &left, const UTF8 ¢er, const UTF8 &right) { - parent->setBottomBarText(left, BottomBar::Side::LEFT); - parent->setBottomBarText(center, BottomBar::Side::CENTER); - parent->setBottomBarText(right, BottomBar::Side::RIGHT); + parent->setNavBarText(left, nav_bar::Side::Left); + parent->setNavBarText(center, nav_bar::Side::Center); + parent->setNavBarText(right, nav_bar::Side::Right); } auto ActiveNotificationsModel::create(const notifications::NotSeenSMSNotification *notification) diff --git a/module-apps/application-desktop/models/ActiveNotificationsModel.hpp b/module-apps/application-desktop/models/ActiveNotificationsModel.hpp index 6d1de979627dcd2fd740874a20f74cba7d74b5fe..93291d474629cf46208d07b6aeb54b087bbd7567 100644 --- a/module-apps/application-desktop/models/ActiveNotificationsModel.hpp +++ b/module-apps/application-desktop/models/ActiveNotificationsModel.hpp @@ -13,7 +13,7 @@ namespace gui AppWindow *parent = nullptr; public: explicit ActiveNotificationsModel(AppWindow *parent); - void setParentBottomBar(const UTF8 &left, const UTF8 ¢er, const UTF8 &right); + void setParentNavBar(const UTF8 &left, const UTF8 ¢er, const UTF8 &right); auto create(const notifications::NotSeenSMSNotification *notification) -> NotificationListItem * override; auto create(const notifications::NotSeenCallNotification *notification) -> NotificationListItem * override; auto create(const notifications::TetheringNotification *notification) -> NotificationListItem * override; diff --git a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp index 5d693261987605709321d3359b3b439039d8e6c9..83df86f0f184d6b4e92b8ec2fc4ecd328c2c8d4a 100644 --- a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp +++ b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp @@ -33,7 +33,7 @@ namespace gui void ChargingBatteryWindow::buildInterface() { AppWindow::buildInterface(); - bottomBar->setVisible(false); + navBar->setVisible(false); statusBar->setVisible(false); new gui::Image(this, imgPositionX, imgPositionY, 0, 0, "charging_battery_W_G"); } diff --git a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp index 048377fc41fd5d3aed4af28ca69e1b84cf703eac..2419cc0cdd77567e5ec6e83f83146f05fb1beab0 100644 --- a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp +++ b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp @@ -33,7 +33,7 @@ namespace gui void DeadBatteryWindow::buildInterface() { AppWindow::buildInterface(); - bottomBar->setVisible(false); + navBar->setVisible(false); statusBar->setVisible(false); new gui::Image(this, imgPositionX, imgPositionY, 0, 0, "dead_battery_W_G"); } diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp index 3fa86b1a7c9b258bb3db2a6b15e37af3e9637cdc..9c466df5d4c316a080b4a977eccf16fd4ad1217e 100644 --- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp +++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp @@ -24,7 +24,7 @@ namespace gui { AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::CENTER, true); + navBar->setActive(nav_bar::Side::Center, true); clockDate = new ClockDateWidget( this, 0, style::window::default_vertical_pos, style::window_width, clock_date_widget::h); @@ -179,12 +179,11 @@ namespace gui if (focusItem != nullptr) { return; } - bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_desktop_menu")); + navBar->setText(nav_bar::Side::Center, utils::translate("app_desktop_menu")); const auto tetheringNotActive = !notificationsModel->isTetheringOn(); - bottomBar->setText(BottomBar::Side::LEFT, utils::translate("app_desktop_calls"), tetheringNotActive); + navBar->setText(nav_bar::Side::Left, utils::translate("app_desktop_calls"), tetheringNotActive); const auto hasDismissibleNotification = notificationsModel->hasDismissibleNotification(); - bottomBar->setText( - BottomBar::Side::RIGHT, utils::translate("app_desktop_clear_all"), hasDismissibleNotification); + navBar->setText(nav_bar::Side::Right, utils::translate("app_desktop_clear_all"), hasDismissibleNotification); inputCallback = [this, hasDismissibleNotification, tetheringNotActive]([[maybe_unused]] Item &item, const InputEvent &inputEvent) -> bool { diff --git a/module-apps/application-desktop/windows/LogoWindow.cpp b/module-apps/application-desktop/windows/LogoWindow.cpp index aaab3329864585158464f55ee0964006f40ac26c..0e7cde28a51debd0b419d61d01a7ab900abb62b4 100644 --- a/module-apps/application-desktop/windows/LogoWindow.cpp +++ b/module-apps/application-desktop/windows/LogoWindow.cpp @@ -23,7 +23,7 @@ namespace gui void LogoWindow::buildInterface() { AppWindow::buildInterface(); - bottomBar->setVisible(false); + navBar->setVisible(false); statusBar->setVisible(false); new gui::Image(this, 0, 0, 0, 0, "logo"); } diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp index 51a7ad0548ed28090cb147f26be82d765dafb591..ca8bd697a75517b1d32ee192d9122d72f040a412 100644 --- a/module-apps/application-desktop/windows/MenuWindow.cpp +++ b/module-apps/application-desktop/windows/MenuWindow.cpp @@ -154,10 +154,10 @@ namespace gui void MenuWindow::buildInterface() { AppWindow::buildInterface(); - bottomBar->setActive(BottomBar::Side::CENTER, true); - bottomBar->setActive(BottomBar::Side::RIGHT, true); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::open)); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setActive(nav_bar::Side::Center, true); + navBar->setActive(nav_bar::Side::Right, true); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open)); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); mainMenu = new MenuPage( this, @@ -283,12 +283,12 @@ namespace gui using namespace style::window; mainMenu->setSize(this->area().w - default_left_margin - default_right_margin, - bottomBar->area().pos(Axis::Y) - default_vertical_pos - style::design::grid_offset); + navBar->area().pos(Axis::Y) - default_vertical_pos - style::design::grid_offset); mainMenu->setPosition(default_left_margin, default_vertical_pos + style::design::grid_offset); mainMenu->setVisible(false); toolsMenu->setSize(this->area().w - default_left_margin - default_right_margin, - bottomBar->area().pos(Axis::Y) - default_vertical_pos - style::design::grid_offset); + navBar->area().pos(Axis::Y) - default_vertical_pos - style::design::grid_offset); toolsMenu->setPosition(default_left_margin, default_vertical_pos + style::design::grid_offset); toolsMenu->setVisible(false); diff --git a/module-apps/application-desktop/windows/MmiPullWindow.cpp b/module-apps/application-desktop/windows/MmiPullWindow.cpp index 3ad8f3cdd807bc8da7aee113fa0b9ea1727351a7..ef5f5c6b63fe4dbdb700c7b7df47ffe581d810bc 100644 --- a/module-apps/application-desktop/windows/MmiPullWindow.cpp +++ b/module-apps/application-desktop/windows/MmiPullWindow.cpp @@ -37,8 +37,8 @@ MmiPullWindow::MmiPullWindow(app::ApplicationCommon *app, const std::string &nam { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate("app_desktop_replay")); - bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back)); + navBar->setText(nav_bar::Side::Center, utils::translate("app_desktop_replay")); + navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); text = new Text( this, style::desktop::text::x, style::desktop::text::y, style::desktop::text::w, style::desktop::text::h); text->setTextType(TextType::MultiLine); @@ -57,8 +57,8 @@ MmiPullWindow::MmiPullWindow(app::ApplicationCommon *app, const std::string &nam InputBox->inputText->setInputMode(new InputMode( {InputMode::digit}, - [=](const UTF8 &text1) { bottomBarTemporaryMode(text1); }, - [=]() { bottomBarRestoreFromTemporaryMode(); }, + [=](const UTF8 &text1) { navBarTemporaryMode(text1); }, + [=]() { navBarRestoreFromTemporaryMode(); }, [=]() { selectSpecialCharacter(); })); addWidget(InputBox); diff --git a/module-apps/application-desktop/windows/MmiPushWindow.cpp b/module-apps/application-desktop/windows/MmiPushWindow.cpp index edc75dfb5d154ab286e1d14dfc05455f8d95c1fc..ca9002f63c5689d1117cbfc5685d1023e46b8789 100644 --- a/module-apps/application-desktop/windows/MmiPushWindow.cpp +++ b/module-apps/application-desktop/windows/MmiPushWindow.cpp @@ -32,7 +32,7 @@ namespace style::desktop MmiPushWindow::MmiPushWindow(app::ApplicationCommon *app, const std::string &name) : gui::AppWindow(app, name) { AppWindow::buildInterface(); - bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::ok)); + navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::ok)); icon = new Icon(this, style::window::default_left_margin, style::window::default_vertical_pos, diff --git a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp index aee096f0d0af00bcc15609df27b08e9c5c32128f..0e23b567ac82c6827d601ba25c00c3b532fe4e1c 100644 --- a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp +++ b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp @@ -51,7 +51,7 @@ void MeditationOptionsWindow::addCounterOption(std::list