TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plotter

Browse Source
This commit is contained in:
serso
2016-02-25 17:45:28 +01:00
parent 828f9fa07b
commit 13f12d5d14
5 changed files with 78 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
View File

@@ -22,8 +22,6 @@
package org.solovyev.android.calculator.functions;
import static org.solovyev.android.calculator.functions.CppFunction.NO_ID;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.DialogInterface;
@@ -59,9 +57,6 @@ import org.solovyev.android.calculator.keyboard.FloatingKeyboardWindow;
import org.solovyev.android.calculator.view.EditTextCompat;
import org.solovyev.common.math.MathRegistry;
import butterknife.Bind;
import butterknife.ButterKnife;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -72,6 +67,11 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife;
import static org.solovyev.android.calculator.functions.CppFunction.NO_ID;
public abstract class BaseFunctionFragment extends BaseDialogFragment implements View.OnClickListener, View.OnFocusChangeListener, View.OnKeyListener {
protected static final String ARG_FUNCTION = "function";
@@ -274,12 +274,6 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
}
protected boolean validateName() {
final String name = nameView.getText().toString();
if (!Engine.isValidName(name)) {
setError(nameLabel, getString(R.string.function_name_is_not_valid));
return false;
}
clearError(nameLabel);
return true;
}

10
app/src/main/java/org/solovyev/android/calculator/functions/EditFunctionFragment.java
View File

@@ -12,14 +12,15 @@ import android.support.v7.app.AlertDialog;
import org.solovyev.android.Activities;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.Engine;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.entities.EntityRemovalDialog;
import jscl.math.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.math.function.Function;
public class EditFunctionFragment extends BaseFunctionFragment {
public EditFunctionFragment() {
@@ -103,10 +104,11 @@ public class EditFunctionFragment extends BaseFunctionFragment {
@Override
protected boolean validateName() {
if (!super.validateName()) {
final String name = nameView.getText().toString();
if (!Engine.isValidName(name)) {
setError(nameLabel, getString(R.string.function_name_is_not_valid));
return false;
}
final String name = nameView.getText().toString();
final Function existingFunction = functionsRegistry.get(name);
if (existingFunction != null) {
if (!existingFunction.isIdDefined()) {