diff --git a/app/build.gradle b/app/build.gradle index 9fbc48e..545554b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "com.dozingcatsoftware.bouncy" - minSdkVersion 4 + minSdkVersion 9 targetSdkVersion 34 versionCode 38 versionName "1.13.0" diff --git a/app/src/main/java/com/dozingcatsoftware/bouncy/BouncyActivity.java b/app/src/main/java/com/dozingcatsoftware/bouncy/BouncyActivity.java index c572692..846114f 100644 --- a/app/src/main/java/com/dozingcatsoftware/bouncy/BouncyActivity.java +++ b/app/src/main/java/com/dozingcatsoftware/bouncy/BouncyActivity.java @@ -1,5 +1,9 @@ package com.dozingcatsoftware.bouncy; +import static android.view.KeyEvent.KEYCODE_BUTTON_A; +import static com.dozingcatsoftware.bouncy.FieldViewManager.LEFT_FLIPPER_KEYS; +import static com.dozingcatsoftware.bouncy.FieldViewManager.RIGHT_FLIPPER_KEYS; + import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -318,16 +322,20 @@ else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { } // When showing the main menu, switch tables with the flipper buttons. if (!field.getGameState().isGameInProgress() && buttonPanel.getVisibility() == View.VISIBLE) { - if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) { + if (LEFT_FLIPPER_KEYS.contains(keyCode)) { doPreviousTable(null); startGameButton.requestFocus(); return true; } - if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) { + if (RIGHT_FLIPPER_KEYS.contains(keyCode)) { doNextTable(null); startGameButton.requestFocus(); return true; } + if (keyCode == KEYCODE_BUTTON_A) { + doStartGame(null); + return true; + } } return super.onKeyDown(keyCode, event); } diff --git a/app/src/main/java/com/dozingcatsoftware/bouncy/FieldViewManager.java b/app/src/main/java/com/dozingcatsoftware/bouncy/FieldViewManager.java index fe93e6f..ec9f9ed 100644 --- a/app/src/main/java/com/dozingcatsoftware/bouncy/FieldViewManager.java +++ b/app/src/main/java/com/dozingcatsoftware/bouncy/FieldViewManager.java @@ -330,9 +330,9 @@ private void updateFlippersFromTouchEvent(boolean left, boolean right) { } static List LEFT_FLIPPER_KEYS = Arrays.asList( - KeyEvent.KEYCODE_Z, KeyEvent.KEYCODE_DPAD_LEFT); + KeyEvent.KEYCODE_Z, KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_BUTTON_L1); static List RIGHT_FLIPPER_KEYS = Arrays.asList( - KeyEvent.KEYCODE_SLASH, KeyEvent.KEYCODE_DPAD_RIGHT); + KeyEvent.KEYCODE_SLASH, KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_BUTTON_R1); static List ALL_FLIPPER_KEYS = Arrays.asList( KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_DPAD_CENTER);