bug fix

Author: wolpert

android/build.gradle

@@ -31,6 +31,8 @@ android {
 dependencies {
     implementation project(':core')
     implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
+    implementation "com.journeyapps:zxing-android-embedded:4.3.0"
+    implementation "androidx.core:core:1.13.1"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"

android/src/main/AndroidManifest.xml

@@ -4,6 +4,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
 
     <application
         android:allowBackup="true"
@@ -14,7 +16,7 @@
             android:name="com.codeheadsystems.mazer.android.AndroidLauncher"
             android:exported="true"
             android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout"
-            android:screenOrientation="landscape">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

android/src/main/java/com/codeheadsystems/mazer/android/AndroidLauncher.java

@@ -1,25 +1,55 @@
 package com.codeheadsystems.mazer.android;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.WindowManager;
+
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
 import com.codeheadsystems.mazer.MazerGame;
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
 
 public class AndroidLauncher extends AndroidApplication {
 
+    private AndroidPlatformServices platformServices;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Keep screen on during gameplay
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
+        platformServices = new AndroidPlatformServices(this);
+
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useAccelerometer = false;
         config.useCompass = false;
-        config.useImmersiveMode = true; // hide system bars for fullscreen
-        config.numSamples = 2; // light anti-aliasing
-        initialize(new MazerGame(), config);
+        config.useImmersiveMode = true;
+        config.numSamples = 2;
+        initialize(new MazerGame(platformServices), config);
+    }
+
+    /**
+     * Called by AndroidPlatformServices to launch the QR scanner.
+     */
+    void launchQrScanner() {
+        IntentIntegrator integrator = new IntentIntegrator(this);
+        integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE);
+        integrator.setPrompt("Scan the host's QR code to join");
+        integrator.setOrientationLocked(true);
+        integrator.setBeepEnabled(false);
+        integrator.initiateScan();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+        if (result != null) {
+            platformServices.onScanResult(result.getContents()); // null if cancelled
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
     }
 }

android/src/main/java/com/codeheadsystems/mazer/android/AndroidPlatformServices.java

@@ -0,0 +1,39 @@
+package com.codeheadsystems.mazer.android;
+
+import com.codeheadsystems.mazer.platform.PlatformServices;
+
+/**
+ * Android implementation of PlatformServices.
+ * Uses zxing-android-embedded for QR code scanning via the camera.
+ */
+public class AndroidPlatformServices implements PlatformServices {
+
+    private final AndroidLauncher activity;
+    private QrScanCallback pendingCallback;
+
+    public AndroidPlatformServices(AndroidLauncher activity) {
+        this.activity = activity;
+    }
+
+    @Override
+    public boolean isQrScanAvailable() {
+        return true;
+    }
+
+    @Override
+    public void scanQrCode(QrScanCallback callback) {
+        this.pendingCallback = callback;
+        activity.launchQrScanner();
+    }
+
+    /**
+     * Called by AndroidLauncher when the scan result comes back.
+     */
+    void onScanResult(String result) {
+        if (pendingCallback != null) {
+            QrScanCallback cb = pendingCallback;
+            pendingCallback = null;
+            com.badlogic.gdx.Gdx.app.postRunnable(() -> cb.onResult(result));
+        }
+    }
+}

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.1.0'
+        classpath 'com.android.tools.build:gradle:8.7.3'
     }
 }
 

core/src/main/java/com/codeheadsystems/mazer/MazerGame.java

