From bdc18bdd03fafe43c2f30498f2d6deea590c09df Mon Sep 17 00:00:00 2001 From: Dantalian Date: Wed, 18 Nov 2026 13:53:45 +0800 Subject: [PATCH] fix(ui): pin the file manager toolbar ends so the exit stays reachable (#2564) fix(ui): pin the file manager toolbar ends so exit stays reachable Below 600dp the whole toolbar scrolls, so on a phone the star and the exit button sit past the right edge and need a swipe to reach. Scroll only the middle section instead, keeping the back arrow, the drive chip and exit in place, and move the grid list toggle into the sort menu to give that section room. The disabled back arrow also stops being painted primary, which made it look active at the drive root. Co-authored-by: Dantalian --- .../launcher/files/FileManagerScreen.kt | 226 +++++++++--------- 1 file changed, 117 insertions(+), 109 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 4da772b1e8..9945083226 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -40,12 +40,10 @@ import androidx.compose.material.icons.filled.ContentPaste import androidx.compose.material.icons.filled.CreateNewFolder import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Folder -import androidx.compose.material.icons.filled.GridView import androidx.compose.material.icons.filled.SdStorage import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Sort import androidx.compose.material.icons.filled.Star -import androidx.compose.material.icons.filled.ViewList import androidx.compose.material.icons.filled.StarBorder import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.filled.Smartphone @@ -727,11 +725,15 @@ fun FileManagerScreen( modifier = Modifier .fillMaxWidth() .background(MaterialTheme.colorScheme.surfaceContainer) - .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier) .padding(horizontal = 8.dp, vertical = 6.dp), ) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) + val upEnabled = canGoUp && !cancellingNavigation + IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = upEnabled, modifier = Modifier.focusGlide(CircleShape)) { + Icon( + Icons.Filled.ArrowBack, + stringResource(R.string.fm_back), + tint = if (upEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f), + ) } val currentDriveLabel = stringResource(describeLocation(currentDir).driveLabel) @@ -794,113 +796,119 @@ fun FileManagerScreen( Spacer(Modifier.width(4.dp)) - if (showFavorites) { - Text( - text = stringResource(R.string.fm_favorites), - color = MaterialTheme.colorScheme.primary, - fontSize = 13.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), - ) - } else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) { - if (!compactToolbar) Spacer(Modifier.weight(1f)) - } else { - Text( - text = currentDir.name.ifBlank { currentDir.absolutePath }, - color = MaterialTheme.colorScheme.onSurface, - fontSize = 14.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), - ) - } - - if (launchDir != null) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary) - } - if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp)) - } - - if (!showFavorites) { - if (!pickMode) { - OutlinedButton( - onClick = { showNewFolderDialog = true }, - border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)), - contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp), - modifier = Modifier.height(32.dp).focusGlide(CircleShape), - ) { - Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) - Spacer(Modifier.width(5.dp)) - Text(stringResource(R.string.fm_new_folder), color = MaterialTheme.colorScheme.onBackground, fontSize = 12.sp) - } - } - IconButton(onClick = { - gridView = !gridView - browsePrefs.edit().putBoolean("fmGridView", gridView).apply() - }, modifier = Modifier.focusGlide(CircleShape)) { - Icon( - if (gridView) Icons.Filled.ViewList else Icons.Filled.GridView, - if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view), - tint = MaterialTheme.colorScheme.onSurfaceVariant, + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .weight(1f) + .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier), + ) { + if (showFavorites) { + Text( + text = stringResource(R.string.fm_favorites), + color = MaterialTheme.colorScheme.primary, + fontSize = 13.sp, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), + ) + } else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) { + if (!compactToolbar) Spacer(Modifier.weight(1f)) + } else { + Text( + text = currentDir.name.ifBlank { currentDir.absolutePath }, + color = MaterialTheme.colorScheme.onSurface, + fontSize = 14.sp, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), ) } - IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) - } - Box { - IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) - } - DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { - listOf("name" to stringResource(R.string.fm_sort_name), "date" to stringResource(R.string.fm_sort_date), "size" to stringResource(R.string.fm_prop_size)) - .forEach { (key, label) -> - DropdownMenuItem( - text = { - Text(if (sortBy == key) "$label ${if (sortDesc) "↓" else "↑"}" else label) - }, - onClick = { - if (sortBy == key) sortDesc = !sortDesc else { sortBy = key; sortDesc = false } - browsePrefs.edit().putString("fmSortBy", sortBy) - .putBoolean("fmSortDesc", sortDesc).apply() - showSortMenu = false - loadDirectory(currentDir, resetScroll = false) - }, - modifier = Modifier.focusGlide(), - ) - } - HorizontalDivider(color = MaterialTheme.colorScheme.outline) - DropdownMenuItem( - text = { Text(if (compactRows) stringResource(R.string.fm_rows_comfortable) else stringResource(R.string.fm_rows_compact)) }, - onClick = { - compactRows = !compactRows - browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() - showSortMenu = false - }, - modifier = Modifier.focusGlide(), - ) - DropdownMenuItem( - text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, - onClick = { - showHidden = !showHidden - browsePrefs.edit().putBoolean("fmShowHidden", showHidden).apply() - showSortMenu = false - loadDirectory(currentDir, resetScroll = false) - }, - modifier = Modifier.focusGlide(), - ) - } - } - } - IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) { - if (showFavorites) { - Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) - } else { - Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) + if (launchDir != null) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { + Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary) + } + if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp)) + } + + if (!showFavorites) { + if (!pickMode) { + OutlinedButton( + onClick = { showNewFolderDialog = true }, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)), + contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp), + modifier = Modifier.height(32.dp).focusGlide(CircleShape), + ) { + Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) + Spacer(Modifier.width(5.dp)) + Text(stringResource(R.string.fm_new_folder), color = MaterialTheme.colorScheme.onBackground, fontSize = 12.sp) + } + } + IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) { + Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } + Box { + IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) { + Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } + DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { + listOf("name" to stringResource(R.string.fm_sort_name), "date" to stringResource(R.string.fm_sort_date), "size" to stringResource(R.string.fm_prop_size)) + .forEach { (key, label) -> + DropdownMenuItem( + text = { + Text(if (sortBy == key) "$label ${if (sortDesc) "↓" else "↑"}" else label) + }, + onClick = { + if (sortBy == key) sortDesc = !sortDesc else { sortBy = key; sortDesc = false } + browsePrefs.edit().putString("fmSortBy", sortBy) + .putBoolean("fmSortDesc", sortDesc).apply() + showSortMenu = false + loadDirectory(currentDir, resetScroll = false) + }, + modifier = Modifier.focusGlide(), + ) + } + HorizontalDivider(color = MaterialTheme.colorScheme.outline) + DropdownMenuItem( + text = { Text(if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view)) }, + onClick = { + gridView = !gridView + browsePrefs.edit().putBoolean("fmGridView", gridView).apply() + showSortMenu = false + }, + modifier = Modifier.focusGlide(), + ) + DropdownMenuItem( + text = { Text(if (compactRows) stringResource(R.string.fm_rows_comfortable) else stringResource(R.string.fm_rows_compact)) }, + onClick = { + compactRows = !compactRows + browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() + showSortMenu = false + }, + modifier = Modifier.focusGlide(), + ) + DropdownMenuItem( + text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, + onClick = { + showHidden = !showHidden + browsePrefs.edit().putBoolean("fmShowHidden", showHidden).apply() + showSortMenu = false + loadDirectory(currentDir, resetScroll = false) + }, + modifier = Modifier.focusGlide(), + ) + } + } + } + + IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) { + if (showFavorites) { + Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) + } else { + Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } } } if (!pickMode && onExit != null) {