Merge pull request #110 from Carifio24/spell-window-slide-out-back

Fix issue with slide-out animation on back press
Carifio24 · Nov 2, 2024 · d893efa · d893efa
2 parents 10f0325 + ddb1d90
commit d893efa
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/src/main/java/dnd/jon/spellbook/MainActivity.java b/app/src/main/java/dnd/jon/spellbook/MainActivity.java
@@ -1222,7 +1222,15 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent ev) {
-        if (!onTablet && spellWindowFragment != null && ev.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+        // We only listen for action up events for closing the spell window
+        // If we listen to both up and down, we'll get two separate events
+        // and the close animation doesn't get to finish[
+        if (
+                !onTablet &&
+                spellWindowFragment != null &&
+                ev.getKeyCode() == KeyEvent.KEYCODE_BACK &&
+                ev.getAction() == KeyEvent.ACTION_UP
+        ) {
             closeSpellWindow();
             return true;
         } else {