From 3aa2e5d6a7c1260e05a04714bc07102c70bb2d8f Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Wed, 29 May 2019 16:37:12 +0200 Subject: [PATCH] [apps/on_boarding] Move LanguageController::reinitOnBoarding() to App --- apps/on_boarding/app.cpp | 9 +++++++-- apps/on_boarding/app.h | 1 + apps/on_boarding/language_controller.cpp | 5 ----- apps/on_boarding/language_controller.h | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/on_boarding/app.cpp b/apps/on_boarding/app.cpp index 258f7be2a..70a3f1e25 100644 --- a/apps/on_boarding/app.cpp +++ b/apps/on_boarding/app.cpp @@ -33,14 +33,19 @@ bool App::processEvent(Ion::Events::Event e) { return true; } if (e == Ion::Events::OnOff) { - m_languageController.reinitOnBoarding(); + reinitOnBoarding(); } return ::App::processEvent(e); } void App::didBecomeActive(Window * window) { ::App::didBecomeActive(window); - m_languageController.reinitOnBoarding(); + reinitOnBoarding(); +} + +void App::reinitOnBoarding() { + m_languageController.resetSelection(); + displayModalViewController(&m_logoController, 0.5f, 0.5f); } } diff --git a/apps/on_boarding/app.h b/apps/on_boarding/app.h index dc8665656..24a600343 100644 --- a/apps/on_boarding/app.h +++ b/apps/on_boarding/app.h @@ -20,6 +20,7 @@ public: void didBecomeActive(Window * window) override; private: App(Snapshot * snapshot); + void reinitOnBoarding(); LanguageController m_languageController; LogoController m_logoController; }; diff --git a/apps/on_boarding/language_controller.cpp b/apps/on_boarding/language_controller.cpp index b9326cbf1..d45aa0271 100644 --- a/apps/on_boarding/language_controller.cpp +++ b/apps/on_boarding/language_controller.cpp @@ -10,11 +10,6 @@ LanguageController::LanguageController(Responder * parentResponder, LogoControll { } -void LanguageController::reinitOnBoarding() { - resetSelection(); - app()->displayModalViewController(m_logoController, 0.5f, 0.5f); -} - bool LanguageController::handleEvent(Ion::Events::Event event) { if (Shared::LanguageController::handleEvent(event)) { AppsContainer * appsContainer = AppsContainer::sharedAppsContainer(); diff --git a/apps/on_boarding/language_controller.h b/apps/on_boarding/language_controller.h index cb838edc5..6fc6ef71b 100644 --- a/apps/on_boarding/language_controller.h +++ b/apps/on_boarding/language_controller.h @@ -10,7 +10,6 @@ namespace OnBoarding { class LanguageController : public Shared::LanguageController { public: LanguageController(Responder * parentResponder, LogoController * logoController); - void reinitOnBoarding(); bool handleEvent(Ion::Events::Event event) override; private: LogoController * m_logoController;