From f434cda428d78046494658e82504e70cd3cabe7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 9 Aug 2017 17:31:35 +0200 Subject: [PATCH] [code] Add a pop up to warn about beta version Change-Id: I4301c7a53d0d43bb1e322b9e3e1587ec2040e0b8 --- apps/code/app.cpp | 9 ++++++++- apps/code/app.h | 4 +++- apps/code/editor_controller.cpp | 5 ++++- apps/code/editor_controller.h | 4 ++++ apps/i18n.cpp | 9 ++++++++- apps/i18n.h | 7 +++++++ 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/apps/code/app.cpp b/apps/code/app.cpp index 454bcf195..1d7bf6599 100644 --- a/apps/code/app.cpp +++ b/apps/code/app.cpp @@ -1,6 +1,7 @@ #include "app.h" #include "../apps_container.h" #include "code_icon.h" +#include "../i18n.h" #include namespace Code { @@ -28,8 +29,14 @@ App::Descriptor * App::Snapshot::descriptor() { App::App(Container * container, Snapshot * snapshot) : ::App(container, snapshot, &m_editorController), - m_editorController(this) + m_editorController(this), + m_betaVersionController(I18n::Message::BetaVersion, I18n::Message::BetaVersionMessage1, I18n::Message::BetaVersionMessage2, I18n::Message::BetaVersionMessage3, I18n::Message::BetaVersionMessage4) { } +void App::didBecomeActive(Window * window) { + ::App::didBecomeActive(window); + displayModalViewController(&m_betaVersionController, 0.5f, 0.5f); +} + } diff --git a/apps/code/app.h b/apps/code/app.h index deac81bdf..839821e34 100644 --- a/apps/code/app.h +++ b/apps/code/app.h @@ -3,6 +3,7 @@ #include #include "editor_controller.h" +#include "../shared/message_controller.h" namespace Code { @@ -22,10 +23,11 @@ public: //int numberOfTimers() override; //Timer * timerAtIndex(int i) override; //bool processEvent(Ion::Events::Event) override; - //void didBecomeActive(Window * window) override; + void didBecomeActive(Window * window) override; private: App(Container * container, Snapshot * snapshot); EditorController m_editorController; + MessageController m_betaVersionController; }; } diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp index 332c981b1..69408a8ce 100644 --- a/apps/code/editor_controller.cpp +++ b/apps/code/editor_controller.cpp @@ -8,6 +8,8 @@ extern "C" { #include "py/stackctrl.h" } +namespace Code { + mp_obj_t execute_from_str(const char *str) { nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { @@ -53,7 +55,6 @@ void EditorController::didBecomeFirstResponder() { app()->setFirstResponder(&m_view); } - View * EditorController::view() { return &m_view; } @@ -87,3 +88,5 @@ bool EditorController::handleEvent(Ion::Events::Event event) { } return false; } + +} diff --git a/apps/code/editor_controller.h b/apps/code/editor_controller.h index 05dfa498c..174e13334 100644 --- a/apps/code/editor_controller.h +++ b/apps/code/editor_controller.h @@ -3,6 +3,8 @@ #include +namespace Code { + class EditorController : public ViewController { public: EditorController(Responder * parentResponder); @@ -15,5 +17,7 @@ private: TextArea m_view; }; +} + #endif diff --git a/apps/i18n.cpp b/apps/i18n.cpp index 71ab851e9..5c398637a 100644 --- a/apps/i18n.cpp +++ b/apps/i18n.cpp @@ -25,7 +25,7 @@ constexpr static char deviationSpanishDefinition[] = {Ion::Charset::SmallSigma, constexpr static char deviationGermanDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'a', 'b', 'w', 'e', 'i', 'c', 'h', 'u', 'n', 'g', 0}; constexpr static char deviationPortugueseDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'D', 'e','s','v','i','o',' ','p','a','d','r','a','o', 0}; -const char * messages[232][5] { +const char * messages[237][5] { {"Warning", "Attention", "Cuidado", "Achtung", "Atencao"}, {"Confirm", "Valider", "Confirmar", "Bestatigen", "Confirmar"}, {"Cancel", "Annuler", "Cancelar", "Abbrechen", "Cancelar"}, @@ -289,6 +289,13 @@ const char * messages[232][5] { {"will have to reset the device and", "effectuer un reset qui supprimera", "debera resetear su equipo.", "Sie einen Reset durchfuhren, der", "uma redefinicao, que ira apagar"}, {"all your data will be deleted.", "vos donnees.", "", "Ihre Daten loschen werden.", "seus dados."}, + /* Code */ + {"BETA VERSION", "VERSION BETA", "??", "??", "??"}, + {"The Python version you are using is not", "La version de Python que vous utilisez", "??", "??", "??"}, + {"is not ???", "n'est pas une version definitive.", "??", "??", "??"}, + {"You may encouter", "Il est possible que son utilisation soit", "??", "??", "??"}, + {"BUGS!", "limitee et que certains bugs apparaissent.", "??", "??", "??"}, + /* On boarding */ {"UPDATE AVAILABLE", "MISE A JOUR DISPONIBLE", "ACTUALIZACION DISPONIBLE", "UPDATE VERFUGBAR", "ATUALIZACAO DISPONIVEL"}, {"There are important upgrades", "Des ameliorations importantes existent", "Hay mejoras importantes", "Wichtige Verbesserungen fur Ihren", "Existem melhorias significativas"}, diff --git a/apps/i18n.h b/apps/i18n.h index d493500fc..f3d5a859f 100644 --- a/apps/i18n.h +++ b/apps/i18n.h @@ -253,6 +253,13 @@ namespace I18n { HardwareTestLaunch3, HardwareTestLaunch4, + /* Code */ + BetaVersion, + BetaVersionMessage1, + BetaVersionMessage2, + BetaVersionMessage3, + BetaVersionMessage4, + /* On boarding */ UpdateAvailable, UpdateMessage1,