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

android_calculator-55: Error label is very annoying

Browse Source
This commit is contained in:
Sergey Solovyev 2012-02-10 23:54:03 +04:00
parent a49a256ac3
commit b74bec6cd3
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/colors.xml
View File

@ -10,6 +10,7 @@
<color name="button_operator_text_color">#ffffff99</color> <color name="button_operator_text_color">#ffffff99</color>
<color name="button_ce_text_color">#ffffffff</color> <color name="button_ce_text_color">#ffffffff</color>
<color name="default_text_color">#ffffffff</color> <color name="default_text_color">#ffffffff</color>
<color name="display_error_text_color">#44ffffff</color>
<color name="selected_angle_unit_text_color">#ffffff99</color> <color name="selected_angle_unit_text_color">#ffffff99</color>
<color name="default_background">#ff000000</color> <color name="default_background">#ff000000</color>
</resources> </resources>

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

@ -133,6 +133,9 @@ public class CalculatorDisplay extends AutoResizeTextView implements ICalculator
this.valid = valid; this.valid = valid;
if (valid) { if (valid) {
errorMessage = null; errorMessage = null;
setTextColor(getResources().getColor(R.color.default_text_color));
} else {
setTextColor(getResources().getColor(R.color.display_error_text_color));
} }
} }

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

@ -172,9 +172,10 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
final CalculatorHistoryState localHistoryState; final CalculatorHistoryState localHistoryState;
if (historyState == null) { if (historyState == null) {
this.display.setText(""); //this.display.setText("");
localHistoryState = getCurrentHistoryState(); localHistoryState = getCurrentHistoryState();
} else { } else {
this.display.setText(historyState.getDisplayState().getEditorState().getText());
localHistoryState = historyState; localHistoryState = historyState;
} }
@ -263,7 +264,12 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
@NotNull JsclOperation operation, @NotNull JsclOperation operation,
@NotNull Message e) { @NotNull Message e) {
Log.d(CalculatorModel.class.getName(), "Evaluation failed for : " + expression + ". Error message: " + e); Log.d(CalculatorModel.class.getName(), "Evaluation failed for : " + expression + ". Error message: " + e);
if ( StringUtils.isEmpty(localDisplay.getText()) ) {
// if previous display state was empty -> show error
localDisplay.setText(R.string.c_syntax_error); localDisplay.setText(R.string.c_syntax_error);
} else {
// show previous result instead of error caption (actually previous result will be greyed)
}
localDisplay.setJsclOperation(operation); localDisplay.setJsclOperation(operation);
localDisplay.setGenericResult(null); localDisplay.setGenericResult(null);
localDisplay.setValid(false); localDisplay.setValid(false);

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

@ -171,6 +171,8 @@ public abstract class AbstractHistoryActivity extends ListActivity {
public static void useHistoryItem(@NotNull final CalculatorHistoryState historyState, @NotNull AbstractHistoryActivity activity) { public static void useHistoryItem(@NotNull final CalculatorHistoryState historyState, @NotNull AbstractHistoryActivity activity) {
// before evaluating history item - clear display (in order to get Error message in display if evaluation fail)
CalculatorModel.instance.getDisplay().setText("");
CalculatorModel.instance.doTextOperation(new CalculatorModel.TextOperation() { CalculatorModel.instance.doTextOperation(new CalculatorModel.TextOperation() {
@Override @Override
public void doOperation(@NotNull EditText editor) { public void doOperation(@NotNull EditText editor) {