chore: auto-merge develop → main

Triggered by: 61a2372 feat(kiosk): add native settings shortcut in webapp settings page
2026-05-16 13:09:08 +00:00
parent ad9be3b705 61a2372caa
commit 424fc7bbe3
6 changed files with 54 additions and 3 deletions
@@ -515,6 +515,17 @@ class KioskActivity : AppCompatActivity() {
                    btnSettings.visibility = if (visible) View.VISIBLE else View.GONE
                }
            }
+            /**
+             * Open the native SettingsActivity from the webapp settings page.
+             * Allows configuring server URL, BLE scale and screensaver without
+             * the user having to find the native gear button.
+             */
+            @JavascriptInterface
+            fun openNativeSettings() {
+                runOnUiThread {
+                    startActivity(Intent(this@KioskActivity, SettingsActivity::class.java))
+                }
+            }
        }, "_kioskBridge")

        val url = prefs.getString(KEY_URL, "http://evershelf.local") ?: "http://evershelf.local"