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

() -> ( )

Browse Source
This commit is contained in:
Sergey Solovyev 2013-06-16 16:24:22 +04:00
parent 7b19427222
commit 7407b7d5d2
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-app-core/res/layout/cpp_simple_button_round_brackets.xml
View File

@ -8,5 +8,5 @@
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_round_brackets" a:id="@id/cpp_button_round_brackets"
a:text="()" a:text="( )"
style="@style/cpp_simple_metro_digit_button_style" /> style="@style/cpp_simple_metro_digit_button_style" />

2
android-app/res/layout/cpp_drag_button_round_brackets.xml
View File

@ -10,7 +10,7 @@
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator" xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_round_brackets" a:id="@id/cpp_button_round_brackets"
c:textUp="(" c:textUp="("
a:text="()" a:text="( )"
c:textDown=")" c:textDown=")"
c:textLeft="(…)" c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33" c:directionTextScale="0.5;0.5;0.5;0.33"

70
core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
View File

@ -1,9 +1,10 @@
package org.solovyev.android.calculator; package org.solovyev.android.calculator;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.common.text.Strings;
/** /**
* User: serso * User: serso
@ -29,36 +30,49 @@ public class CalculatorKeyboardImpl implements CalculatorKeyboard {
boolean processed = processSpecialButtons(text); boolean processed = processSpecialButtons(text);
if (!processed) { if (!processed) {
int cursorPositionOffset = 0; processText(prepareText(text));
final StringBuilder textToBeInserted = new StringBuilder(text);
final MathType.Result mathType = MathType.getType(text, 0, false);
switch (mathType.getMathType()) {
case function:
textToBeInserted.append("()");
cursorPositionOffset = -1;
break;
case operator:
textToBeInserted.append("()");
cursorPositionOffset = -1;
break;
case comma:
textToBeInserted.append(" ");
break;
}
if (cursorPositionOffset == 0) {
if (MathType.openGroupSymbols.contains(text)) {
cursorPositionOffset = -1;
}
}
final CalculatorEditor editor = Locator.getInstance().getEditor();
editor.insert(textToBeInserted.toString(), cursorPositionOffset);
} }
} }
} }
private void processText(@Nonnull String text) {
int cursorPositionOffset = 0;
final StringBuilder textToBeInserted = new StringBuilder(text);
final MathType.Result mathType = MathType.getType(text, 0, false);
switch (mathType.getMathType()) {
case function:
textToBeInserted.append("()");
cursorPositionOffset = -1;
break;
case operator:
textToBeInserted.append("()");
cursorPositionOffset = -1;
break;
case comma:
textToBeInserted.append(" ");
break;
}
if (cursorPositionOffset == 0) {
if (MathType.openGroupSymbols.contains(text)) {
cursorPositionOffset = -1;
}
}
final CalculatorEditor editor = Locator.getInstance().getEditor();
editor.insert(textToBeInserted.toString(), cursorPositionOffset);
}
@Nonnull
private String prepareText(@Nonnull String text) {
if ("( )".equals(text)) {
return "()";
} else {
return text;
}
}
private boolean processSpecialButtons(@Nonnull String text) { private boolean processSpecialButtons(@Nonnull String text) {
boolean result = false; boolean result = false;