Add native touch controls with live layout editor (FYI / optional merge)

.github/workflows/android.yml

@@ -0,0 +1,47 @@
+name: Android APK
+
+on:
+  push:
+    branches: [port, touch-controls]
+  pull_request:
+    branches: [port]
+  workflow_dispatch:
+
+jobs:
+  build-android:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Install NDK and CMake
+        run: |
+          yes | sdkmanager --install "ndk;26.1.10909125" "cmake;3.22.1"
+          echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/26.1.10909125" >> $GITHUB_ENV
+
+      - name: Install python deps for the asset preprocessor
+        run: sudo apt-get update && sudo apt-get install -y python3
+
+      - name: Build debug APK
+        working-directory: android
+        run: |
+          chmod +x ./gradlew
+          ./gradlew :app:assembleDebug --no-daemon --stacktrace
+
+      - name: Upload debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: pd-android-debug
+          path: android/app/build/outputs/apk/debug/*.apk
+          if-no-files-found: error

android/.gitignore

@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/app/build
+/app/.cxx
+/captures
+.externalNativeBuild
+.cxx

android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Apr 22 14:01:37 CST 2026
+gradle.version=8.0

android/app/src/main/AndroidManifest.xml

@@ -42,6 +42,14 @@
             android:screenOrientation="landscape"
             android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
             android:theme="@style/Theme.PerfectDark.Fullscreen"/>
+
+        <!-- LayoutEditorActivity: fullscreen touch-pad layout editor -->
+        <activity
+            android:name=".LayoutEditorActivity"
+            android:exported="false"
+            android:screenOrientation="landscape"
+            android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
+            android:theme="@style/Theme.PerfectDark.Fullscreen"/>
     </application>
 
 </manifest>

android/app/src/main/java/com/perfectdark/port/LauncherActivity.java

@@ -36,7 +36,9 @@ public class LauncherActivity extends AppCompatActivity {
 
     private View missingRomView;
     private TextView infoText;
+    private Button playButton;
     private Button pickRomButton;
+    private Button editTouchButton;
 
     private final ActivityResultLauncher<String[]> romPicker =
             registerForActivityResult(new ActivityResultContracts.OpenDocument(), this::onRomPicked);
@@ -48,24 +50,54 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         missingRomView = findViewById(R.id.missingRomContainer);
         infoText = findViewById(R.id.infoText);
+        playButton = findViewById(R.id.playButton);
         pickRomButton = findViewById(R.id.pickRomButton);
+        editTouchButton = findViewById(R.id.editTouchButton);
 
         pickRomButton.setOnClickListener(v -> openRomPicker());
+        editTouchButton.setOnClickListener(v ->
+                startActivity(new Intent(this, LayoutEditorActivity.class)));
+        playButton.setOnClickListener(v -> attemptPlay());
 
         ensureDataDir();
+        updatePlayEnabled();
 
+        // If the ROM is already in place and matches a supported hash, skip
+        // the menu entirely and drop straight into the game. The user can
+        // still access the touch layout editor from the in-game EDIT pill.
         if (romExists()) {
             File target = new File(new File(getExternalFilesDir(null), "data"), ROM_FILE_NAME);
-            int hashStatus = checkRomHash(target);
-            if (hashStatus == 0) {
+            if (checkRomHash(target) == 0) {
                 startGame();
-            } else if (hashStatus == 1) {
-                showV10WarningDialog(target);
-            } else {
-                showHashMismatchDialog(target);
             }
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updatePlayEnabled();
+    }
+
+    private void updatePlayEnabled() {
+        boolean rom = romExists();
+        playButton.setEnabled(rom);
+        infoText.setText(rom ? "Perfect Dark" :
+                "ROM not found. Select your Perfect Dark NTSC (z64) ROM to proceed.\n" +
+                "It will be copied to Android/data/com.perfectdark.port/files/data as " +
+                ROM_FILE_NAME + ".");
+    }
+
+    private void attemptPlay() {
+        if (!romExists()) return;
+        File target = new File(new File(getExternalFilesDir(null), "data"), ROM_FILE_NAME);
+        int hashStatus = checkRomHash(target);
+        if (hashStatus == 0) {
+            startGame();
+        } else if (hashStatus == 1) {
+            showV10WarningDialog(target);
         } else {
-            showMissingRomUi();
+            showHashMismatchDialog(target);
         }
     }
 
@@ -83,8 +115,7 @@ private boolean romExists() {
     }
 
     private void showMissingRomUi() {
-        missingRomView.setVisibility(View.VISIBLE);
-        infoText.setText("ROM not found. Select your Perfect Dark NTSC (z64) ROM to proceed.\nIt will be copied to Android/data/com.perfectdark.port/files/data as " + ROM_FILE_NAME + ".");
+        updatePlayEnabled();
     }
 
     private void openRomPicker() {

android/app/src/main/java/com/perfectdark/port/LayoutEditorActivity.java

@@ -0,0 +1,118 @@
+package com.perfectdark.port;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+/**
+ * Fullscreen editor for the touch layout. Shows the same overlay the game
+ * uses, but in edit mode: tap + drag moves an element, toggling "resize"
+ * instead stretches its radius. "Save" writes to SharedPreferences.
+ */
+public class LayoutEditorActivity extends AppCompatActivity {
+
+    private TouchOverlayView overlay;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+            getWindow().getAttributes().layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
+        hideSystemUI();
+
+        FrameLayout root = new FrameLayout(this);
+        root.setBackgroundColor(0xFF101014);
+        setContentView(root, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+
+        overlay = new TouchOverlayView(this);
+        overlay.setInternalHudVisible(false);
+        overlay.setEditMode(true);
+        root.addView(overlay, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+
+        root.addView(buildHud(this), new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                Gravity.TOP));
+
+        Toast.makeText(this,
+                "Toca un control para arrastrarlo. Activa RESIZE para cambiar su tamaño.",
+                Toast.LENGTH_LONG).show();
+    }
+
+    private View buildHud(Context ctx) {
+        LinearLayout bar = new LinearLayout(ctx);
+        bar.setOrientation(LinearLayout.HORIZONTAL);
+        bar.setGravity(Gravity.CENTER_VERTICAL);
+        bar.setPadding(16, 16, 16, 16);
+        bar.setBackgroundColor(0x88000000);
+
+        TextView title = new TextView(ctx);
+        title.setText("Touch Layout");
+        title.setTextColor(0xFFFFFFFF);
+        title.setTextSize(18);
+        LinearLayout.LayoutParams titleLp = new LinearLayout.LayoutParams(0,
+                ViewGroup.LayoutParams.WRAP_CONTENT, 1f);
+        bar.addView(title, titleLp);
+
+        // Per-button resize is done by tapping a button inside the overlay,
+        // so no global RESIZE toggle is needed here.
+
+        Button reset = new Button(ctx);
+        reset.setText("RESET");
+        reset.setOnClickListener(v -> new AlertDialog.Builder(this)
+                .setMessage("Restablecer el layout predeterminado?")
+                .setPositiveButton("Sí", (d, w) -> {
+                    TouchLayout.resetDefaults(this);
+                    overlay.reloadLayout();
+                })
+                .setNegativeButton("No", null)
+                .show());
+        bar.addView(reset);
+
+        Button save = new Button(ctx);
+        save.setText("GUARDAR");
+        save.setOnClickListener(v -> {
+            overlay.getLayout().save(this);
+            Toast.makeText(this, "Layout guardado", Toast.LENGTH_SHORT).show();
+            finish();
+        });
+        bar.addView(save);
+
+        Button back = new Button(ctx);
+        back.setText("CANCELAR");
+        back.setOnClickListener(v -> finish());
+        bar.addView(back);
+
+        return bar;
+    }
+
+    private void hideSystemUI() {
+        View decorView = getWindow().getDecorView();
+        int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+        decorView.setSystemUiVisibility(uiOptions);
+    }
+}