Skip to content

WebUiScreen: Close dropdown menus with back button #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenxiaolong merged 1 commit into from
Jun 15, 2026
Merged

WebUiScreen: Close dropdown menus with back button #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions app/src/main/java/com/chiller3/basicsync/settings/WebUiScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,23 @@ fun WebUiScreen(onExit: () -> Unit) {
webView.evaluateJavascript("bridgeInit($isTv);") {}
}

fun closeAllDropdowns() {
webView.evaluateJavascript("closeAllDropdowns();") {}
}

fun closeTopModal() {
webView.evaluateJavascript("closeTopModal();") {}
}

var dropdownsOpen by remember { mutableIntStateOf(0) }
var modalsOpen by remember { mutableIntStateOf(0) }
var hasBrowserHistory by remember { mutableStateOf(false) }
BackHandler(
enabled = modalsOpen > 0 || hasBrowserHistory,
enabled = dropdownsOpen > 0 || modalsOpen > 0 || hasBrowserHistory,
onBack = {
if (modalsOpen > 0) {
if (dropdownsOpen > 0) {
closeAllDropdowns()
} else if (modalsOpen > 0) {
closeTopModal()
} else if (hasBrowserHistory) {
webView.goBack()
Expand Down Expand Up @@ -206,6 +213,11 @@ fun WebUiScreen(onExit: () -> Unit) {
requestQrScanner.launch(Intent(context, QrScannerActivity::class.java))
}

@JavascriptInterface
fun onDropdownsOpenChanged(count: Int) {
dropdownsOpen = count
}

@JavascriptInterface
fun onModalsOpenChanged(count: Int) {
modalsOpen = count
Expand Down
18 changes: 17 additions & 1 deletion app/src/main/res/raw/webview_bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ function onDeviceIdScanned(deviceId) {
elemDeviceId.dispatchEvent(new InputEvent('input'));
}

function closeAllDropdowns() {
$('.dropdown.open > .dropdown-toggle').dropdown('toggle');
}

function closeTopModal() {
const modals = document.getElementsByClassName('modal');
var topModal = null;
Expand Down Expand Up @@ -223,6 +227,18 @@ function bridgeInit(isTv) {
});
}

var dropdownsOpen = 0;

$(document).on('shown.bs.dropdown', function (e) {
dropdownsOpen++;
BasicSync.onDropdownsOpenChanged(dropdownsOpen);
});

$(document).on('hidden.bs.dropdown', function (e) {
dropdownsOpen--;
BasicSync.onDropdownsOpenChanged(dropdownsOpen);
});

var modalsOpen = 0;

$(document).on('shown.bs.modal', function (e) {
Expand Down Expand Up @@ -282,7 +298,7 @@ function bridgeInit(isTv) {
* possible to scroll the menus by scrolling the page itself. We have to make the menus
* individually scrollable instead.
*/
.dropdown-menu {
.navbar-fixed-top .dropdown-menu {
column-count: auto !important;
height: unset !important;
/* Roughly the amount of free space excluding insets and nav bar. */
Expand Down