diff --git a/apk/controller/app/build.gradle b/apk/controller/app/build.gradle index ac283ed..91cf58b 100644 --- a/apk/controller/app/build.gradle +++ b/apk/controller/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.iiab.controller" minSdkVersion 24 targetSdkVersion 34 - versionCode 23 - versionName "v0.1.27alpha" + versionCode 24 + versionName "v0.1.28alpha" setProperty("archivesBaseName", "$applicationId-$versionName") ndk { abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" diff --git a/apk/controller/app/src/main/AndroidManifest.xml b/apk/controller/app/src/main/AndroidManifest.xml index 392c937..0a5fc31 100644 --- a/apk/controller/app/src/main/AndroidManifest.xml +++ b/apk/controller/app/src/main/AndroidManifest.xml @@ -57,7 +57,6 @@ diff --git a/apk/controller/app/src/main/assets/index.html b/apk/controller/app/src/main/assets/index.html index 706af1b..77cf2a7 100644 --- a/apk/controller/app/src/main/assets/index.html +++ b/apk/controller/app/src/main/assets/index.html @@ -1,11 +1,11 @@ - + Safe Pocket Web +
+ +

Internet-in-a-Box
on Android

+
+
-
Cargando...
+
Loading...
@@ -87,19 +114,15 @@ const textLabel = document.getElementById('loadingText'); const buttons = document.querySelectorAll('.btn'); - // 1. Mostrar el spinner al hacer clic buttons.forEach(btn => { btn.addEventListener('click', function(e) { - // Extraemos el texto del botón (ej. "Kolibri") para hacerlo personalizado const appName = this.innerText.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]|\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, '').trim(); - textLabel.innerText = 'Abriendo ' + appName + '...'; - - // Mostramos la pantalla de carga + // Cambiado a Opening + textLabel.innerText = 'Opening ' + appName + '...'; overlay.style.display = 'flex'; }); }); - // 2. Ocultar el spinner si el usuario regresa con el botón "Atrás" window.addEventListener('pageshow', function(event) { overlay.style.display = 'none'; }); diff --git a/apk/controller/app/src/main/assets/logo.svg b/apk/controller/app/src/main/assets/logo.svg new file mode 100644 index 0000000..66ab2c2 --- /dev/null +++ b/apk/controller/app/src/main/assets/logo.svg @@ -0,0 +1,83 @@ + + + + diff --git a/apk/controller/app/src/main/java/org/iiab/controller/PortalActivity.java b/apk/controller/app/src/main/java/org/iiab/controller/PortalActivity.java index d3a29b1..5104d2c 100644 --- a/apk/controller/app/src/main/java/org/iiab/controller/PortalActivity.java +++ b/apk/controller/app/src/main/java/org/iiab/controller/PortalActivity.java @@ -38,6 +38,7 @@ public class PortalActivity extends AppCompatActivity { Button btnBack = findViewById(R.id.btnBack); Button btnHome = findViewById(R.id.btnHome); Button btnReload = findViewById(R.id.btnReload); + Button btnExit = findViewById(R.id.btnExit); Button btnForward = findViewById(R.id.btnForward); // Button actions @@ -111,33 +112,35 @@ public class PortalActivity extends AppCompatActivity { bottomNav.setVisibility(View.VISIBLE); // Remove invisibility }); -// --- TEMPORIZADOR PARA AUTO-OCULTAR --- + // --- AUTO-HIDE TIMER --- Handler hideHandler = new Handler(Looper.getMainLooper()); - // Esta es la acción de ocultar empaquetada para usarla luego + // This is the hiding action packaged for later use Runnable hideRunnable = () -> { bottomNav.animate().translationY(bottomNav.getHeight()).setDuration(250); btnHandle.setVisibility(View.VISIBLE); btnHandle.animate().alpha(1f).setDuration(150); }; - // --- LÓGICA DEL TIRADOR (Mostrar Barra) --- + // --- HANDLE LOGIC (Show Bar) --- btnHandle.setOnClickListener(v -> { - // 1. Animamos la entrada + // 1. Animate entry btnHandle.animate().alpha(0f).setDuration(150).withEndAction(() -> btnHandle.setVisibility(View.GONE)); bottomNav.animate().translationY(0).setDuration(250); - // 2. Iniciamos la cuenta regresiva de 5 segundos (5000 ms) - hideHandler.removeCallbacks(hideRunnable); // Cancelamos si había una cuenta anterior - hideHandler.postDelayed(hideRunnable, 5000); // <- Cambia el 5000 por 7000 si prefieres 7 segundos + // 2. Start 5-second countdown (5000 ms) + hideHandler.removeCallbacks(hideRunnable); // Cancel if there was a previous countdown + hideHandler.postDelayed(hideRunnable, 5000); // Change 5000 to 7000 for 7 seconds }); - // --- LÓGICA DE CERRAR BARRA MANUALMENTE --- + // --- MANUALLY CLOSE BAR LOGIC --- btnHideNav.setOnClickListener(v -> { - hideHandler.removeCallbacks(hideRunnable); // Cancelamos el temporizador para que no choque - hideRunnable.run(); // Ejecutamos la acción de ocultar inmediatamente + hideHandler.removeCallbacks(hideRunnable); // Cancel the timer so it doesn't conflict + hideRunnable.run(); // Execute hiding action immediately }); + // <-- EXIT ACTION --> + btnExit.setOnClickListener(v -> finish()); webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setDomStorageEnabled(true); diff --git a/apk/controller/app/src/main/res/layout/activity_portal.xml b/apk/controller/app/src/main/res/layout/activity_portal.xml index 5405afd..ad98614 100644 --- a/apk/controller/app/src/main/res/layout/activity_portal.xml +++ b/apk/controller/app/src/main/res/layout/activity_portal.xml @@ -50,7 +50,11 @@