diff --git a/apps/exam_mode_configuration.h b/apps/exam_mode_configuration.h index 4f2879030..600f312d2 100644 --- a/apps/exam_mode_configuration.h +++ b/apps/exam_mode_configuration.h @@ -2,13 +2,13 @@ #define APPS_EXAM_MODE_CONFIGURATION_H #include "global_preferences.h" -#include "settings/settings_message_tree.h" +#include "shared/settings_message_tree.h" #include namespace ExamModeConfiguration { // Settings menu -extern const Settings::SettingsMessageTree s_modelExamChildren[2]; +extern const Shared::SettingsMessageTree s_modelExamChildren[2]; int numberOfAvailableExamMode(); GlobalPreferences::ExamMode examModeAtIndex(int index); I18n::Message examModeActivationMessage(int index); diff --git a/apps/exam_mode_configuration_non_official.cpp b/apps/exam_mode_configuration_non_official.cpp index 2f94ceef7..96255a785 100644 --- a/apps/exam_mode_configuration_non_official.cpp +++ b/apps/exam_mode_configuration_non_official.cpp @@ -1,6 +1,6 @@ #include "exam_mode_configuration.h" -constexpr Settings::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Settings::SettingsMessageTree(I18n::Message::ActivateExamMode), Settings::SettingsMessageTree(I18n::Message::Default)}; +constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Shared::SettingsMessageTree(I18n::Message::ActivateExamMode), Shared::SettingsMessageTree(I18n::Message::Default)}; int ExamModeConfiguration::numberOfAvailableExamMode() { return 1; diff --git a/apps/exam_mode_configuration_official.cpp b/apps/exam_mode_configuration_official.cpp index 0dbc9434e..860b2f65c 100644 --- a/apps/exam_mode_configuration_official.cpp +++ b/apps/exam_mode_configuration_official.cpp @@ -3,7 +3,7 @@ #include "exam_mode_configuration.h" -constexpr Settings::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[2] = {Settings::SettingsMessageTree(I18n::Message::ActivateExamMode), Settings::SettingsMessageTree(I18n::Message::ActivateDutchExamMode)}; +constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[2] = {Shared::SettingsMessageTree(I18n::Message::ActivateExamMode), Shared::SettingsMessageTree(I18n::Message::ActivateDutchExamMode)}; int ExamModeConfiguration::numberOfAvailableExamMode() { if (GlobalPreferences::sharedGlobalPreferences()->language() != I18n::Language::EN || GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) { diff --git a/apps/settings/Makefile b/apps/settings/Makefile index efe357030..b8197213e 100644 --- a/apps/settings/Makefile +++ b/apps/settings/Makefile @@ -1,10 +1,6 @@ apps += Settings::App app_headers += apps/settings/app.h -app_settings_test_src = $(addprefix apps/settings/,\ - settings_message_tree.cpp \ -) - app_settings_src = $(addprefix apps/settings/,\ app.cpp \ cell_with_separator.cpp \ diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 0d3cdab3b..b5fdd887c 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -4,6 +4,7 @@ #include using namespace Poincare; +using namespace Shared; namespace Settings { diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 9d23249ea..d8a42f975 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -2,7 +2,7 @@ #define SETTINGS_MAIN_CONTROLLER_H #include -#include "settings_message_tree.h" +#include #include "message_table_cell_with_gauge_with_separator.h" #include "sub_menu/about_controller.h" #include "sub_menu/display_mode_controller.h" @@ -12,14 +12,14 @@ namespace Settings { -extern const SettingsMessageTree s_modelAngleChildren[3]; -extern const SettingsMessageTree s_modelEditionModeChildren[2]; -extern const SettingsMessageTree s_modelFloatDisplayModeChildren[4]; -extern const SettingsMessageTree s_modelComplexFormatChildren[3]; -extern const SettingsMessageTree s_modelFontChildren[2]; -extern const SettingsMessageTree s_modelExamChildren[2]; -extern const SettingsMessageTree s_modelAboutChildren[3]; -extern const SettingsMessageTree s_model; +extern const Shared::SettingsMessageTree s_modelAngleChildren[3]; +extern const Shared::SettingsMessageTree s_modelEditionModeChildren[2]; +extern const Shared::SettingsMessageTree s_modelFloatDisplayModeChildren[4]; +extern const Shared::SettingsMessageTree s_modelComplexFormatChildren[3]; +extern const Shared::SettingsMessageTree s_modelFontChildren[2]; +extern const Shared::SettingsMessageTree s_modelExamChildren[2]; +extern const Shared::SettingsMessageTree s_modelAboutChildren[3]; +extern const Shared::SettingsMessageTree s_model; class MainController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource { public: @@ -52,7 +52,7 @@ private: * k_indexOfAboutCell) */ constexpr static int k_indexOfPopUpCell = k_indexOfExamModeCell + 1; constexpr static int k_indexOfAboutCell = k_indexOfExamModeCell + 1; - static const SettingsMessageTree * model(); + static const Shared::SettingsMessageTree * model(); StackViewController * stackController() const; I18n::Message promptMessage() const; bool hasPrompt() const { return promptMessage() != I18n::Message::Default; } diff --git a/apps/settings/main_controller_prompt_beta.cpp b/apps/settings/main_controller_prompt_beta.cpp index 26ecaef81..900c6a22c 100644 --- a/apps/settings/main_controller_prompt_beta.cpp +++ b/apps/settings/main_controller_prompt_beta.cpp @@ -2,6 +2,8 @@ #include "../exam_mode_configuration.h" #include +using namespace Shared; + namespace Settings { constexpr SettingsMessageTree s_modelMenu[] = diff --git a/apps/settings/main_controller_prompt_none.cpp b/apps/settings/main_controller_prompt_none.cpp index a17f0969a..153c7c49a 100644 --- a/apps/settings/main_controller_prompt_none.cpp +++ b/apps/settings/main_controller_prompt_none.cpp @@ -2,6 +2,8 @@ #include "../exam_mode_configuration.h" #include +using namespace Shared; + namespace Settings { constexpr SettingsMessageTree s_modelMenu[] = diff --git a/apps/settings/main_controller_prompt_update.cpp b/apps/settings/main_controller_prompt_update.cpp index 44e08c46e..38f19d3eb 100644 --- a/apps/settings/main_controller_prompt_update.cpp +++ b/apps/settings/main_controller_prompt_update.cpp @@ -4,6 +4,8 @@ namespace Settings { +using namespace Shared; + constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), diff --git a/apps/settings/sub_menu/generic_sub_controller.h b/apps/settings/sub_menu/generic_sub_controller.h index b689f59b2..8c9e42487 100644 --- a/apps/settings/sub_menu/generic_sub_controller.h +++ b/apps/settings/sub_menu/generic_sub_controller.h @@ -2,7 +2,7 @@ #define SETTINGS_GENERIC_SUB_CONTROLLER_H #include -#include "../settings_message_tree.h" +#include namespace Settings { diff --git a/apps/shared/Makefile b/apps/shared/Makefile index e97b68ed0..570afa9bd 100644 --- a/apps/shared/Makefile +++ b/apps/shared/Makefile @@ -59,6 +59,7 @@ app_shared_src = $(addprefix apps/shared/,\ scrollable_two_expressions_cell.cpp \ separable.cpp \ separator_even_odd_buffer_text_cell.cpp \ + settings_message_tree.cpp \ simple_interactive_curve_view_controller.cpp \ store_cell.cpp \ store_controller.cpp \ diff --git a/apps/settings/settings_message_tree.cpp b/apps/shared/settings_message_tree.cpp similarity index 86% rename from apps/settings/settings_message_tree.cpp rename to apps/shared/settings_message_tree.cpp index f481eb543..f7d24b772 100644 --- a/apps/settings/settings_message_tree.cpp +++ b/apps/shared/settings_message_tree.cpp @@ -1,6 +1,6 @@ #include "settings_message_tree.h" -namespace Settings { +namespace Shared { const MessageTree * SettingsMessageTree::children(int index) const { return &m_children[index]; diff --git a/apps/settings/settings_message_tree.h b/apps/shared/settings_message_tree.h similarity index 85% rename from apps/settings/settings_message_tree.h rename to apps/shared/settings_message_tree.h index 10d1b5205..15f7efc7c 100644 --- a/apps/settings/settings_message_tree.h +++ b/apps/shared/settings_message_tree.h @@ -1,9 +1,9 @@ -#ifndef SETTINGS_MESSAGE_TREE_H -#define SETTINGS_MESSAGE_TREE_H +#ifndef SHARED_SETTINGS_MESSAGE_TREE_H +#define SHARED_SETTINGS_MESSAGE_TREE_H #include #include -namespace Settings { +namespace Shared { class SettingsMessageTree : public MessageTree { public: