UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Use ExpressionFieldDelegateApp methods in Calculation::App

Browse Source 
For methods textFieldDidReceiveEvent and layoutFieldDidReceiveEvent
This commit is contained in:
Léa Saviot
2018-11-16 15:49:32 +01:00
committed by Émilie Feral
parent 48d281e44d
commit f6804c2d67
6 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/calculation/app.cpp
View File

@@ -48,46 +48,24 @@ App::App(Container * container, Snapshot * snapshot) :
}
bool App::textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) {
if (event == Ion::Events::XNT && TextFieldDelegateApp::textFieldDidReceiveEvent(textField, event)) {
if (textField->isEditing() && textField->shouldFinishEditing(event) && textField->text()[0] == 0) {
return true;
}
if (textField->isEditing() && textField->shouldFinishEditing(event)) {
if (textField->text()[0] == 0) {
return true;
}
if (!textInputIsCorrect(textField->text())) {
displayWarning(I18n::Message::SyntaxError);
return true;
}
}
return false;
return Shared::ExpressionFieldDelegateApp::textFieldDidReceiveEvent(textField, event);
}
bool App::layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::Event event) {
if (event == Ion::Events::XNT && ExpressionFieldDelegateApp::layoutFieldDidReceiveEvent(layoutField, event)) {
if (layoutField->isEditing() && layoutField->shouldFinishEditing(event) && !layoutField->hasText()) {
return true;
}
if (layoutField->isEditing() && layoutField->shouldFinishEditing(event)) {
if (!layoutField->hasText()) {
return true;
}
char bufferForParsing[Calculation::k_printedExpressionSize];
layoutField->serialize(bufferForParsing, Calculation::k_printedExpressionSize);
if (!textInputIsCorrect(bufferForParsing)) {
displayWarning(I18n::Message::SyntaxError);
return true;
}
}
return false;
return Shared::ExpressionFieldDelegateApp::layoutFieldDidReceiveEvent(layoutField, event);
}
bool App::textInputIsCorrect(const char * text) {
bool App::isAcceptableExpression(const Poincare::Expression expression, Responder * responder) {
/* Here, we check that the expression entered by the user can be printed with
* less than k_printedExpressionLength characters. Otherwise, we prevent the
* user from adding this expression to the calculation store. */
Expression exp = Expression::parse(text);
Expression exp = expression;
if (exp.isUninitialized()) {
return false;
}

3
apps/calculation/app.h
View File

@@ -28,8 +28,9 @@ public:
CalculationStore m_calculationStore;
};
bool textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) override;
bool textInputIsCorrect(const char * text);
bool layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::Event event) override;
// TextFieldDelegateApp
bool isAcceptableExpression(const Poincare::Expression expression, Responder * responder) override;
char XNT() override;
private:
App(Container * container, Snapshot * snapshot);

2
apps/calculation/edit_expression_controller.cpp
View File

@@ -130,7 +130,7 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
App * calculationApp = (App *)app();
/* The input text store in m_cacheBuffer might have beed correct the first
* time but then be too long when replacing ans in another context */
if (!calculationApp->textInputIsCorrect(m_cacheBuffer)) {
if (!calculationApp->isAcceptableText(m_cacheBuffer, calculationApp)) {
return true;
}
m_calculationStore->push(m_cacheBuffer, calculationApp->localContext());

1
apps/shared/expression_field_delegate_app.cpp
View File

@@ -33,6 +33,7 @@ bool ExpressionFieldDelegateApp::layoutFieldDidReceiveEvent(LayoutField * layout
return true;
}
if (!isAcceptableText(buffer, layoutField)) {
displayWarning(I18n::Message::SyntaxError);
return true;
}
}

31
apps/shared/text_field_delegate_app.cpp
View File

@@ -7,12 +7,6 @@ using namespace Poincare;
namespace Shared {
TextFieldDelegateApp::TextFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
InputEventHandlerDelegateApp(container, snapshot, rootViewController),
TextFieldDelegate()
{
}
Context * TextFieldDelegateApp::localContext() {
return container()->globalContext();
}
@@ -37,8 +31,20 @@ bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::
return false;
}
bool TextFieldDelegateApp::isAcceptableText(const char * text, Responder * responder) {
Expression exp = Expression::parse(text);
return isAcceptableExpression(exp, responder);
}
/* Protected */
TextFieldDelegateApp::TextFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
InputEventHandlerDelegateApp(container, snapshot, rootViewController),
TextFieldDelegate()
{
}
bool TextFieldDelegateApp::fieldDidReceiveEvent(EditableField * field, Responder * responder, Ion::Events::Event event) {
if (event == Ion::Events::XNT) {
if (!field->isEditing()) {
@@ -54,19 +60,18 @@ bool TextFieldDelegateApp::isFinishingEvent(Ion::Events::Event event) {
return event == Ion::Events::OK || event == Ion::Events::EXE;
}
bool TextFieldDelegateApp::isAcceptableText(const char * text, Responder * responder) {
Expression exp = Expression::parse(text);
return isAcceptableExpression(exp, responder);
}
bool TextFieldDelegateApp::isAcceptableExpression(const Expression exp, Responder * responder) {
if (exp.isUninitialized()) {
responder->app()->displayWarning(I18n::Message::SyntaxError);
if (responder != nullptr) {
responder->app()->displayWarning(I18n::Message::SyntaxError);
}
return false;
}
if (exp.type() == ExpressionNode::Type::Store) {
// Most textfields do not allow Store "3->a" or "5->f(x)"
responder->app()->displayWarning(I18n::Message::StoreExpressionNotAllowed);
if (responder != nullptr) {
responder->app()->displayWarning(I18n::Message::StoreExpressionNotAllowed);
}
return false;
}
return true;

2
apps/shared/text_field_delegate_app.h
View File

@@ -17,11 +17,11 @@ public:
virtual char XNT();
bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override;
virtual bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
bool isAcceptableText(const char * text, Responder * responder);
protected:
TextFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController);
bool fieldDidReceiveEvent(EditableField * field, Responder * responder, Ion::Events::Event event);
bool isFinishingEvent(Ion::Events::Event event);
bool isAcceptableText(const char * text, Responder * responder);
virtual bool isAcceptableExpression(const Poincare::Expression expression, Responder * responder);
};