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

Choose theme wizard step

Browse Source
This commit is contained in:
serso
2015-02-07 17:31:56 +01:00
parent 2540ec0b37
commit 323011391c
64 changed files with 813 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
View File

@@ -22,6 +22,8 @@
package org.solovyev.android.calculator;
import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -100,7 +102,13 @@ public enum CalculatorSpecialButton {
equals("=") {
@Override
public void onClick(@Nonnull CalculatorKeyboard keyboard) {
Locator.getInstance().getCalculator().evaluate();
final CalculatorDisplayViewState displayViewState = Locator.getInstance().getDisplay().getViewState();
if (displayViewState.isValid()) {
final CharSequence text = displayViewState.getText();
if (!Strings.isEmpty(text)) {
Locator.getInstance().getEditor().setText(text.toString());
}
}
}
},
clear("clear") {