Improve backspace behavior

wviana · Sep 19, 2020 · cdf1179 · cdf1179
1 parent 853e00f
commit cdf1179
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -43,7 +43,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dev.pesic.rpncalc"
         minSdkVersion 16
         targetSdkVersion 30

diff --git a/lib/main.dart b/lib/main.dart
@@ -109,6 +109,13 @@ class _AppHomeState extends State<AppHome> {
     });
   }
 
+  void _handleDrop() {
+    _setStateWithUndo(() {
+      HapticFeedback.lightImpact();
+      _stack.drop();
+    });
+  }
+
   void _applyBinaryOperation(BinaryOperator op) {
     _setStateWithUndo(() {
       HapticFeedback.lightImpact();
@@ -298,7 +305,7 @@ class _AppHomeState extends State<AppHome> {
                               HapticFeedback.selectionClick();
                               _setStateWithUndo(_stack.backspaceCurrent);
                             },
-                            onLongPress: _handleClear,
+                            onLongPress: _handleDrop,
                             child: const Icon(
                               Icons.backspace,
                               semanticLabel: 'Backspace',

diff --git a/lib/rpn_stack.dart b/lib/rpn_stack.dart
@@ -51,6 +51,13 @@ class RpnStack {
     return null;
   }
 
+  void drop() {
+    _pop();
+    if (stack.isEmpty) {
+      push(EditableItem.blank());
+    }
+  }
+
   void advance() {
     final current = stack.first;
     _realizeStack();