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

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;