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

Variable validation

Browse Source
This commit is contained in:
serso
2016-01-30 21:12:24 +01:00
parent 4a9e8bf78a
commit 0170c3bb6a
11 changed files with 130 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,9 +65,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements View.OnC
private static final int MENU_CATEGORY = Menu.FIRST + 2;
@NonNull
private final VariablesRegistry constantsRegistry = Locator.getInstance().getEngine().getVariablesRegistry();
@NonNull
private final FloatingKeyboardWindow keyboardWindow = new FloatingKeyboardWindow();
private final FloatingKeyboardWindow keyboardWindow = new FloatingKeyboardWindow(null);
@NonNull
private final KeyboardUser keyboardUser = new KeyboardUser();
@Bind(R.id.function_params)
@@ -86,6 +84,8 @@ public class EditFunctionFragment extends BaseDialogFragment implements View.OnC
Calculator calculator;
@Inject
FunctionsRegistry functionsRegistry;
@Inject
VariablesRegistry variablesRegistry;
@Nullable
private CppFunction function;
@@ -453,7 +453,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements View.OnC
final int id = v.getId();
if (id == R.id.function_body) {
menu.clear();
addEntities(menu, getNamesSorted(constantsRegistry), MENU_CONSTANT);
addEntities(menu, getNamesSorted(variablesRegistry), MENU_CONSTANT);
unregisterForContextMenu(bodyView);
}
}