fix: kiosk overlay, preferred use-location, scale reconnect, Bring! translation, smart cache invalidation
- Kiosk: replace header-inject overlay with position:fixed div appended to <html> so buttons appear regardless of SPA init timing - Kiosk: bump versionCode 3→4, versionName 1.2.0→1.3.0 - Kiosk: add explicit signingConfigs block (debug keystore) to avoid signature mismatch on updates; update banner now shows uninstall instruction + 12s timeout - Web: v1.4.0 → v1.5.0 - Preferred use-location: remember last N location choices per product; after 3+ consistent picks auto-select and collapse location picker (with 'cambia' link) - Scale: call updateScaleReadButtons() on every status change so live-box and read button appear instantly on reconnect without manual refresh - Smart shopping cache: invalidate JSON cache file on every inventory_add and inventory_use so next shopping-page load always sees current stock - isLowStock: conf threshold changed <= 1 → < 1 (1 full pack is not low stock) - italianToBring: replace substring matching with whole-word matching (min 4 chars) to prevent 'gin' matching 'original', 'rum' matching 'crumble', etc. Philadelphia original was silently mapped to Gin and skipped as duplicate - Storico: add undo support (transaction_undo endpoint, undone column, JS undo btn) - LOG → Storico rename in UI, nav, translations - Bring! sync: urgency-aware purchased blocklist TTL (critical 30m, high 90m, others 4h) - forceSyncBring() button to clear all guards and re-sync from scratch - Scale live-box: position:fixed CSS class, 1.6rem/800 value, direct ml display - Recipe use modal: scale live-box with 10s stability + 5s auto-confirm countdown - Recipe use modal: show recipe quantity as highlighted row in Usa popup
This commit is contained in:
dadaloop82
@@ -11,11 +11,25 @@ android {
|
||||
applicationId = "it.dadaloop.evershelf.kiosk"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 3
|
||||
versionName = "1.2.0"
|
||||
versionCode = 4
|
||||
versionName = "1.3.0"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
// Use the standard Android debug keystore so every machine produces
|
||||
// APKs with the same debug signature — required for over-the-air updates.
|
||||
getByName("debug") {
|
||||
storeFile = file("${System.getProperty("user.home")}/.android/debug.keystore")
|
||||
storePassword = "android"
|
||||
keyAlias = "androiddebugkey"
|
||||
keyPassword = "android"
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
signingConfig = signingConfigs.getByName("debug")
|
||||
}
|
||||
release {
|
||||
isMinifyEnabled = false
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
|
||||
|
||||
@@ -124,10 +124,7 @@ class KioskActivity : AppCompatActivity() {
|
||||
scaleStatusText = findViewById(R.id.scaleStatusText)
|
||||
scaleStatusDetail = findViewById(R.id.scaleStatusDetail)
|
||||
|
||||
// Triple-tap on wizard title to exit kiosk
|
||||
findViewById<TextView>(R.id.wizardTitle).setOnClickListener {
|
||||
handleTripleTap()
|
||||
}
|
||||
// Triple-tap on wizard title is disabled — exit only via the X button in the overlay
|
||||
|
||||
// Step 1
|
||||
findViewById<MaterialButton>(R.id.btnGetStarted).setOnClickListener {
|
||||
@@ -163,9 +160,9 @@ class KioskActivity : AppCompatActivity() {
|
||||
finishWizard()
|
||||
}
|
||||
|
||||
// Settings — triple-tap to exit
|
||||
// Settings gear — short press opens settings, no kiosk exit via tap
|
||||
btnSettings.setOnClickListener {
|
||||
handleTripleTap()
|
||||
startActivity(Intent(this, SettingsActivity::class.java))
|
||||
}
|
||||
btnSettings.setOnLongClickListener {
|
||||
startActivity(Intent(this, SettingsActivity::class.java))
|
||||
@@ -456,7 +453,8 @@ class KioskActivity : AppCompatActivity() {
|
||||
|
||||
override fun onPageFinished(view: WebView?, url: String?) {
|
||||
super.onPageFinished(view, url)
|
||||
// Kiosk overlay removed — exit is handled via the Android settings gear button
|
||||
// Inject X (exit) and ↻ (refresh) buttons into the page header
|
||||
injectKioskOverlay()
|
||||
// Check for updates periodically
|
||||
checkForUpdates()
|
||||
}
|
||||
@@ -537,23 +535,21 @@ class KioskActivity : AppCompatActivity() {
|
||||
// ── Inject kiosk buttons in header (left of title) ──────────────────
|
||||
|
||||
private fun injectKioskOverlay() {
|
||||
// Use a position:fixed overlay so injection never depends on SPA DOM readiness.
|
||||
val js = """
|
||||
(function() {
|
||||
if (document.getElementById('_kiosk_exit_btn')) return;
|
||||
var content = document.querySelector('.header-content');
|
||||
var title = document.querySelector('.header-title');
|
||||
if (!content || !title) return;
|
||||
if (document.getElementById('_kiosk_overlay')) return;
|
||||
|
||||
var wrap = document.createElement('div');
|
||||
wrap.id = '_kiosk_controls';
|
||||
wrap.style.cssText = 'display:flex;align-items:center;gap:6px;margin-right:8px;flex-shrink:0;';
|
||||
wrap.id = '_kiosk_overlay';
|
||||
wrap.style.cssText = 'position:fixed;top:8px;right:8px;z-index:2147483647;display:flex;gap:6px;align-items:center;pointer-events:auto;';
|
||||
|
||||
// Exit button
|
||||
var exitBtn = document.createElement('button');
|
||||
exitBtn.id = '_kiosk_exit_btn';
|
||||
exitBtn.textContent = '\u2715';
|
||||
exitBtn.title = 'Esci dal kiosk';
|
||||
exitBtn.style.cssText = 'background:rgba(0,0,0,0.25);border:1.5px solid rgba(255,255,255,0.4);color:#fff;width:30px;height:30px;border-radius:50%;font-size:14px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;';
|
||||
exitBtn.style.cssText = 'background:rgba(0,0,0,0.45);border:1.5px solid rgba(255,255,255,0.5);color:#fff;width:34px;height:34px;border-radius:50%;font-size:15px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;touch-action:manipulation;';
|
||||
exitBtn.addEventListener('click', function(e) {
|
||||
e.stopPropagation();
|
||||
if (confirm('Uscire dalla modalit\u00e0 kiosk?')) {
|
||||
@@ -566,7 +562,7 @@ class KioskActivity : AppCompatActivity() {
|
||||
refBtn.id = '_kiosk_refresh_btn';
|
||||
refBtn.textContent = '\u21bb';
|
||||
refBtn.title = 'Aggiorna pagina';
|
||||
refBtn.style.cssText = 'background:rgba(0,0,0,0.25);border:1.5px solid rgba(255,255,255,0.4);color:#fff;width:30px;height:30px;border-radius:50%;font-size:16px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;';
|
||||
refBtn.style.cssText = 'background:rgba(0,0,0,0.45);border:1.5px solid rgba(255,255,255,0.5);color:#fff;width:34px;height:34px;border-radius:50%;font-size:18px;cursor:pointer;display:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:transparent;touch-action:manipulation;';
|
||||
refBtn.addEventListener('click', function(e) {
|
||||
e.stopPropagation();
|
||||
if (typeof _kioskBridge !== 'undefined') _kioskBridge.hardReload();
|
||||
@@ -575,7 +571,7 @@ class KioskActivity : AppCompatActivity() {
|
||||
|
||||
wrap.appendChild(exitBtn);
|
||||
wrap.appendChild(refBtn);
|
||||
content.insertBefore(wrap, title);
|
||||
document.documentElement.appendChild(wrap);
|
||||
})();
|
||||
""".trimIndent()
|
||||
webView.evaluateJavascript(js, null)
|
||||
@@ -644,9 +640,9 @@ class KioskActivity : AppCompatActivity() {
|
||||
var banner = document.createElement('div');
|
||||
banner.id = '_kiosk_update_banner';
|
||||
banner.style.cssText = 'position:fixed;bottom:0;left:0;right:0;background:#1e293b;color:#fbbf24;padding:10px 16px;font-size:13px;z-index:999998;display:flex;align-items:center;justify-content:space-between;border-top:2px solid #fbbf24;';
|
||||
banner.innerHTML = '<span>⬆️ ${message.replace("\n", "<br>")}</span><button onclick="this.parentElement.remove()" style="background:none;border:none;color:#64748b;font-size:18px;cursor:pointer;">✕</button>';
|
||||
banner.innerHTML = '<span>⬆️ ${message.replace("\n", "<br>")} — Per installare: disinstalla prima la versione attuale, poi installa la nuova.</span><button onclick="this.parentElement.remove()" style="background:none;border:none;color:#64748b;font-size:18px;cursor:pointer;">✕</button>';
|
||||
document.body.appendChild(banner);
|
||||
setTimeout(function(){ var b = document.getElementById('_kiosk_update_banner'); if(b) b.remove(); }, 3000);
|
||||
setTimeout(function(){ var b = document.getElementById('_kiosk_update_banner'); if(b) b.remove(); }, 12000);
|
||||
})();
|
||||
""".trimIndent()
|
||||
webView.evaluateJavascript(js, null)
|
||||
|
||||
Reference in New Issue
Block a user