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

Fix erase grouping separator issue

Browse Source
This commit is contained in:
serso 2016-03-04 23:09:26 +01:00
parent bf9555c038
commit 58e1088524
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/solovyev/android/calculator/Editor.java
View File

@ -25,13 +25,12 @@ package org.solovyev.android.calculator;
import android.app.Application; import android.app.Application;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.text.TextUtils; import android.text.TextUtils;
import com.squareup.otto.Bus; import com.squareup.otto.Bus;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import org.solovyev.android.Check; import org.solovyev.android.Check;
import org.solovyev.android.calculator.history.HistoryState; import org.solovyev.android.calculator.history.HistoryState;
import org.solovyev.android.calculator.history.RecentHistory; import org.solovyev.android.calculator.history.RecentHistory;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.text.TextProcessorEditorResult; import org.solovyev.android.calculator.text.TextProcessorEditorResult;
import org.solovyev.android.calculator.view.EditorTextProcessor; import org.solovyev.android.calculator.view.EditorTextProcessor;
@ -53,6 +52,8 @@ public class Editor {
private EditorState state = EditorState.empty(); private EditorState state = EditorState.empty();
@Inject @Inject
Bus bus; Bus bus;
@Inject
Engine engine;
@Inject @Inject
public Editor(@Nonnull Application application, @Nonnull SharedPreferences preferences, @Nonnull Engine engine) { public Editor(@Nonnull Application application, @Nonnull SharedPreferences preferences, @Nonnull Engine engine) {
@ -176,9 +177,15 @@ public class Editor {
if (selection <= 0 || text.length() <= 0 || selection > text.length()) { if (selection <= 0 || text.length() <= 0 || selection > text.length()) {
return state; return state;
} }
final String newText = text.substring(0, selection - 1) + text.substring(selection, int removeStart = selection - 1;
text.length()); if (MathType.getType(text, selection - 1, false, engine).type == MathType.grouping_separator) {
return onTextChanged(EditorState.create(newText, selection - 1)); // we shouldn't remove just separator as it will be re-added after the evaluation is done. Remove the digit
// before
removeStart -= 1;
}
final String newText = text.substring(0, removeStart) + text.substring(selection, text.length());
return onTextChanged(EditorState.create(newText, removeStart));
} }
@Nonnull @Nonnull

4
app/src/main/java/org/solovyev/android/calculator/math/MathType.java
View File

@ -312,7 +312,9 @@ public enum MathType {
} }
if (mathType == MathType.grouping_separator) { if (mathType == MathType.grouping_separator) {
if (i + 1 < text.length() && getType(text, i + 1, hexMode, result, engine).type == MathType.digit) { if (i + 1 < text.length() &&
getType(text, i + 1, hexMode, result, engine).type == MathType.digit &&
i - 1 >= 0 && getType(text, i - 1, hexMode, result, engine).type == MathType.digit) {
return result.set(mathType, s); return result.set(mathType, s);
} }
continue; continue;