@@ -2,13 +2,29 @@
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
+import com.codeheadsystems.mazer.platform.DefaultPlatformServices;
+import com.codeheadsystems.mazer.platform.PlatformServices;
 import com.codeheadsystems.mazer.screen.MenuScreen;
 
 /**
  * Main game entry point. Manages screen transitions and Android lifecycle.
  */
 public class MazerGame extends Game {
 
+    private final PlatformServices platformServices;
+
+    public MazerGame() {
+        this(new DefaultPlatformServices());
+    }
+
+    public MazerGame(PlatformServices platformServices) {
+        this.platformServices = platformServices;
+    }
+
+    public PlatformServices getPlatformServices() {
+        return platformServices;
+    }
+
     @Override
     public void create() {
         setScreen(new MenuScreen(this));

core/src/main/java/com/codeheadsystems/mazer/input/DesktopInputProcessor.java

@@ -11,7 +11,6 @@
 public class DesktopInputProcessor extends InputAdapter {
 
     private final InputState inputState;
-    private boolean firePressed;
 
     public DesktopInputProcessor(InputState inputState) {
         this.inputState = inputState;
@@ -44,9 +43,9 @@ public void update() {
             inputState.turnAmount = 0f;
         }
 
-        // Fire: spacebar (edge-triggered)
-        boolean spaceDown = Gdx.input.isKeyPressed(Input.Keys.SPACE);
-        inputState.fire = spaceDown && !firePressed;
-        firePressed = spaceDown;
+        // Fire: spacebar (level-triggered, held = fire).
+        // Server-side cooldown (1sec) prevents rapid fire.
+        // Level-triggered ensures the fire signal isn't missed by throttled UDP sends.
+        inputState.fire = Gdx.input.isKeyPressed(Input.Keys.SPACE);
     }
 }

core/src/main/java/com/codeheadsystems/mazer/net/NetworkManager.java

@@ -4,6 +4,8 @@
 import com.codeheadsystems.mazer.net.Protocol.LobbyUpdate;
 import com.codeheadsystems.mazer.net.Protocol.PlayerInfo;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;
 
 /**
@@ -16,6 +18,7 @@ public class NetworkManager {
     private ClientConnection clientConnection;
     private boolean isHost;
     private int localPlayerId = -1;
+    private final Map<Integer, String> playerNames = new HashMap<>();
 
     // Callbacks set by screens
     private Consumer<LobbyUpdate> onLobbyUpdate;
@@ -123,11 +126,24 @@ public String getConnectString() {
     // --- Internal callbacks from HostServer/ClientConnection ---
 
     void fireLobbyUpdate(LobbyUpdate update) {
+        // Cache player names for later use (e.g., GameOverScreen)
+        if (update.players != null) {
+            for (PlayerInfo info : update.players) {
+                playerNames.put(info.id, info.name);
+            }
+        }
         if (onLobbyUpdate != null) {
             onLobbyUpdate.accept(update);
         }
     }
 
+    /**
+     * Returns the player name for the given ID, or "Player N" as fallback.
+     */
+    public String getPlayerName(int playerId) {
+        return playerNames.getOrDefault(playerId, "Player " + playerId);
+    }
+
     void fireGameStart(Protocol.StartGame msg) {
         if (onGameStart != null) {
             onGameStart.accept(msg);

core/src/main/java/com/codeheadsystems/mazer/platform/DefaultPlatformServices.java

@@ -0,0 +1,17 @@
+package com.codeheadsystems.mazer.platform;
+
+/**
+ * Default (no-op) implementation for platforms that don't support scanning.
+ */
+public class DefaultPlatformServices implements PlatformServices {
+
+    @Override
+    public boolean isQrScanAvailable() {
+        return false;
+    }
+
+    @Override
+    public void scanQrCode(QrScanCallback callback) {
+        callback.onResult(null);
+    }
+}

core/src/main/java/com/codeheadsystems/mazer/platform/PlatformServices.java

@@ -0,0 +1,25 @@
+package com.codeheadsystems.mazer.platform;
+
+/**
+ * Platform-specific services interface. Implemented per-platform (Android, Desktop).
+ * Injected into MazerGame at launch.
+ */
+public interface PlatformServices {
+
+    /**
+     * Returns true if QR code scanning is available on this platform.
+     */
+    boolean isQrScanAvailable();
+
+    /**
+     * Launches a QR code scanner. The result is delivered asynchronously
+     * via the callback. Called on the GL thread.
+     *
+     * @param callback receives the scanned text, or null if cancelled/failed
+     */
+    void scanQrCode(QrScanCallback callback);
+
+    interface QrScanCallback {
+        void onResult(String scannedText);
+    }
+}