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

Long minus check was forgotten

Browse Source
This commit is contained in:
serso 2015-02-23 10:24:12 +01:00
parent 25adac1dcd
commit 75a8231afc
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
android-app/src/main/res/layout/function_edit_param.xml
View File

@ -23,30 +23,34 @@
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
a:layout_height="wrap_content" a:layout_width="match_parent"
a:orientation="horizontal"> a:layout_height="wrap_content"
a:orientation="horizontal">
<Button <Button
a:id="@+id/function_remove_param_button" a:id="@+id/function_remove_param_button"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:text="-" /> a:text="−"
tools:ignore="HardcodedText"/>
<Button <Button
a:id="@+id/function_up_param_button" a:id="@+id/function_up_param_button"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:text="↑" /> a:text="↑"
tools:ignore="HardcodedText"/>
<Button <Button
a:id="@+id/function_down_param_button" a:id="@+id/function_down_param_button"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:text="↓" /> a:text="↓"
tools:ignore="HardcodedText"/>
<org.solovyev.android.calculator.function.FunctionParamEditText <org.solovyev.android.calculator.function.FunctionParamEditText
a:id="@+id/function_param_edit_text" a:id="@+id/function_param_edit_text"
@ -54,6 +58,6 @@
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="3" a:layout_weight="3"
a:inputType="text" /> a:inputType="text"/>
</LinearLayout> </LinearLayout>

3
core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
View File

@ -79,7 +79,8 @@ public abstract class AbstractNumberBuilder {
private boolean isSignAfterE(@Nonnull MathType.Result mathTypeResult) { private boolean isSignAfterE(@Nonnull MathType.Result mathTypeResult) {
if (!isHexMode()) { if (!isHexMode()) {
if ("-".equals(mathTypeResult.getMatch()) || "+".equals(mathTypeResult.getMatch())) { final String match = mathTypeResult.getMatch();
if ("−".equals(match) || "-".equals(match) || "+".equals(match)) {
final StringBuilder localNb = numberBuilder; final StringBuilder localNb = numberBuilder;
if (localNb != null && localNb.length() > 0) { if (localNb != null && localNb.length() > 0) {
if (localNb.charAt(localNb.length() - 1) == MathType.POWER_10) { if (localNb.charAt(localNb.length() - 1) == MathType.POWER_10) {