Fix tag fetch in pipeline

.gitea/workflows/android.yml

@@ -8,34 +8,103 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout code
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Setup Android SDK
-        run: |
+        uses: android-actions/setup-android@v2
-          mkdir -p $ANDROID_HOME/cmdline-tools
-          cd $ANDROID_HOME/cmdline-tools
-          wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O cmdline-tools.zip
-          unzip -q cmdline-tools.zip
-          mv cmdline-tools latest
-          echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null 2>&1
-          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-34" "build-tools;34.0.0"
 
-      - name: Build APK
+      - name: Setup Keystore
+        run: |
+          echo "${{ secrets.ANDROIDKEYSTOREBASE64 }}" | base64 -d > app/helldivers.keystore
+        env:
+          ANDROIDKEYSTOREPATH: app/helldivers.keystore
+          ANDROIDKEYSTOREPASS: ${{ secrets.ANDROIDKEYSTOREPASS }}
+          ANDROIDKEYALIAS: ${{ secrets.ANDROIDKEYALIAS }}
+          ANDROIDKEYPASS: ${{ secrets.ANDROIDKEYPASS }}
+
+      - name: Build with Gradle
         run: |
           chmod +x ./gradlew
-          ./gradlew assembleRelease --no-daemon -Dorg.gradle.java.home=$JAVA_HOME
+          ./gradlew assembleRelease --no-daemon
 
       - name: Upload APK
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: apk
-          path: app/build/outputs/apk/release/*.apk
+          path: app/build/outputs/apk/release/*.apk
+
+      - name: Create Release
+        run: |
+          # Fetch the specific tag from remote
+          git fetch origin tag v0.2.0 --force
+          
+          # Get tag name from git
+          TAG_NAME=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          
+          if [ -z "$TAG_NAME" ]; then
+            TAG_NAME="${GITHUB_REF#refs/tags/}"
+          fi
+          
+          # Quitar la v del tag si existe
+          TAG_NAME_CLEAN="${TAG_NAME#v}"
+          
+          APK_FILE=$(ls app/build/outputs/apk/release/*.apk | head -1)
+          
+          # Rename APK with version
+          NEW_NAME="Helldivers-app-${TAG_NAME}.apk"
+          cp "$APK_FILE" "$NEW_NAME"
+          
+          echo "=== Creating release for tag: $TAG_NAME ==="
+          echo "APK file: $APK_FILE"
+          
+          # Use the token from secrets
+          if [ -z "${{ secrets.GITEATOKEN }}" ]; then
+            echo "ERROR: No GITEATOKEN found"
+            exit 1
+          fi
+          
+          # Create release using Gitea API - Create from existing tag
+          echo "Creating release..."
+          RELEASE_RESP=$(curl -s -X POST "https://git-dangilcal.duckdns.org/api/v1/repos/dangilcal/Helldivers-app-movil/releases" \
+            -H "accept: application/json" \
+            -H "Content-Type: application/json" \
+            -H "Authorization: token ${{ secrets.GITEATOKEN }}" \
+            -d "{
+              \"tag_name\": \"${TAG_NAME}\",
+              \"name\": \"Release ${TAG_NAME_CLEAN}\",
+              \"body\": \"Built from tag ${TAG_NAME}\",
+              \"draft\": false,
+              \"prerelease\": false
+            }")
+          
+          echo "Release response: $RELEASE_RESP"
+          
+          # Extract release ID
+          RELEASE_ID=$(echo "$RELEASE_RESP" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+          
+          if [ -z "$RELEASE_ID" ]; then
+            echo "ERROR: Could not get release ID"
+            echo "$RELEASE_RESP"
+            exit 1
+          fi
+          
+          echo "Release ID: $RELEASE_ID"
+          
+          # Upload the APK as an asset
+          echo "Uploading APK..."
+          UPLOAD_RESP=$(curl -s -X POST "https://git-dangilcal.duckdns.org/api/v1/repos/dangilcal/Helldivers-app-movil/releases/${RELEASE_ID}/assets" \
+            -H "accept: application/json" \
+            -H "Content-Type: multipart/form-data" \
+            -H "Authorization: token ${{ secrets.GITEATOKEN }}" \
+            -F "attachment=@${NEW_NAME}")
+          
+          echo "Upload response: $UPLOAD_RESP"
+          echo "=== Release created successfully ==="

README.md

@@ -34,20 +34,6 @@ El APK se generará en: `app/build/outputs/apk/release/app-release.apk`
 adb install -r app/build/outputs/apk/release/app-release.apk
 ```
 
-## Pipeline CI/CD
-
-El proyecto incluye pipeline automático para Gitea que compila releases al crear tags:
-
-```bash
-git tag v1.0.0
-git push origin v1.0.0
-```
-
-- **Trigger**: Tags con formato `v*`
-- **JDK**: 21
-- **Android SDK**: API 34, build-tools 34.0.0
-- **Salida**: APK en artifacts
-
 ## Estructura del Proyecto
 
 ```
@@ -69,19 +55,19 @@ Helldivers/
 ├── settings.gradle
 ├── gradle.properties
 ├── gradlew / gradlew.bat
-└── .gitea/workflows/android.yml        # Pipeline CI/CD
+└── .gitea/workflows/android.yml
 ```
 
 ## Configuración Técnica
 
-|属性|Valor|
+| Atributo | Valor |
 |---|---|
-|minSdk|18 (Android 4.3)|
+| minSdk | 18 (Android 4.3) |
-|targetSdk|21 (Android 5.0)|
+| targetSdk | 21 (Android 5.0) |
-|compileSdk|34|
+| compileSdk | 34 |
-|Java|21 con desugaring|
+| Java | 21 con desugaring |
-|AGP|8.3.0|
+| AGP | 8.3.0 |
-|Resolución|720x1280 xhdpi (landscape)|
+| Resolución | 720x1280 xhdpi (landscape) |
 
 ## Contribución
 

app/build.gradle

@@ -9,14 +9,24 @@ android {
     defaultConfig {
         applicationId "com.helldivers.app"
         minSdk 18
-        targetSdk 21
+        targetSdk 34
         versionCode 1
         versionName "1.0.0-LIBERTY"
         multiDexEnabled true
     }
 
+    signingConfigs {
+        release {
+            storeFile file(System.getenv("ANDROIDKEYSTOREPATH") ?: "helldivers.keystore")
+            storePassword System.getenv("ANDROIDKEYSTOREPASS") ?: "HelldiversPorLaSuPerTierraYKevinTambien"
+            keyAlias System.getenv("ANDROIDKEYALIAS") ?: "helldivers"
+            keyPassword System.getenv("ANDROIDKEYPASS") ?: "HelldiversPorLaSuPerTierraYKevinTambien"
+        }
+    }
+
     buildTypes {
         release {
+            signingConfig signingConfigs.release
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             multiDexEnabled true
@@ -27,14 +37,14 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_17
         coreLibraryDesugaringEnabled true
     }
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(17)
         }
     }
 

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

@@ -3,103 +3,208 @@ package com.helldivers.app;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.widget.Button;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class ActivityGame extends AppCompatActivity {
 
-    private static final String[] ARROWS = new String[]{"\u2191", "\u2193", "\u2190", "\u2192"};
     private static final int UP = 0, DOWN = 1, LEFT = 2, RIGHT = 3;
+    
+private static final int[][] STRATAGEMS = {
+        // SUPPORT WEAPONS (12 items) - from wiki
+        new int[]{DOWN, LEFT, DOWN, UP, RIGHT},        // MG-43 Machine Gun
+        new int[]{DOWN, DOWN, LEFT, UP, RIGHT},       // EAT-17 Expendable Anti-Tank
+        new int[]{DOWN, LEFT, DOWN, UP, UP, LEFT},    // M-105 Stalwart
+        new int[]{DOWN, LEFT, DOWN, UP, LEFT},        // LAS-98 Laser Cannon
+        new int[]{DOWN, LEFT, RIGHT, UP, DOWN},       // APW-1 Anti-Materiel Rifle
+        new int[]{DOWN, LEFT, RIGHT, RIGHT, LEFT},    // GR-8 Recoilless Rifle
+        new int[]{DOWN, LEFT, UP, LEFT, DOWN},        // GL-21 Grenade Launcher
+        new int[]{DOWN, LEFT, UP, DOWN, UP},          // FLAM-40 Flamethrower
+        new int[]{DOWN, LEFT, DOWN, UP, UP, RIGHT},   // AC-8 Autocannon
+        new int[]{DOWN, RIGHT, DOWN, UP, LEFT, LEFT}, // ARC-3 Arc Thrower
+        new int[]{DOWN, RIGHT, DOWN, UP, LEFT, RIGHT},// RS-422 Railgun
+        new int[]{DOWN, DOWN, UP, DOWN, DOWN}, // FAF-14 Spear
 
-    private static final int[][] STRATAGEMS = new int[][]{
+        // ORBITAL (11 items)
-        new int[]{UP, DOWN, RIGHT, LEFT, UP},
+        new int[]{RIGHT, RIGHT, UP},                  // Orbital Precision Strike
-        new int[]{DOWN, DOWN, UP, RIGHT},
+        new int[]{RIGHT, DOWN, LEFT, UP, UP},         // Orbital Gatling Barrage
-        new int[]{UP, DOWN, RIGHT, UP},
+        new int[]{RIGHT, RIGHT, RIGHT},               // Orbital Airburst Strike
-        new int[]{RIGHT, UP, UP, DOWN},
+        new int[]{RIGHT, RIGHT, DOWN, LEFT, RIGHT, DOWN}, // Orbital 120MM HE Barrage
-        new int[]{DOWN, UP, LEFT, DOWN, UP, RIGHT, DOWN, UP},
+        new int[]{RIGHT, RIGHT, DOWN, UP},             // Orbital Smoke Strike
-        new int[]{DOWN, UP, DOWN, UP},
+        new int[]{RIGHT, RIGHT, LEFT, DOWN},           // Orbital EMS Strike
-        new int[]{DOWN, LEFT, DOWN, UP, RIGHT},
+        new int[]{RIGHT, DOWN, UP, UP, LEFT, DOWN, DOWN}, // Orbital 380MM HE Barrage
-        new int[]{DOWN, LEFT, RIGHT, UP, DOWN},
+        new int[]{RIGHT, DOWN, RIGHT, DOWN, RIGHT, DOWN}, // Orbital Walking Barrage
-        new int[]{DOWN, LEFT, DOWN, UP, UP, LEFT},
+        new int[]{RIGHT, DOWN, UP, RIGHT, DOWN},      // Orbital Laser
-        new int[]{DOWN, DOWN, LEFT, UP, RIGHT},
+        new int[]{RIGHT, UP, DOWN, DOWN, RIGHT},      // Orbital Railcannon Strike
-        new int[]{DOWN, LEFT, RIGHT, RIGHT, LEFT},
+        new int[]{RIGHT, RIGHT, DOWN, RIGHT},          // Orbital Gas Strike
-        new int[]{DOWN, LEFT, UP, DOWN, UP},
+
-        new int[]{DOWN, LEFT, DOWN, UP, UP, RIGHT},
+        // EAGLE (7 items)
-        new int[]{DOWN, RIGHT, DOWN, UP, LEFT, RIGHT},
+        new int[]{UP, RIGHT, RIGHT},                  // Eagle Strafing Run
-        new int[]{DOWN, DOWN, UP, DOWN, DOWN},
+        new int[]{UP, RIGHT, DOWN, RIGHT},            // Eagle Airstrike
-        new int[]{RIGHT, DOWN, LEFT, UP, UP},
+        new int[]{UP, RIGHT, DOWN, DOWN, RIGHT},      // Eagle Cluster Bomb
-        new int[]{RIGHT, RIGHT, RIGHT},
+        new int[]{UP, RIGHT, UP, DOWN},               // Eagle Smoke Strike
-        new int[]{RIGHT, RIGHT, DOWN, LEFT, RIGHT, DOWN},
+        new int[]{UP, RIGHT, DOWN, UP},               // Eagle Napalm Airstrike
-        new int[]{RIGHT, DOWN, UP, UP, LEFT, DOWN, DOWN},
+        new int[]{UP, RIGHT, UP, LEFT},               // Eagle 110MM Rocket Pods
-        new int[]{RIGHT, DOWN, RIGHT, DOWN, RIGHT, DOWN},
+        new int[]{UP, RIGHT, DOWN, DOWN, DOWN},       // Eagle 500kg Bomb
-        new int[]{RIGHT, DOWN, UP, RIGHT, DOWN},
+
-        new int[]{RIGHT, UP, DOWN, DOWN, RIGHT},
+        // BACKPACKS (4 items)
-        new int[]{UP, RIGHT, RIGHT},
+        new int[]{DOWN, LEFT, DOWN, UP, UP, DOWN},    // B-1 Supply Pack
-        new int[]{UP, RIGHT, DOWN, RIGHT},
+        new int[]{DOWN, UP, UP, DOWN, UP},            // LIFT-850 Jump Pack
-        new int[]{UP, RIGHT, DOWN, DOWN, RIGHT},
+        new int[]{DOWN, LEFT, DOWN, DOWN, UP, LEFT},  // SH-20 Ballistic Shield Backpack
-        new int[]{UP, RIGHT, DOWN, UP},
+        new int[]{DOWN, UP, LEFT, RIGHT, LEFT, RIGHT},// SH-32 Shield Generator Pack
-        new int[]{DOWN, UP, UP, DOWN, UP},
+
-        new int[]{UP, RIGHT, DOWN, UP},
+        // MINES (2 items)
-        new int[]{UP, RIGHT, UP, LEFT},
+        new int[]{DOWN, LEFT, UP, RIGHT},       // MD-6 Anti-Personnel Minefield
-        new int[]{UP, RIGHT, DOWN, DOWN, DOWN},
+        new int[]{DOWN, LEFT, LEFT, DOWN},           // MD-I4 Incendiary Mines
-        new int[]{UP, UP, LEFT, UP, RIGHT},
+
-        new int[]{RIGHT, RIGHT, UP},
+        // EMPLACEMENTS (3 items)
-        new int[]{RIGHT, RIGHT, DOWN, RIGHT},
+        new int[]{DOWN, DOWN, LEFT, RIGHT,LEFT, RIGHT},                // FX-12 Shield Generator Relay
-        new int[]{RIGHT, RIGHT, LEFT, DOWN},
+        new int[]{DOWN, UP, LEFT, RIGHT, RIGHT, LEFT}, // EMG-101 HMG Emplacement
-        new int[]{RIGHT, RIGHT, DOWN, UP},
+        new int[]{DOWN, UP, RIGHT, UP, LEFT, RIGHT}, // AARC-3 Tesla Tower
-        new int[]{DOWN, UP, LEFT, RIGHT, RIGHT, LEFT},
+
-        new int[]{DOWN, DOWN, LEFT, RIGHT, LEFT, RIGHT},
+        // SENTRIES (6 items)
-        new int[]{DOWN, UP, RIGHT, UP, LEFT, RIGHT},
+        new int[]{DOWN, UP, RIGHT, LEFT},            // AG-16 Gatling Sentry
-        new int[]{DOWN, LEFT, UP, RIGHT},
+        new int[]{DOWN, UP, RIGHT, RIGHT, UP},                  // AMG-43 Machine Gun Sentry
-        new int[]{DOWN, LEFT, DOWN, UP, UP, DOWN},
+        new int[]{DOWN, UP, RIGHT, UP, LEFT, UP},        // AAC-8 Autocannon Sentry
-        new int[]{DOWN, LEFT, UP, LEFT, DOWN},
+        new int[]{DOWN, UP, RIGHT, DOWN, UP, UP},           // AMLS-4X Rocket Sentry
-        new int[]{DOWN, LEFT, DOWN, UP, LEFT},
+        new int[]{DOWN, UP, RIGHT, RIGHT, DOWN},   // AM-12 Mortar Sentry
-        new int[]{DOWN, LEFT, LEFT, DOWN},
+        new int[]{DOWN, UP, RIGHT, DOWN, RIGHT},      // AM-23 EMS Mortar Sentry
-        new int[]{UP, DOWN, LEFT, UP, RIGHT, RIGHT},
+
-        new int[]{DOWN, LEFT, DOWN, DOWN, UP, LEFT},
+        // MISSION (12 items)
-        new int[]{DOWN, RIGHT, DOWN, UP, LEFT, LEFT},
+        new int[]{UP, DOWN, RIGHT, LEFT, UP},         // Reinforce
-        new int[]{DOWN, UP, LEFT, RIGHT, LEFT, RIGHT},
+        new int[]{DOWN, DOWN, UP, RIGHT},            // Resupply
-        new int[]{DOWN, UP, RIGHT, RIGHT, UP},
+        new int[]{UP, DOWN, RIGHT, UP},              // SOS Beacon
-        new int[]{DOWN, UP, RIGHT, LEFT},
+        new int[]{DOWN, UP, LEFT, DOWN, UP, RIGHT, DOWN, UP}, // NUX-223 Hellbomb
-        new int[]{DOWN, UP, RIGHT, RIGHT, DOWN},
+        new int[]{DOWN, DOWN, DOWN, UP, UP}, // SSSD Delivery
-        new int[]{DOWN, UP, LEFT, UP, RIGHT, DOWN},
+        new int[]{UP, UP, LEFT, RIGHT, DOWN, DOWN}, // Seismic Probe
-        new int[]{DOWN, UP, RIGHT, UP, LEFT, UP},
+        new int[]{UP, UP, LEFT, UP, RIGHT},         // Eagle Rearm
-        new int[]{DOWN, UP, RIGHT, RIGHT, LEFT},
+        new int[]{DOWN, UP, DOWN, UP},   // Super Earth Flag
-        new int[]{DOWN, UP, RIGHT, DOWN, RIGHT}
+        new int[]{LEFT, RIGHT, UP, UP, UP},        // Upload Data
+        new int[]{RIGHT, UP, UP, DOWN},// SEAF Artillery
+        new int[]{LEFT, UP, DOWN, RIGHT, DOWN, DOWN}              // Hive Breaker Drill
     };
 
-    private static final String[] NAMES = new String[]{
+private static final String[] NAMES = {
-        "Reforzamiento", "Reabastecimiento", "Baliza SOS", "Artilleria", "Bomba Infernal",
+        // SUPPORT WEAPONS (0-11)
-        "Bandera", "Ametralladora", "Rifle material", "Leal", "Antitanque",
+        "MG-43 Machine Gun", "EAT-17", "M-105 Stalwart", "LAS-98 Laser Cannon", "APW-1 Anti-Materiel Rifle",
-        "Rifle retroceso", "Echador llama", "Canon auto", "Canon riel", "Lanza",
+        "GR-8 Recoilless Rifle", "GL-21 Grenade Launcher", "FLAM-40 Flamethrower", "AC-8 Autocannon",
-        "Bombardeo", "Ataque aereo", "HE 120mm", "HE 380mm", "Aluvion",
+        "ARC-3 Arc Thrower", "RS-422 Railgun", "FAF-14 Spear",
-        "Laser orbital", "Riel orbital", "Carrera", "Ataque", "Racimo",
+        // ORBITAL (12-22)
-        "Napalm", "Salto", "Humo", "Cohetes", "Bomba 500kg",
+        "Orbital Precision", "Orbital Gatling", "Orbital Airburst", "Orbital 120mm", "Orbital Smoke",
-        "Rearme", "Precision", "Gas", "EMS", "Humo2",
+        "Orbital EMS", "Orbital 380mm", "Orbital Walking", "Orbital Laser", "Orbital Railcannon", "Orbital Gas",
-        "HMG", "Escudo", "Tesla", "Minas", "Suministros",
+        // EAGLE (23-29)
-        "Granadas", "Laser", "Incendiarias", "Rover", "Balistico",
+        "Eagle Strafing", "Eagle Airstrike", "Eagle Cluster", "Eagle Smoke", "Eagle Napalm",
-        "Arco", "Escudo2", "Centinela1", "Centinela2", "Centinela3",
+        "Eagle Rocket Pods", "Eagle 500kg",
-        "Guardian", "Centinela4", "Centinela5", "Centinela6", "Centinela7"
+        // BACKPACKS (30-33)
+        "Supply Pack", "Jump Pack", "Ballistic Shield", "Shield Generator",
+        // MINES (34-35)
+        "Anti-Personnel Mines", "Incendiary Mines",
+        // EMPLACEMENTS (36-38)
+        "Shield Relay", "HMG Emplacement", "Tesla Tower",
+        // SENTRIES (39-44)
+        "Gatling Sentry", "MG Sentry", "Autocannon Sentry", "Rocket Sentry", "Mortar Sentry", "EMS Mortar Sentry",
+        // MISSION (45-56)
+        "Reinforce", "Resupply", "SOS Beacon", "Hellbomb", "SSSD", "Seismic Probe", "Eagle Rearm", 
+        "Super Earth Flag", "Upload Data", "SEAF Artillery", "Hive Breaker"
+    };
+
+    private static final int[] ICONS = new int[]{
+        // SUPPORT WEAPONS (0-11)
+        R.drawable.mg_43_machine_gun,
+        R.drawable.eat_17_expendable_anti_tank,
+        R.drawable.m_105_stalwart,
+        R.drawable.las_98_laser_cannon,
+        R.drawable.apw_1_anti_materiel_rifle,
+        R.drawable.gr_8_recoilless_rifle,
+        R.drawable.gl_21_grenade_launcher,
+        R.drawable.flam_40_flamethrower,
+        R.drawable.ac_8_autocannon,
+        R.drawable.arc_3_arc_thrower,
+        R.drawable.rs_422_railgun,
+        R.drawable.faf_14_spear_launcher,
+        // ORBITAL (12-22)
+        R.drawable.orbital_precision_strike,
+        R.drawable.orbital_gatling_barrage,
+        R.drawable.orbital_airburst_strike,
+        R.drawable.orbital_120mm_he_barrage,
+        R.drawable.orbital_smoke_strike,
+        R.drawable.orbital_ems_strike,
+        R.drawable.orbital_380mm_he_barrage,
+        R.drawable.orbital_walking_barrage,
+        R.drawable.orbital_laser,
+        R.drawable.orbital_railcannon_strike,
+        R.drawable.orbital_gas_strike,
+        // EAGLE (23-29)
+        R.drawable.eagle_strafing_run,
+        R.drawable.eagle_airstrike,
+        R.drawable.eagle_cluster_bomb,
+        R.drawable.eagle_smoke_strike,
+        R.drawable.eagle_napalm_airstrike,
+        R.drawable.eagle_110mm_rocket_pods,
+        R.drawable.eagle_500kg_bomb,
+        // BACKPACKS (30-33)
+        R.drawable.b_1_supply_pack,
+        R.drawable.lift_850_jump_pack,
+        R.drawable.sh_20_ballistic_shield_backpack,
+        R.drawable.sh_32_shield_generator_pack,
+        // MINES (34-35)
+        R.drawable.md_6_anti_personnel,
+        R.drawable.md_i4_incendiary_mines,
+        // EMPLACEMENTS (36-38)
+        R.drawable.fx_12_shield_generator_relay,
+        R.drawable.emg_101_hmg_emplacem_nt,
+        R.drawable.aarc_3_tesla_tower,
+        // SENTRIES (39-44)
+        R.drawable.ag_16_gatling_sentry,
+        R.drawable.amg_43_machine_gun_sentry,
+        R.drawable.aac_8_autocannon_sentry,
+        R.drawable.amls_4x_rocket_sentry,
+        R.drawable.am_12_mortar_sentry,
+        R.drawable.am_23_ems_mortar_sentry,
+        // MISSION (45-56)
+        R.drawable.reinforce,
+        R.drawable.resupply,
+        R.drawable.sos_beacon,
+        R.drawable.nux_223_hellbomb,
+        R.drawable.sssd_delivery,
+        R.drawable.seismic_probe,
+        R.drawable.eagle_rearm,
+        R.drawable.super_earth_flag,
+        R.drawable.nux_223_hellbomb,
+        R.drawable.sssd_delivery,
+        R.drawable.hive_breaker_drill
+    };
+
+    private static final int[] ARROW_ICONS = new int[]{
+        R.drawable.stepforward, R.drawable.stepforward, R.drawable.stepforward, R.drawable.stepforward
     };
 
     private SoundManager soundManager;
     private Handler handler = new Handler();
 
-    private TextView tvStratagemName;
     private TextView tvCounter;
+    private ImageView ivStratagemIcon;
+    private LinearLayout sequenceContainer;
     private ImageButton btnUp, btnDown, btnLeft, btnRight;
-    private Button btnVolver;
+    private android.widget.Button btnVolver;
+    private ProgressBar progressBar;
+    private ImageView ivFailure;
 
     private int[] sequence;
     private int playerIndex = 0;
     private int completadas = 0;
     private boolean esperando = false;
     private boolean juegoActivo = true;
-    private String[] ultimosArrows;
+    private int currentStratagemIndex = 0;
-    private String ultimosArrowsStratagem;
+    private boolean bloqueado = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -109,13 +214,16 @@ public class ActivityGame extends AppCompatActivity {
         try { soundManager = new SoundManager(this); }
         catch (Exception e) { soundManager = null; }
 
-        tvStratagemName = findViewById(R.id.tv_stratagem_name);
         tvCounter = findViewById(R.id.tv_counter);
+        ivStratagemIcon = findViewById(R.id.iv_stratagem_icon);
+        sequenceContainer = findViewById(R.id.sequence_container);
         btnUp = findViewById(R.id.btn_up);
         btnDown = findViewById(R.id.btn_down);
         btnLeft = findViewById(R.id.btn_left);
         btnRight = findViewById(R.id.btn_right);
         btnVolver = findViewById(R.id.btn_volver);
+        progressBar = findViewById(R.id.progress_bar);
+        ivFailure = findViewById(R.id.iv_failure);
 
         btnVolver.setOnClickListener(v -> finish());
 
@@ -127,21 +235,64 @@ public class ActivityGame extends AppCompatActivity {
         nuevaRonda();
     }
 
+    private int getArrowRotation(int dir) {
+        switch(dir) {
+            case UP: return 0;
+            case DOWN: return 180;
+            case LEFT: return -90;
+            case RIGHT: return 90;
+            default: return 0;
+        }
+    }
+
     private void nuevaRonda() {
         int idx = (int)(Math.random() * STRATAGEMS.length);
         sequence = STRATAGEMS[idx];
+        currentStratagemIndex = idx;
         playerIndex = 0;
         juegoActivo = true;
-        ultimosArrows = new String[sequence.length];
+        bloqueado = false;
-        ultimosArrowsStratagem = NAMES[idx];
+
-        
+        if (progressBar != null) progressBar.setVisibility(View.GONE);
-        if (tvStratagemName != null) {
+        if (ivFailure != null) ivFailure.setVisibility(View.GONE);
-            tvStratagemName.setText(ultimosArrowsStratagem);
+
-            tvStratagemName.setTextColor(Color.parseColor("#FFD700"));
+        if (ivStratagemIcon != null) {
+            try {
+                int iconIndex = idx % ICONS.length;
+                ivStratagemIcon.setImageResource(ICONS[iconIndex]);
+            } catch (Exception e) {
+                ivStratagemIcon.setImageResource(R.drawable.stratagemas_icon);
+            }
         }
+
+        secuenciaMostrar();
         
         handler.removeCallbacksAndMessages(null);
-        handler.postDelayed(() -> { esperando = true; }, 1200);
+        esperando = true;
+    }
+
+    private static final String ARROW_CHARS = "\u2191\u2193\u2190\u2192";
+    
+    private void secuenciaMostrar() {
+        if (sequenceContainer == null) return;
+        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);
+            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);
+            
+            sequenceContainer.addView(arrowView);
+        }
     }
 
     private void onInputWithSound(int dir) {
@@ -152,24 +303,17 @@ public class ActivityGame extends AppCompatActivity {
     }
 
     private void onInput(int dir) {
-        if (!juegoActivo || !esperando) return;
+        if (!juegoActivo || !esperando || bloqueado) return;
+        bloqueado = true;
         
         if (dir == sequence[playerIndex]) {
             playerIndex++;
             
-            if (tvStratagemName != null) {
+            if (sequenceContainer != null && playerIndex <= sequence.length) {
-                StringBuilder sb = new StringBuilder();
+                View child = sequenceContainer.getChildAt(playerIndex - 1);
-                for (int i = 0; i < sequence.length; i++) {
+                if (child instanceof TextView) {
-                    if (i < playerIndex) {
+                    TextView arrowView = (TextView) child;
-                        sb.append("<font color='#00FF00'>").append(ultimosArrows[i]).append("</font> ");
+                    arrowView.setTextColor(Color.parseColor("#00FF00"));
-                    } else {
-                        sb.append(ultimosArrows[i]).append(" ");
-                    }
-                }
-                try {
-                    tvStratagemName.setText(android.text.Html.fromHtml(sb.toString()));
-                } catch (Exception e) {
-                    tvStratagemName.setText(sb.toString().replaceAll("<[^>]*>", ""));
                 }
             }
             
@@ -179,22 +323,23 @@ public class ActivityGame extends AppCompatActivity {
                 }
                 completadas++;
                 if (tvCounter != null) tvCounter.setText(String.valueOf(completadas));
-                if (tvStratagemName != null) {
-                    tvStratagemName.setText("OK!");
-                    tvStratagemName.setTextColor(Color.parseColor("#00FF00"));
-                }
                 esperando = false;
-                handler.postDelayed(this::nuevaRonda, 1200);
+                if (progressBar != null) {
+                    progressBar.setVisibility(View.VISIBLE);
+                    handler.postDelayed(() -> {
+                        if (progressBar != null) progressBar.setVisibility(View.GONE);
+                    }, 300);
+                }
+                handler.postDelayed(this::nuevaRonda, 300);
+            } else {
+                bloqueado = false;
             }
         } else {
             if (soundManager != null) {
                 try { soundManager.playFailure(); } catch (Exception e) {}
             }
-            if (tvStratagemName != null) {
-                tvStratagemName.setText("X");
-                tvStratagemName.setTextColor(Color.parseColor("#FF0000"));
-            }
             juegoActivo = false;
+            if (ivFailure != null) ivFailure.setVisibility(View.VISIBLE);
             handler.postDelayed(this::nuevaRonda, 1500);
         }
     }

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#232830" />
+            <corners android:radius="6dp" />
+            <stroke android:width="2dp" android:color="#FFD700" />
+        </shape>
+    </item>
+    <item android:top="4dp" android:bottom="4dp" android:left="4dp" android:right="4dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#1B1F25" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="150dp"
+    android:height="150dp"
+    android:viewportWidth="150"
+    android:viewportHeight="150">
+    <!-- Red circle background -->
+    <path
+        android:fillColor="#CC0000"
+        android:pathData="M75,75m-60,0a60,60 0,1 1,120 0a60,60 0,1 1,-120 0"/>
+    <!-- X mark -->
+    <path
+        android:strokeWidth="10"
+        android:strokeColor="#FFFFFF"
+        android:pathData="M45,45L105,105"/>
+    <path
+        android:strokeWidth="10"
+        android:strokeColor="#FFFFFF"
+        android:pathData="M105,45L45,105"/>
+</vector>

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

@@ -5,17 +5,8 @@
     android:background="@drawable/bg_helldivers_gradient">
 
     <!-- Contador -->
-    <TextView
+
-        android:id="@+id/tv_counter"
+    <!-- Nombre de la estratagema -->
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_margin="8dp"
-        android:text="0"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        android:textColor="#00FF00" />
 
     <TextView
         android:id="@+id/tv_counter_label"
@@ -23,13 +14,27 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/tv_counter"
         android:layout_marginTop="5dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="24dp"
         android:layout_toStartOf="@id/tv_counter"
         android:text="ESTRATAGEMAS: "
         android:textColor="#00FF00"
         android:textSize="16sp" />
 
-    <!-- Nombre de la estratagema -->
+    <TextView
+        android:id="@+id/tv_counter"
+        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" />
+
     <TextView
         android:id="@+id/tv_stratagem_name"
         android:layout_width="wrap_content"
@@ -42,109 +47,137 @@
         android:textStyle="bold"
         android:textColor="#FFD700" />
 
-    <!-- Secuencia displayed as images -->
+    <!-- Contenedor principal: Icono + Secuencia + Grid flechas -->
     <LinearLayout
-        android:id="@+id/sequence_container"
+        android:id="@+id/linearLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_above="@id/buttons_grid"
-        android:layout_marginBottom="8dp"
-        android:orientation="horizontal"
-        android:gravity="center" />
-
-    <!-- Grid de Flechas - Centro -->
-    <GridLayout
-        android:id="@+id/buttons_grid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:rowCount="3"
+        android:gravity="center_vertical"
-        android:columnCount="3"
+        android:orientation="horizontal">
-        android:padding="16dp">
 
-        <Space
+        <!-- Icono de la estratagema - Izquierda -->
-            android:layout_width="80dp"
+        <LinearLayout
-            android:layout_height="80dp"
+            android:layout_width="wrap_content"
-            android:layout_row="0"
+            android:layout_height="wrap_content"
-            android:layout_column="0" />
+            android:layout_marginEnd="24dp"
+            android:gravity="center"
+            android:orientation="vertical">
 
-        <ImageButton
+        </LinearLayout>
-            android:id="@+id/btn_up"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_row="0"
-            android:layout_column="1"
-            android:src="@drawable/stepforward"
-            android:scaleType="centerInside"
-            android:background="@android:color/transparent"
-            android:contentDescription="Up"
-            android:layout_margin="6dp" />
 
-        <Space
+        <!-- Centro: Secuencia de flechas -->
-            android:layout_width="80dp"
+        <LinearLayout
-            android:layout_height="80dp"
+            android:layout_width="wrap_content"
-            android:layout_row="0"
+            android:layout_height="wrap_content"
-            android:layout_column="2" />
+            android:gravity="center"
+            android:orientation="vertical">
 
-        <ImageButton
-            android:id="@+id/btn_left"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_row="1"
-            android:layout_column="0"
-            android:src="@drawable/stepforward"
-            android:scaleType="centerInside"
-            android:rotation="-90"
-            android:background="@android:color/transparent"
-            android:contentDescription="Left"
-            android:layout_margin="6dp" />
 
-        <ImageButton
+            <LinearLayout
-            android:id="@+id/btn_down"
+                android:id="@+id/sequence_container"
-            android:layout_width="80dp"
+                android:layout_width="wrap_content"
-            android:layout_height="80dp"
+                android:layout_height="wrap_content"
-            android:layout_row="1"
+                android:layout_marginBottom="12dp"
-            android:layout_column="1"
+                android:gravity="center"
-            android:src="@drawable/stepforward"
+                android:orientation="horizontal" />
-            android:scaleType="centerInside"
-            android:rotation="180"
-            android:background="@android:color/transparent"
-            android:contentDescription="Down"
-            android:layout_margin="6dp" />
 
-        <ImageButton
+            <!-- Grid de Flechas - Input -->
-            android:id="@+id/btn_right"
+            <GridLayout
-            android:layout_width="80dp"
+                android:id="@+id/buttons_grid"
-            android:layout_height="80dp"
+                android:layout_width="wrap_content"
-            android:layout_row="1"
+                android:layout_height="wrap_content"
-            android:layout_column="2"
+                android:columnCount="3"
-            android:src="@drawable/stepforward"
+                android:padding="8dp"
-            android:scaleType="centerInside"
+                android:rowCount="3">
-            android:rotation="90"
-            android:background="@android:color/transparent"
-            android:contentDescription="Right"
-            android:layout_margin="6dp" />
 
-        <Space
+                <Space
-            android:layout_width="80dp"
+                    android:layout_width="80dp"
-            android:layout_height="80dp"
+                    android:layout_height="80dp"
-            android:layout_row="2"
+                    android:layout_row="0"
-            android:layout_column="0" />
+                    android:layout_column="0" />
 
-        <Space
+                <ImageButton
-            android:layout_width="80dp"
+                    android:id="@+id/btn_up"
-            android:layout_height="80dp"
+                    android:layout_width="80dp"
-            android:layout_row="2"
+                    android:layout_height="80dp"
-            android:layout_column="1" />
+                    android:layout_row="0"
+                    android:layout_column="1"
+                    android:layout_margin="4dp"
+                    android:background="@drawable/btn_direction"
+                    android:contentDescription="Up"
+                    android:rotation="-90"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/stepforward" />
 
-        <Space
+                <Space
-            android:layout_width="80dp"
+                    android:layout_width="80dp"
-            android:layout_height="80dp"
+                    android:layout_height="80dp"
-            android:layout_row="2"
+                    android:layout_row="0"
-            android:layout_column="2" />
+                    android:layout_column="2" />
 
-    </GridLayout>
+                <ImageButton
+                    android:id="@+id/btn_left"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_row="1"
+                    android:layout_column="0"
+                    android:layout_margin="4dp"
+                    android:background="@drawable/btn_direction"
+                    android:contentDescription="Left"
+                    android:rotation="180"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/stepforward" />
+
+                <ImageButton
+                    android:id="@+id/btn_down"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_row="1"
+                    android:layout_column="1"
+                    android:layout_margin="4dp"
+                    android:background="@drawable/btn_direction"
+                    android:contentDescription="Down"
+                    android:rotation="90"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/stepforward" />
+
+                <ImageButton
+                    android:id="@+id/btn_right"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_row="1"
+                    android:layout_column="2"
+                    android:layout_margin="4dp"
+                    android:background="@drawable/btn_direction"
+                    android:contentDescription="Right"
+                    android:rotation="0"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/stepforward" />
+
+                <Space
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_row="2"
+                    android:layout_column="0" />
+
+                <Space
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_row="2"
+                    android:layout_column="1" />
+
+                <Space
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_row="2"
+                    android:layout_column="2" />
+
+            </GridLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
 
     <!-- Volver -->
     <Button
@@ -161,4 +194,33 @@
         android:paddingHorizontal="24dp"
         android:paddingVertical="8dp" />
 
+    <ImageView
+        android:id="@+id/iv_stratagem_icon"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="53dp"
+        android:layout_marginTop="93dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/stratagemas_icon" />
+
+    <!-- Loading Spinner -->
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_centerInParent="true"
+        android:indeterminateTint="#FFD700"
+        android:visibility="gone" />
+
+    <!-- Failure Indicator (X) -->
+    <ImageView
+        android:id="@+id/iv_failure"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_failure"
+        android:visibility="gone" />
+
 </RelativeLayout>

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

@@ -73,6 +73,7 @@
             android:layout_column="1"
             android:background="@drawable/btn_direction"
             android:contentDescription="Up"
+            android:rotation="-90"
             android:scaleType="centerInside"
             android:src="@drawable/stepforward" />
 
@@ -86,7 +87,7 @@
             android:layout_column="0"
             android:background="@drawable/btn_direction"
             android:contentDescription="Left"
-            android:rotation="-90"
+            android:rotation="180"
             android:scaleType="centerInside"
             android:src="@drawable/stepforward" />
 
@@ -98,7 +99,7 @@
             android:layout_column="1"
             android:background="@drawable/btn_direction"
             android:contentDescription="Down"
-            android:rotation="180"
+            android:rotation="90"
             android:scaleType="centerInside"
             android:src="@drawable/stepforward" />
 
@@ -110,7 +111,7 @@
             android:layout_column="2"
             android:background="@drawable/btn_direction"
             android:contentDescription="Right"
-            android:rotation="90"
+            android:rotation="0"
             android:scaleType="centerInside"
             android:src="@drawable/stepforward" />
 

docker-compose.yml

@@ -0,0 +1,47 @@
+version: "3.8"
+
+services:
+  gitea:
+    image: gitea/gitea:latest
+    container_name: gitea
+    restart: always
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+    volumes:
+      - /srv/data/gitea:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.gitea.rule=Host(`git-dangilcal.duckdns.org`)"
+      - "traefik.http.routers.gitea.entrypoints=websecure"
+      - "traefik.http.routers.gitea.tls.certresolver=le"
+      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
+      - "traefik.http.routers.gitea-http.rule=Host(`git-dangilcal.duckdns.org`)"
+      - "traefik.http.routers.gitea-http.entrypoints=web"
+      - "traefik.http.routers.gitea-http.middlewares=redirect-to-https"
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.permanent=true"
+
+  gitea-runner:
+    image: gitea/act_runner:latest
+    container_name: gitea-runner
+    restart: always
+    depends_on:
+      - gitea
+    environment:
+      - GITEA_INSTANCE_URL=https://git-dangilcal.duckdns.org
+      - GITEA_RUNNER_REGISTRATION_TOKEN=TU_TOKEN_AQUI
+      - GITEA_RUNNER_NAME=runner-docker
+    volumes:
+      - /srv/data/gitea-runner:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - proxy
+
+networks:
+  proxy:
+    external: true