mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add functionality for unselecting all pictures at once

Browse source
This commit is contained in:
Rohit Verma 2024-11-26 20:52:14 +05:30
parent 130158f510
commit 03713dd62b
5 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/fr/free/nrw/commons/customselector/ui/components/CustomSelectorTopBar.kt
View file

@ -1,11 +1,15 @@
package fr.free.nrw.commons.customselector.ui.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowLeft
import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.ExperimentalMaterial3Api
@ -16,6 +20,7 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.semantics.contentDescription
@ -39,6 +44,7 @@ fun CustomSelectorTopBar(
showSelectionCount: Boolean = false,
showAlertIcon: Boolean = false,
onAlertAction: ()-> Unit = { },
onUnselectAllAction: ()-> Unit = { }
) {
TopAppBar(
title = {
@ -86,15 +92,27 @@ fun CustomSelectorTopBar(
colors = CardDefaults.elevatedCardColors(
containerColor = MaterialTheme.colorScheme.primary
),
elevation = CardDefaults.elevatedCardElevation(8.dp),
shape = CircleShape,
modifier = Modifier.semantics { contentDescription = "$selectionCount Selected" }
.padding(end = 8.dp)
) {
Text(
text = "$selectionCount",
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
style = MaterialTheme.typography.labelMedium
)
Row(
modifier = Modifier.padding(start = 16.dp, end = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Text(
text = "$selectionCount",
modifier = Modifier.padding(vertical = 8.dp)
)
Icon(
imageVector = Icons.Default.Close,
contentDescription = null,
modifier = Modifier.clickable { onUnselectAllAction() }
)
}
}
}
}
@ -111,7 +129,8 @@ private fun CustomSelectorTopBarPreview() {
secondaryText = "10 images",
onNavigateBack = { },
showAlertIcon = true,
selectionCount = 1
selectionCount = 2,
showSelectionCount = true
)
}
}

1
app/src/main/java/fr/free/nrw/commons/customselector/ui/screens/CustomSelectorEvent.kt
View file

@ -4,4 +4,5 @@ interface CustomSelectorEvent {
data class OnFolderClick(val bucketId: Long): CustomSelectorEvent
data class OnImageSelection(val imageId: Long): CustomSelectorEvent
data class OnDragImageSelection(val imageIds: Set<Long>): CustomSelectorEvent
data object OnUnselectAll: CustomSelectorEvent
}

6
app/src/main/java/fr/free/nrw/commons/customselector/ui/screens/CustomSelectorScreen.kt
View file

@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.widthIn
@ -85,7 +86,8 @@ fun CustomSelectorScreen(
navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, it)
},
hasPartialAccess = hasPartialAccess,
adaptiveInfo = adaptiveInfo
adaptiveInfo = adaptiveInfo,
onUnselectAll = { onEvent(CustomSelectorEvent.OnUnselectAll) }
)
}
},
@ -112,6 +114,7 @@ fun CustomSelectorScreen(
fun FoldersPane(
uiState: CustomSelectorState,
onFolderClick: (Folder)-> Unit,
onUnselectAll: ()-> Unit,
adaptiveInfo: WindowAdaptiveInfo,
hasPartialAccess: Boolean = false
) {
@ -129,6 +132,7 @@ fun FoldersPane(
showAlertIcon = uiState.selectedImageIds.size > 20 && isCompatWidth,
selectionCount = uiState.selectedImageIds.size,
onAlertAction = { },
onUnselectAllAction = onUnselectAll,
showSelectionCount = uiState.inSelectionMode && isCompatWidth
)
}

4
app/src/main/java/fr/free/nrw/commons/customselector/ui/screens/CustomSelectorViewModel.kt
View file

@ -57,7 +57,9 @@ class CustomSelectorViewModel(private val mediaReader: MediaReader): ViewModel()
_uiState.update { it.copy(selectedImageIds = e.imageIds) }
}
else -> {}
CustomSelectorEvent.OnUnselectAll-> {
_uiState.update { it.copy(selectedImageIds = emptySet()) }
}
}
}
}

4
app/src/main/java/fr/free/nrw/commons/customselector/ui/screens/ImagesPane.kt
View file

@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
@ -101,7 +102,8 @@ fun ImagesPane(
showNavigationIcon = isCompatWidth,
showAlertIcon = selectedImages().size > 20,
selectionCount = selectedImages().size,
showSelectionCount = uiState.inSelectionMode
showSelectionCount = uiState.inSelectionMode,
onUnselectAllAction = { onEvent(CustomSelectorEvent.OnUnselectAll) }
)
},
bottomBar = {