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

percent added

Browse Source
This commit is contained in:
serso 2011-11-14 15:54:39 +04:00
parent b184880433
commit a4c64df0a6
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/calc_subtraction_button.xml
View File

@ -8,7 +8,9 @@
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@+id/subtractionButton"
calc:textUp="+…%"
a:text="-"
calc:textDown="-…%"
calc:directionTextScale="0.5"
style="?digitButtonStyle"
a:onClick="digitButtonClickHandler"/>

16
src/main/java/org/solovyev/android/calculator/CalculatorModel.java
View File

@ -256,12 +256,19 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
@Override
public void doOperation(@NotNull EditText editor) {
int cursorPositionOffset = 0;
final StringBuilder textToBeInserted = new StringBuilder();
if (text.equals("+…%")) {
textToBeInserted .append("+%");
cursorPositionOffset = -1;
} else if (text.equals("-…%")) {
textToBeInserted.append("-%");
cursorPositionOffset = -1;
} else {
textToBeInserted.append(text);
final MathType.Result mathType = MathType.getType(text, 0);
int cursorPositionOffset = 0;
final StringBuilder textToBeInserted = new StringBuilder(text);
switch (mathType.getMathType()) {
case function:
textToBeInserted.append("()");
@ -274,6 +281,7 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
cursorPositionOffset = -1;
}
}
}
editor.getText().insert(editor.getSelectionStart(), textToBeInserted.toString());
editor.setSelection(editor.getSelectionStart() + cursorPositionOffset, editor.getSelectionEnd() + cursorPositionOffset);

2
src/main/java/org/solovyev/android/calculator/CalculatorVarsActivity.java
View File

@ -301,7 +301,7 @@ public class CalculatorVarsActivity extends ListActivity {
if (!StringUtils.isEmpty(name)) {
try {
Identifier.parser.parse(name, new MutableInt(0), 0);
Identifier.parser.parse(name, new MutableInt(0), 0, null);
result = true;
} catch (ParseException e) {
// not valid name;