mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 14:26:00 +00:00
fix: file manager selection actions respect the search filter (#1021)
This commit is contained in:
1 parent
1c06ddeaf2
commit
6eefcf4267
1 file changed
+14
-11
@@ -153,6 +153,8 @@ fun FileManagerScreen(
|
|||||||
var operationJob by remember { mutableStateOf<kotlinx.coroutines.Job?>(null) }
|
var operationJob by remember { mutableStateOf<kotlinx.coroutines.Job?>(null) }
|
||||||
var pendingBulkDelete by remember { mutableStateOf<List<File>>(emptyList()) }
|
var pendingBulkDelete by remember { mutableStateOf<List<File>>(emptyList()) }
|
||||||
var searchQuery by remember { mutableStateOf("") }
|
var searchQuery by remember { mutableStateOf("") }
|
||||||
|
val visibleEntries = if (searchQuery.isBlank()) entries
|
||||||
|
else entries.filter { it.name.contains(searchQuery, ignoreCase = true) }
|
||||||
var showSearch by remember { mutableStateOf(false) }
|
var showSearch by remember { mutableStateOf(false) }
|
||||||
var sortBy by remember { mutableStateOf(browsePrefs.getString("fmSortBy", "name") ?: "name") }
|
var sortBy by remember { mutableStateOf(browsePrefs.getString("fmSortBy", "name") ?: "name") }
|
||||||
var sortDesc by remember { mutableStateOf(browsePrefs.getBoolean("fmSortDesc", false)) }
|
var sortDesc by remember { mutableStateOf(browsePrefs.getBoolean("fmSortDesc", false)) }
|
||||||
@@ -791,19 +793,21 @@ fun FileManagerScreen(
|
|||||||
fontSize = 13.sp,
|
fontSize = 13.sp,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
)
|
)
|
||||||
|
val allVisibleSelected = visibleEntries.isNotEmpty() && visibleEntries.all { it.absolutePath in selectedPaths }
|
||||||
|
val anyVisibleSelected = visibleEntries.any { it.absolutePath in selectedPaths }
|
||||||
val selBarPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp)
|
val selBarPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp)
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
onClick = {
|
onClick = {
|
||||||
selectedPaths = if (selectedPaths.size == entries.size) emptySet()
|
val shown = visibleEntries.map { it.absolutePath }
|
||||||
else entries.map { it.absolutePath }.toSet()
|
selectedPaths = if (allVisibleSelected) selectedPaths - shown.toSet() else selectedPaths + shown
|
||||||
},
|
},
|
||||||
contentPadding = selBarPadding,
|
contentPadding = selBarPadding,
|
||||||
) { Text(if (selectedPaths.size == entries.size) stringResource(R.string.fm_select_none) else stringResource(R.string.fm_select_all), fontSize = 12.sp) }
|
) { Text(if (allVisibleSelected) stringResource(R.string.fm_select_none) else stringResource(R.string.fm_select_all), fontSize = 12.sp) }
|
||||||
Spacer(Modifier.width(4.dp))
|
Spacer(Modifier.width(4.dp))
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
enabled = selectedPaths.isNotEmpty(),
|
enabled = anyVisibleSelected,
|
||||||
onClick = {
|
onClick = {
|
||||||
clipboardFiles = entries.filter { it.absolutePath in selectedPaths }
|
clipboardFiles = visibleEntries.filter { it.absolutePath in selectedPaths }
|
||||||
isCutOperation = false
|
isCutOperation = false
|
||||||
selectionMode = false
|
selectionMode = false
|
||||||
selectedPaths = emptySet()
|
selectedPaths = emptySet()
|
||||||
@@ -812,9 +816,9 @@ fun FileManagerScreen(
|
|||||||
) { Text(stringResource(R.string.fm_copy), fontSize = 12.sp) }
|
) { Text(stringResource(R.string.fm_copy), fontSize = 12.sp) }
|
||||||
Spacer(Modifier.width(4.dp))
|
Spacer(Modifier.width(4.dp))
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
enabled = selectedPaths.isNotEmpty(),
|
enabled = anyVisibleSelected,
|
||||||
onClick = {
|
onClick = {
|
||||||
clipboardFiles = entries.filter { it.absolutePath in selectedPaths }
|
clipboardFiles = visibleEntries.filter { it.absolutePath in selectedPaths }
|
||||||
isCutOperation = true
|
isCutOperation = true
|
||||||
selectionMode = false
|
selectionMode = false
|
||||||
selectedPaths = emptySet()
|
selectedPaths = emptySet()
|
||||||
@@ -823,8 +827,8 @@ fun FileManagerScreen(
|
|||||||
) { Text(stringResource(R.string.fm_cut), fontSize = 12.sp) }
|
) { Text(stringResource(R.string.fm_cut), fontSize = 12.sp) }
|
||||||
Spacer(Modifier.width(4.dp))
|
Spacer(Modifier.width(4.dp))
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
enabled = selectedPaths.isNotEmpty(),
|
enabled = anyVisibleSelected,
|
||||||
onClick = { pendingBulkDelete = entries.filter { it.absolutePath in selectedPaths } },
|
onClick = { pendingBulkDelete = visibleEntries.filter { it.absolutePath in selectedPaths } },
|
||||||
contentPadding = selBarPadding,
|
contentPadding = selBarPadding,
|
||||||
border = BorderStroke(1.dp, MaterialTheme.colorScheme.error),
|
border = BorderStroke(1.dp, MaterialTheme.colorScheme.error),
|
||||||
) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error, fontSize = 12.sp) }
|
) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error, fontSize = 12.sp) }
|
||||||
@@ -964,8 +968,7 @@ fun FileManagerScreen(
|
|||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.nestedScroll(pullState.nestedScrollConnection),
|
.nestedScroll(pullState.nestedScrollConnection),
|
||||||
) {
|
) {
|
||||||
val shownEntries = if (searchQuery.isBlank()) entries
|
val shownEntries = visibleEntries
|
||||||
else entries.filter { it.name.contains(searchQuery, ignoreCase = true) }
|
|
||||||
|
|
||||||
if (showGrid && entries.isNotEmpty()) {
|
if (showGrid && entries.isNotEmpty()) {
|
||||||
LazyVerticalGrid(
|
LazyVerticalGrid(
|
||||||
|
|||||||
Reference in new issue
Block a user