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

Fix for LongClickEraser

Browse Source
This commit is contained in:
serso 2015-02-16 20:51:56 +01:00
parent a68d93b75a
commit 08add4f17e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android-app/src/main/java/org/solovyev/android/calculator/view/LongClickEraser.java
View File

@ -1,15 +1,19 @@
package org.solovyev.android.calculator.view; package org.solovyev.android.calculator.view;
import android.text.TextUtils;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import org.solovyev.android.calculator.Calculator; import org.solovyev.android.calculator.Calculator;
import org.solovyev.android.calculator.CalculatorEditor; import org.solovyev.android.calculator.CalculatorEditor;
import org.solovyev.android.calculator.CalculatorEditorViewState;
import org.solovyev.android.calculator.Locator; import org.solovyev.android.calculator.Locator;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import static android.text.TextUtils.isEmpty;
public final class LongClickEraser implements View.OnTouchListener { public final class LongClickEraser implements View.OnTouchListener {
@Nonnull @Nonnull
@ -51,7 +55,7 @@ public final class LongClickEraser implements View.OnTouchListener {
gestureDetector.onTouchEvent(event); gestureDetector.onTouchEvent(event);
break; break;
} }
return true; return false;
} }
private class Eraser implements Runnable { private class Eraser implements Runnable {
@ -62,7 +66,11 @@ public final class LongClickEraser implements View.OnTouchListener {
@Override @Override
public void run() { public void run() {
editor.erase(); final CalculatorEditorViewState state = editor.erase();
if (isEmpty(state.getText())) {
stop();
return;
}
delay = Math.max(50, 2 * delay / 3); delay = Math.max(50, 2 * delay / 3);
view.postDelayed(this, delay); view.postDelayed(this, delay);
} }