Merge branch 'build/apk-subida' of https://git-dangilcal.duckdns.org/KevGore/Helldivers-app-movil into build/apk-subida

Reviewed-on: dangilcal/Helldivers-app-movil#2

app/build.gradle

@@ -42,12 +42,6 @@ android {
         coreLibraryDesugaringEnabled true
     }
 
-    java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(17)
-        }
-    }
-
     buildFeatures {
         buildConfig true
     }

app/src/main/java/com/helldivers/app/ActivityGame.java

@@ -82,7 +82,7 @@ private static final int[][] STRATAGEMS = {
         new int[]{UP, DOWN, RIGHT, LEFT, UP},         // Reinforce
         new int[]{DOWN, DOWN, UP, RIGHT},            // Resupply
         new int[]{UP, DOWN, RIGHT, UP},              // SOS Beacon
-        new int[]{DOWN, UP, LEFT, DOWN, UP, RIGHT, DOWN, UP}, // NUX-223 Hellbomb
+        new int[]{DOWN, UP, LEFT, DOWN, UP, RIGHT, DOWN}, // NUX-223 Hellbomb
         new int[]{DOWN, DOWN, DOWN, UP, UP}, // SSSD Delivery
         new int[]{UP, UP, LEFT, RIGHT, DOWN, DOWN}, // Seismic Probe
         new int[]{UP, UP, LEFT, UP, RIGHT},         // Eagle Rearm
@@ -190,17 +190,17 @@ private static final String[] NAMES = {
     private SoundManager soundManager;
     private Handler handler = new Handler();
 
-    private TextView tvCounter;
+    private TextView tvCounter, tvFailuresCounter;
     private ImageView ivStratagemIcon;
     private LinearLayout sequenceContainer;
-    private ImageButton btnUp, btnDown, btnLeft, btnRight;
-    private android.widget.Button btnVolver;
+    private ImageButton btnUp, btnDown, btnLeft, btnRight, btnVolver;
     private ProgressBar progressBar;
     private ImageView ivFailure;
 
     private int[] sequence;
     private int playerIndex = 0;
     private int completadas = 0;
+    private int fallos = 0;
     private boolean esperando = false;
     private boolean juegoActivo = true;
     private int currentStratagemIndex = 0;
@@ -215,6 +215,7 @@ private static final String[] NAMES = {
         catch (Exception e) { soundManager = null; }
 
         tvCounter = findViewById(R.id.tv_counter);
+        tvFailuresCounter = findViewById(R.id.tv_failures_counter);
         ivStratagemIcon = findViewById(R.id.iv_stratagem_icon);
         sequenceContainer = findViewById(R.id.sequence_container);
         btnUp = findViewById(R.id.btn_up);
@@ -227,14 +228,32 @@ private static final String[] NAMES = {
 
         btnVolver.setOnClickListener(v -> finish());
 
-        if (btnUp != null) btnUp.setOnClickListener(v -> onInputWithSound(UP));
-        if (btnDown != null) btnDown.setOnClickListener(v -> onInputWithSound(DOWN));
-        if (btnLeft != null) btnLeft.setOnClickListener(v -> onInputWithSound(LEFT));
-        if (btnRight != null) btnRight.setOnClickListener(v -> onInputWithSound(RIGHT));
+        if (btnUp != null) btnUp.setOnClickListener(v -> { animateButtonClick(v); onInputWithSound(UP); });
+        if (btnDown != null) btnDown.setOnClickListener(v -> { animateButtonClick(v); onInputWithSound(DOWN); });
+        if (btnLeft != null) btnLeft.setOnClickListener(v -> { animateButtonClick(v); onInputWithSound(LEFT); });
+        if (btnRight != null) btnRight.setOnClickListener(v -> { animateButtonClick(v); onInputWithSound(RIGHT); });
 
         nuevaRonda();
     }
 
+    private void animateButtonClick(View v) {
+        // Feedback háptico (vibración corta)
+        v.performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY);
+
+        // Animación de escala más agresiva y rápida
+        v.animate()
+                .scaleX(0.7f)
+                .scaleY(0.7f)
+                .setDuration(40)
+                .withEndAction(() -> v.animate()
+                        .scaleX(1.0f)
+                        .scaleY(1.0f)
+                        .setDuration(150)
+                        .setInterpolator(new android.view.animation.OvershootInterpolator(4.0f)) // Rebote más fuerte
+                        .start())
+                .start();
+    }
+
     private int getArrowRotation(int dir) {
         switch(dir) {
             case UP: return 0;
@@ -278,27 +297,25 @@ private static final String[] NAMES = {
         sequenceContainer.removeAllViews();
 
         for (int i = 0; i < sequence.length; i++) {
-            TextView arrowView = new TextView(this);
-            int size = (int)(56 * getResources().getDisplayMetrics().density);
-            int margin = (int)(4 * getResources().getDisplayMetrics().density);
+            ImageView arrowView = new ImageView(this);
+            int size = (int) (45 * getResources().getDisplayMetrics().density);
+            int margin = (int) (2 * getResources().getDisplayMetrics().density);
             LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(size, size);
             params.setMargins(margin, margin, margin, margin);
             arrowView.setLayoutParams(params);
-            
-            arrowView.setText(String.valueOf(ARROW_CHARS.charAt(sequence[i])));
-            arrowView.setTextSize(36);
-            arrowView.setTextColor(Color.parseColor("#FFD700"));
-            arrowView.setGravity(Gravity.CENTER);
-            arrowView.setBackgroundResource(R.drawable.arrow_white);
-            
+
+            arrowView.setImageResource(R.drawable.ic_dpad_button);
+            arrowView.setBackgroundResource(R.drawable.btn_direction);
+            arrowView.setRotation(getArrowRotation(sequence[i]));
+            arrowView.setColorFilter(Color.WHITE);
+            int padding = (int) (8 * getResources().getDisplayMetrics().density);
+            arrowView.setPadding(padding, padding, padding, padding);
+
             sequenceContainer.addView(arrowView);
         }
     }
 
     private void onInputWithSound(int dir) {
-        if (soundManager != null) {
-            try { soundManager.playTone(dir); } catch (Exception e) {}
-        }
         onInput(dir);
     }
 
@@ -307,13 +324,16 @@ private static final String[] NAMES = {
         bloqueado = true;
         
         if (dir == sequence[playerIndex]) {
+            if (soundManager != null) {
+                try { soundManager.playTone(dir); } catch (Exception e) {}
+            }
             playerIndex++;
             
             if (sequenceContainer != null && playerIndex <= sequence.length) {
                 View child = sequenceContainer.getChildAt(playerIndex - 1);
-                if (child instanceof TextView) {
-                    TextView arrowView = (TextView) child;
-                    arrowView.setTextColor(Color.parseColor("#00FF00"));
+                if (child instanceof ImageView) {
+                    ImageView arrowView = (ImageView) child;
+                    arrowView.setColorFilter(Color.parseColor("#fde902"));
                 }
             }
             
@@ -339,11 +359,26 @@ private static final String[] NAMES = {
                 try { soundManager.playFailure(); } catch (Exception e) {}
             }
             juegoActivo = false;
-            if (ivFailure != null) ivFailure.setVisibility(View.VISIBLE);
-            handler.postDelayed(this::nuevaRonda, 1500);
+            fallos++;
+            if (tvFailuresCounter != null) tvFailuresCounter.setText(String.valueOf(fallos));
+            
+            // Delay de medio segundo antes de reiniciar
+            handler.postDelayed(this::nuevaRonda, 500);
         }
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (soundManager != null) soundManager.pause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (soundManager != null) soundManager.resume();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

app/src/main/java/com/helldivers/app/ActivityQR.java

@@ -3,7 +3,7 @@ package com.helldivers.app;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import androidx.appcompat.app.AppCompatActivity;
 import com.google.zxing.BarcodeFormat;
@@ -20,7 +20,7 @@ public class ActivityQR extends AppCompatActivity {
 
     private SoundManager soundManager;
     private ImageView qrImageView;
-    private Button btnVolver;
+    private ImageButton btnVolver;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -38,7 +38,6 @@ public class ActivityQR extends AppCompatActivity {
             btnVolver.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    soundManager.playButtonClick();
                     finish();
                 }
             });
@@ -55,14 +54,14 @@ public class ActivityQR extends AppCompatActivity {
 
             int width = bitMatrix.getWidth();
             int height = bitMatrix.getHeight();
-            Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
+            Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
 
-            int black = 0xFF000000;
-            int white = 0xFFFFFFFF;
+            int qrColor = 0xFFFFFFFF; // Blanco para los módulos del QR
+            int transparent = 0x00000000; // Transparente para el fondo
 
             for (int x = 0; x < width; x++) {
                 for (int y = 0; y < height; y++) {
-                    bmp.setPixel(x, y, bitMatrix.get(x, y) ? black : white);
+                    bmp.setPixel(x, y, bitMatrix.get(x, y) ? qrColor : transparent);
                 }
             }
 

app/src/main/java/com/helldivers/app/MainActivity.java

@@ -1,6 +1,7 @@
 package com.helldivers.app;
 
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -13,7 +14,9 @@ public class MainActivity extends AppCompatActivity {
     private SoundManager soundManager;
     private Button btnQrInstagram;
     private Button btnMinijuego;
+    private Button btnMusic;
     private ImageButton btnUp, btnDown, btnLeft, btnRight;
+    private MediaPlayer mediaPlayer;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -32,25 +35,24 @@ public class MainActivity extends AppCompatActivity {
         btnDown = findViewById(R.id.btn_down);
         btnLeft = findViewById(R.id.btn_left);
         btnRight = findViewById(R.id.btn_right);
+        btnMusic = findViewById(R.id.btn_music);
 
         if (btnQrInstagram != null) {
             btnQrInstagram.setOnClickListener(v -> {
-                if (soundManager != null) {
-                    try { soundManager.playButtonClick(); } catch (Exception e) {}
-                }
                 startActivity(new Intent(this, ActivityQR.class));
             });
         }
 
         if (btnMinijuego != null) {
             btnMinijuego.setOnClickListener(v -> {
-                if (soundManager != null) {
-                    try { soundManager.playButtonClick(); } catch (Exception e) {}
-                }
                 startActivity(new Intent(this, ActivityGame.class));
             });
         }
 
+        if (btnMusic != null) {
+            btnMusic.setOnClickListener(v -> toggleMusic());
+        }
+
         View.OnClickListener arrowSoundListener = v -> {
             if (soundManager != null) {
                 try { soundManager.playButtonClick(); } catch (Exception e) {}
@@ -63,6 +65,31 @@ public class MainActivity extends AppCompatActivity {
         if (btnRight != null) btnRight.setOnClickListener(arrowSoundListener);
     }
 
+    private void toggleMusic() {
+        if (mediaPlayer == null) {
+            mediaPlayer = MediaPlayer.create(this, R.raw.ost);
+            mediaPlayer.setOnCompletionListener(mp -> {
+                stopMusic();
+            });
+        }
+
+        if (mediaPlayer.isPlaying()) {
+            stopMusic();
+        } else {
+            mediaPlayer.start();
+            btnMusic.setAlpha(0.5f); // Efecto visual de activado
+        }
+    }
+
+    private void stopMusic() {
+        if (mediaPlayer != null) {
+            mediaPlayer.stop();
+            mediaPlayer.release();
+            mediaPlayer = null;
+            btnMusic.setAlpha(1.0f); // Restaurar opacidad
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -78,6 +105,7 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        stopMusic();
         if (soundManager != null) soundManager.release();
     }
 }

app/src/main/java/com/helldivers/app/SoundManager.java

@@ -1,97 +1,68 @@
 package com.helldivers.app;
 
 import android.content.Context;
-import android.media.AudioManager;
-import android.media.ToneGenerator;
-import android.os.Handler;
-import android.os.Looper;
+import android.media.AudioAttributes;
+import android.media.SoundPool;
 
 /**
- * SoundManager - Gestor de sonidos usando ToneGenerator
- * Compatible con API 18+, mas ligero que SoundPool para dispositivos de baja potencia
+ * SoundManager - Gestor de sonidos usando SoundPool para reproducir archivos de recursos
  */
 public class SoundManager {
 
-    private static final int VOLUME = 80; // 0-100
-
-    private ToneGenerator toneGenerator;
-    private Handler handler;
+    private SoundPool soundPool;
+    private int soundPop;
+    private int soundError;
     private boolean enabled = true;
 
     public SoundManager(Context context) {
-        // ToneGenerator.STREAM_MUSIC para compatibilidad API 18+
-        toneGenerator = new ToneGenerator(AudioManager.STREAM_MUSIC, VOLUME);
-        handler = new Handler(Looper.getMainLooper());
+        AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_GAME)
+                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                .build();
+
+        soundPool = new SoundPool.Builder()
+                .setMaxStreams(5)
+                .setAudioAttributes(audioAttributes)
+                .build();
+
+        // Cargar los sonidos desde res/raw
+        soundPop = soundPool.load(context, R.raw.pop, 1);
+        soundError = soundPool.load(context, R.raw.error, 1);
     }
 
     /**
-     * Sonido de click de boton - tono corto y agudo
+     * Sonido de click de boton - reproduce pop.mp3
      */
     public void playButtonClick() {
-        if (!enabled || toneGenerator == null) return;
-        // Tono DTMF 6 - sonido tipo boton tactil
-        toneGenerator.startTone(ToneGenerator.TONE_DTMF_6, 80);
+        playPop();
     }
 
     /**
-     * Sonido de exito - secuencia ascendente
+     * Sonido de exito
      */
     public void playSuccess() {
-        if (!enabled || toneGenerator == null) return;
-        // Tono de confirmacion propositivo
-        toneGenerator.startTone(ToneGenerator.TONE_PROP_ACK, 150);
+        // Por ahora no tenemos un sonido de éxito específico en raw, 
+        // podríamos usar pop o dejarlo vacío si no se solicita.
     }
 
     /**
-     * Sonido de fallo - tono bajo grave
+     * Sonido de fallo - reproduce error.mp3
      */
     public void playFailure() {
-        if (!enabled || toneGenerator == null) return;
-        // Tono de error
-        toneGenerator.startTone(ToneGenerator.TONE_PROP_NACK, 200);
+        if (!enabled || soundPool == null) return;
+        soundPool.play(soundError, 1.0f, 1.0f, 1, 0, 1.0f);
     }
 
     /**
-     * Tono para direcciones del juego
-     * Usa diferentes tonos DTMF para cada direccion
+     * Tono para direcciones del juego - reproduce pop.mp3 para cualquier dirección
      */
     public void playTone(int direction) {
-        if (!enabled || toneGenerator == null) return;
-
-        int tone;
-        switch (direction) {
-            case 0: // UP
-                tone = ToneGenerator.TONE_DTMF_2;
-                break;
-            case 1: // DOWN
-                tone = ToneGenerator.TONE_DTMF_8;
-                break;
-            case 2: // LEFT
-                tone = ToneGenerator.TONE_DTMF_4;
-                break;
-            case 3: // RIGHT
-                tone = ToneGenerator.TONE_DTMF_6;
-                break;
-            default:
-                tone = ToneGenerator.TONE_DTMF_0;
-        }
-        toneGenerator.startTone(tone, 100);
+        playPop();
     }
 
-    /**
-     * Tono de inicio de secuencia
-     */
-    public void playSequenceStart() {
-        if (!enabled || toneGenerator == null) return;
-        toneGenerator.startTone(ToneGenerator.TONE_SUP_DIAL, 100);
-    }
-
-    /**
-     * Tono de alerta/peligro
-     */
-    public void playAlert() {
-        if (!enabled || toneGenerator == null) return;
-        toneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, 150);
+    private void playPop() {
+        if (!enabled || soundPool == null) return;
+        soundPool.play(soundPop, 1.0f, 1.0f, 1, 0, 1.0f);
     }
 
     public void setEnabled(boolean enabled) {
@@ -102,26 +73,18 @@ public class SoundManager {
         return enabled;
     }
 
-    /**
-     * Stub para compatibilidad con ciclo de vida Activity
-     * ToneGenerator no necesita pause/resume explicito
-     */
     public void pause() {
-        // No-op: ToneGenerator se maneja automaticamente
+        if (soundPool != null) soundPool.autoPause();
     }
 
-    /**
-     * Stub para compatibilidad con ciclo de vida Activity
-     * ToneGenerator no necesita pause/resume explicito
-     */
     public void resume() {
-        // No-op: ToneGenerator se maneja automaticamente
+        if (soundPool != null) soundPool.autoResume();
     }
 
     public void release() {
-        if (toneGenerator != null) {
-            toneGenerator.release();
-            toneGenerator = null;
+        if (soundPool != null) {
+            soundPool.release();
+            soundPool = null;
         }
     }
 }

app/src/main/res/drawable/arrow_white.xml

@@ -4,7 +4,7 @@
         <shape android:shape="rectangle">
             <solid android:color="#232830" />
             <corners android:radius="6dp" />
-            <stroke android:width="2dp" android:color="#FFD700" />
+            <stroke android:width="2dp" android:color="#FFFFFF" />
         </shape>
     </item>
     <item android:top="4dp" android:bottom="4dp" android:left="4dp" android:right="4dp">

app/src/main/res/drawable/bg_helldivers_gradient.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Fondo con gradiente vertical estilo Helldivers 2 -->
+<!-- Fondo con gradiente horizontal (oscuro en los laterales, claro en el centro) -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
             <gradient
-                android:angle="270"
-                android:startColor="#0D0D0D"
-                android:centerColor="#121417"
-                android:endColor="#1B1F25"
+                android:angle="0"
+                android:startColor="@color/helldivers_dark_secondary"
+                android:centerColor="@color/helldivers_dark_bg"
+                android:endColor="@color/helldivers_dark_secondary"
                 android:type="linear" />
         </shape>
     </item>

app/src/main/res/drawable/bg_qr_container.xml

@@ -4,6 +4,6 @@
     android:shape="rectangle">
     <solid android:color="#FFFFFF" />
     <corners android:radius="12dp" />
-    <stroke android:width="3dp" android:color="#FFD700" />
+    <stroke android:width="3dp" android:color="#FFFFFF" />
     <padding android:left="16dp" android:top="16dp" android:right="16dp" android:bottom="16dp" />
 </shape>

app/src/main/res/drawable/btn_direction.xml

@@ -5,7 +5,7 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#FFD700" />
+                    <solid android:color="#FFFFFF" />
                     <corners android:radius="8dp" />
                 </shape>
             </item>
@@ -42,7 +42,7 @@
                 <shape android:shape="rectangle">
                     <solid android:color="#1B1F25" />
                     <corners android:radius="8dp" />
-                    <stroke android:width="2dp" android:color="#FFD700" />
+                    <stroke android:width="2dp" android:color="#FFFFFF" />
                 </shape>
             </item>
             <item android:top="2dp" android:left="2dp" android:right="2dp" android:bottom="2dp">

app/src/main/res/drawable/btn_helldivers_primary.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Boton primario estilo Helldivers - Amarillo neon -->
+<!-- Boton primario estilo Helldivers - Blanco -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#2C3138" />
+                    <solid android:color="@color/btn_bg_pressed" />
                     <corners android:radius="8dp" />
-                    <stroke android:width="3dp" android:color="#FFE135" />
+                    <stroke android:width="3dp" android:color="#FFFFFF" />
                 </shape>
             </item>
             <item android:top="2dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="6dp" />
                 </shape>
             </item>
@@ -23,14 +23,14 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="8dp" />
-                    <stroke android:width="2dp" android:color="#FFE135" />
+                    <stroke android:width="2dp" android:color="#FFFFFF" />
                 </shape>
             </item>
             <item android:top="2dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="6dp" />
                 </shape>
             </item>
@@ -41,14 +41,14 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="8dp" />
-                    <stroke android:width="2dp" android:color="#FFD700" />
+                    <stroke android:width="2dp" android:color="#FFFFFF" />
                 </shape>
             </item>
             <item android:top="2dp" android:left="2dp" android:right="2dp" android:bottom="2dp">
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="6dp" />
                 </shape>
             </item>

app/src/main/res/drawable/btn_helldivers_secondary.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Boton secundario estilo Helldivers - Azul neon -->
+<!-- Boton secundario estilo Helldivers - Azul con bordes blancos -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#2C3138" />
+                    <solid android:color="@color/btn_bg_pressed" />
                     <corners android:radius="6dp" />
-                    <stroke android:width="2dp" android:color="#1E90FF" />
+                    <stroke android:width="2dp" android:color="#FFFFFF" />
                 </shape>
             </item>
             <item android:top="1dp" android:left="1dp" android:right="1dp" android:bottom="1dp">
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="5dp" />
                 </shape>
             </item>
@@ -23,14 +23,14 @@
         <layer-list>
             <item>
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="6dp" />
-                    <stroke android:width="1dp" android:color="#00BFFF" />
+                    <stroke android:width="1dp" android:color="#FFFFFF" />
                 </shape>
             </item>
             <item android:top="1dp" android:left="1dp" android:right="1dp" android:bottom="1dp">
                 <shape android:shape="rectangle">
-                    <solid android:color="#1B1F25" />
+                    <solid android:color="@color/btn_bg_dark" />
                     <corners android:radius="5dp" />
                 </shape>
             </item>

app/src/main/res/drawable/ic_back_arrow.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>

app/src/main/res/drawable/ic_dpad_button.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="256dp"
+    android:height="256dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+    <group
+        android:scaleX="0.1"
+        android:scaleY="-0.1"
+        android:translateY="256">
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M983 1634 c-164 -185 -299 -340 -301 -345 -2 -5 72 -9 172 -9 l176 0 0 -345 0 -345 250 0 250 0 0 345 0 345 186 0 c107 0 184 4 182 9 -6 17 -599 681 -608 681 -5 0 -143 -151 -307 -336z" />
+    </group>
+</vector>

app/src/main/res/drawable/ic_qr_code.xml

@@ -5,35 +5,35 @@
     android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="#FFD700">
+    android:tint="#FFFFFF">
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M13,13h2v2h-2z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M13,17h2v2h-2z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M17,13h2v4h-2z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M19,17h2v2h-2z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M19,13h2v2h-2z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M17,19h4v2h-4z" />
     <path
-        android:fillColor="#FFD700"
+        android:fillColor="#FFFFFF"
         android:pathData="M13,19h2v2h-2z" />
 </vector>

app/src/main/res/drawable/logo_helldivers_placeholder.xml

@@ -14,7 +14,7 @@
         <shape android:shape="rectangle">
             <solid android:color="#00000000" />
             <corners android:radius="8dp" />
-            <stroke android:width="3dp" android:color="#FFD700" />
+            <stroke android:width="3dp" android:color="#FFFFFF" />
         </shape>
     </item>
 </layer-list>

app/src/main/res/drawable/logo_helldivers_text.xml

@@ -8,7 +8,7 @@
     <item android:bottom="3dp" android:left="3dp" android:right="3dp" android:top="3dp">
         <shape android:shape="rectangle">
             <solid android:color="#00000000" />
-            <stroke android:width="2dp" android:color="#FFD700" />
+            <stroke android:width="2dp" android:color="#FFFFFF" />
         </shape>
     </item>
 </layer-list>

app/src/main/res/layout/activity_game.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_helldivers_gradient">
@@ -8,32 +9,35 @@
 
     <!-- Nombre de la estratagema -->
 
-    <TextView
-        android:id="@+id/tv_counter_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/tv_counter"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="24dp"
-        android:layout_toStartOf="@id/tv_counter"
-        android:text="ESTRATAGEMAS: "
-        android:textColor="#00FF00"
-        android:textSize="16sp" />
-
-    <TextView
-        android:id="@+id/tv_counter"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginBottom="207dp"
-        android:text="0"
-        android:textColor="#00FF00"
-        android:textSize="24sp"
-        android:textStyle="bold" />
+        android:layout_marginBottom="180dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_counter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textColor="#fde902"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tv_failures_counter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="0"
+            android:textColor="#bd0000"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/tv_stratagem_name"
@@ -45,7 +49,7 @@
         android:text=""
         android:textSize="20sp"
         android:textStyle="bold"
-        android:textColor="#FFD700" />
+        android:textColor="#FFFFFF" />
 
     <!-- Contenedor principal: Icono + Secuencia + Grid flechas -->
     <LinearLayout
@@ -53,6 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:translationY="30dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -106,9 +111,10 @@
                     android:layout_margin="4dp"
                     android:background="@drawable/btn_direction"
                     android:contentDescription="Up"
-                    android:rotation="-90"
+                    android:rotation="0"
                     android:scaleType="centerInside"
-                    android:src="@drawable/stepforward" />
+                    app:tint="#FFFFFF"
+                    android:src="@drawable/ic_dpad_button" />
 
                 <Space
                     android:layout_width="80dp"
@@ -125,9 +131,10 @@
                     android:layout_margin="4dp"
                     android:background="@drawable/btn_direction"
                     android:contentDescription="Left"
-                    android:rotation="180"
+                    android:rotation="-90"
                     android:scaleType="centerInside"
-                    android:src="@drawable/stepforward" />
+                    app:tint="#FFFFFF"
+                    android:src="@drawable/ic_dpad_button" />
 
                 <ImageButton
                     android:id="@+id/btn_down"
@@ -138,9 +145,10 @@
                     android:layout_margin="4dp"
                     android:background="@drawable/btn_direction"
                     android:contentDescription="Down"
-                    android:rotation="90"
+                    android:rotation="180"
                     android:scaleType="centerInside"
-                    android:src="@drawable/stepforward" />
+                    app:tint="#FFFFFF"
+                    android:src="@drawable/ic_dpad_button" />
 
                 <ImageButton
                     android:id="@+id/btn_right"
@@ -151,9 +159,10 @@
                     android:layout_margin="4dp"
                     android:background="@drawable/btn_direction"
                     android:contentDescription="Right"
-                    android:rotation="0"
+                    android:rotation="90"
                     android:scaleType="centerInside"
-                    android:src="@drawable/stepforward" />
+                    app:tint="#FFFFFF"
+                    android:src="@drawable/ic_dpad_button" />
 
                 <Space
                     android:layout_width="80dp"
@@ -180,19 +189,20 @@
     </LinearLayout>
 
     <!-- Volver -->
-    <Button
+    <ImageButton
         android:id="@+id/btn_volver"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="8dp"
-        android:text="VOLVER"
-        android:textSize="14sp"
-        android:textColor="#FFD700"
+        android:layout_width="53dp"
+        android:layout_height="53dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
         android:background="@drawable/btn_helldivers_secondary"
-        android:paddingHorizontal="24dp"
-        android:paddingVertical="8dp" />
+        android:contentDescription="Volver"
+        android:padding="10dp"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_back_arrow"
+        app:tint="#FFFFFF" />
 
     <ImageView
         android:id="@+id/iv_stratagem_icon"
@@ -211,7 +221,7 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_centerInParent="true"
-        android:indeterminateTint="#FFD700"
+        android:indeterminateTint="#FFFFFF"
         android:visibility="gone" />
 
     <!-- Failure Indicator (X) -->

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_helldivers_gradient">
@@ -16,7 +17,7 @@
         android:contentDescription="Super Tierra"
         android:adjustViewBounds="true"
         android:maxWidth="280dp"
-        android:tint="#FFD700" />
+        android:tint="#FFFFFF" />
 
     <!-- Botón Estratagemas - Esquina izquierda -->
     <Button
@@ -32,7 +33,7 @@
         android:paddingVertical="10dp"
         android:text="ESTRATAGEMAS"
         android:textAllCaps="true"
-        android:textColor="#FFD700"
+        android:textColor="#FFFFFF"
         android:textSize="14sp" />
 
     <!-- Botón QR Instagram - Esquina derecha -->
@@ -49,7 +50,7 @@
         android:paddingVertical="10dp"
         android:text="@string/btn_qr_instagram"
         android:textAllCaps="true"
-        android:textColor="#FFD700"
+        android:textColor="#FFFFFF"
         android:textSize="14sp" />
 
     <!-- Grid de Flechas - Centro -->
@@ -59,6 +60,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_marginTop="40dp"
+        android:translationY="30dp"
         android:rowCount="3"
         android:columnCount="3"
         android:padding="8dp">
@@ -73,9 +75,10 @@
             android:layout_column="1"
             android:background="@drawable/btn_direction"
             android:contentDescription="Up"
-            android:rotation="-90"
+            android:rotation="0"
             android:scaleType="centerInside"
-            android:src="@drawable/stepforward" />
+            app:tint="#FFFFFF"
+            android:src="@drawable/ic_dpad_button" />
 
         <Space android:layout_width="100dp" android:layout_height="100dp" android:layout_row="0" android:layout_column="2" />
 
@@ -87,9 +90,10 @@
             android:layout_column="0"
             android:background="@drawable/btn_direction"
             android:contentDescription="Left"
-            android:rotation="180"
+            android:rotation="-90"
             android:scaleType="centerInside"
-            android:src="@drawable/stepforward" />
+            app:tint="#FFFFFF"
+            android:src="@drawable/ic_dpad_button" />
 
         <ImageButton
             android:id="@+id/btn_down"
@@ -99,9 +103,10 @@
             android:layout_column="1"
             android:background="@drawable/btn_direction"
             android:contentDescription="Down"
-            android:rotation="90"
+            android:rotation="180"
             android:scaleType="centerInside"
-            android:src="@drawable/stepforward" />
+            app:tint="#FFFFFF"
+            android:src="@drawable/ic_dpad_button" />
 
         <ImageButton
             android:id="@+id/btn_right"
@@ -111,9 +116,10 @@
             android:layout_column="2"
             android:background="@drawable/btn_direction"
             android:contentDescription="Right"
-            android:rotation="0"
+            android:rotation="90"
             android:scaleType="centerInside"
-            android:src="@drawable/stepforward" />
+            app:tint="#FFFFFF"
+            android:src="@drawable/ic_dpad_button" />
 
         <Space android:layout_width="100dp" android:layout_height="20dp" android:layout_row="2" android:layout_column="0" />
         <Space android:layout_width="100dp" android:layout_height="20dp" android:layout_row="2" android:layout_column="1" />
@@ -123,4 +129,19 @@
 
     <!-- Footer - Versión abajo centro -->
 
+    <!-- Botón Música - Derecha, nivelado con el botón de la derecha -->
+    <Button
+        android:id="@+id/btn_music"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignBottom="@id/buttons_grid"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="20dp"
+        android:background="@drawable/btn_helldivers_primary"
+        android:text="♪"
+        android:textColor="#FFFFFF"
+        android:textSize="24sp"
+        android:textStyle="bold" />
+
 </RelativeLayout>

app/src/main/res/layout/activity_qr.xml

@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_helldivers_gradient">
 
+    <ImageButton
+        android:id="@+id/btn_volver"
+        android:layout_width="53dp"
+        android:layout_height="53dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/btn_helldivers_secondary"
+        android:contentDescription="Volver"
+        android:padding="10dp"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_back_arrow"
+        app:tint="#FFFFFF" />
+
     <ImageView
         android:id="@+id/qr_image"
-        android:layout_width="440dp"
-        android:layout_height="379dp"
-        android:layout_above="@id/btn_volver"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="-48dp"
-        android:background="#FFFFFF"
+        android:layout_width="404dp"
+        android:layout_height="344dp"
+        android:layout_centerInParent="true"
         android:contentDescription="@string/qr_description"
-        android:padding="8dp"
         android:scaleType="fitCenter" />
 
-    <Button
-        android:id="@+id/btn_volver"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/btn_helldivers_secondary"
-        android:paddingHorizontal="36dp"
-        android:paddingVertical="12dp"
-        android:text="VOLVER"
-        android:textColor="#FFD700"
-        android:textSize="18sp" />
-
 </RelativeLayout>

app/src/main/res/values/colors.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Colores Helldivers 2 Theme -->
+    <!-- Colores Helldivers 2 Theme Modificado -->
 
     <!-- Colores principales -->
     <color name="helldivers_black">#000000</color>
-    <color name="helldivers_dark_bg">#0D0D0D</color>
-    <color name="helldivers_dark_secondary">#1B1F25</color>
-    <color name="helldivers_dark_tertiary">#121417</color>
+    <color name="helldivers_dark_bg">#41639C</color>
+    <color name="helldivers_dark_secondary">#2B4269</color>
+    <color name="helldivers_dark_tertiary">#2B4269</color>
 
     <!-- Colores neon/accent -->
-    <color name="helldivers_yellow">#FFD700</color>
-    <color name="helldivers_yellow_bright">#FFE135</color>
+    <color name="helldivers_yellow">#FFFFFF</color>
+    <color name="helldivers_yellow_bright">#FFFFFF</color>
     <color name="helldivers_blue">#00BFFF</color>
     <color name="helldivers_blue_bright">#1E90FF</color>
     <color name="helldivers_red">#FF3B30</color>
@@ -23,9 +23,9 @@
     <color name="helldivers_gray_light">#C7C7CC</color>
 
     <!-- Colores botones -->
-    <color name="btn_bg_dark">#1B1F25</color>
-    <color name="btn_bg_pressed">#2C3138</color>
-    <color name="btn_border_yellow">#FFD700</color>
+    <color name="btn_bg_dark">#2B4269</color>
+    <color name="btn_bg_pressed">#1E2E4A</color>
+    <color name="btn_border_yellow">#FFFFFF</color>
     <color name="btn_border_blue">#00BFFF</color>
 
     <!-- Colores genericos de sistema -->

app/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="logo_description">Logo Helldivers 2</string>
 
     <!-- Botones Main -->
-    <string name="btn_qr_instagram">Seguir en\nInstagram</string>
+    <string name="btn_qr_instagram">INSTAGRAM</string>
     <string name="btn_minijuego">Estratagemas\nTraining</string>
     <string name="btn_volver">VOLVER</string>
 

app/src/main/res/values/styles.xml

@@ -5,7 +5,7 @@
         <!-- Colores principales -->
         <item name="colorPrimary">@color/helldivers_dark_secondary</item>
         <item name="colorPrimaryDark">@color/helldivers_black</item>
-        <item name="colorAccent">@color/helldivers_yellow</item>
+        <item name="colorAccent">@color/helldivers_white</item>
 
         <!-- Fondo -->
         <item name="android:windowBackground">@color/helldivers_black</item>
@@ -23,19 +23,19 @@
 
         <!-- Botones -->
         <item name="colorButtonNormal">@color/btn_bg_dark</item>
-        <item name="colorControlHighlight">@color/helldivers_yellow</item>
+        <item name="colorControlHighlight">@color/helldivers_white</item>
     </style>
 
     <!-- Estilo base para botones Helldivers -->
     <style name="HelldiversButton" parent="Widget.AppCompat.Button">
         <item name="android:minHeight">48dp</item>
-        <item name="android:textColor">@color/helldivers_yellow</item>
+        <item name="android:textColor">@color/helldivers_white</item>
     </style>
 
     <!-- Estilo para botones primarios Helldivers -->
     <style name="HelldiversButton.Primary" parent="HelldiversButton">
         <item name="android:background">@drawable/btn_helldivers_primary</item>
-        <item name="android:textColor">@color/helldivers_yellow</item>
+        <item name="android:textColor">@color/helldivers_white</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
@@ -47,7 +47,7 @@
     <!-- Estilo para botones secundarios -->
     <style name="HelldiversButton.Secondary" parent="HelldiversButton">
         <item name="android:background">@drawable/btn_helldivers_secondary</item>
-        <item name="android:textColor">@color/helldivers_yellow</item>
+        <item name="android:textColor">@color/helldivers_white</item>
         <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
@@ -62,7 +62,7 @@
 
     <!-- Estilo para texto de titulo -->
     <style name="HelldiversText.Title" parent="HelldiversText">
-        <item name="android:textColor">@color/helldivers_yellow</item>
+        <item name="android:textColor">@color/helldivers_white</item>
         <item name="android:textSize">20sp</item>
         <item name="android:fontFamily">sans-serif-condensed</item>
         <item name="android:textStyle">bold</item>