Skip to content
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

feat: add select all button to delete feed #234

Merged
merged 6 commits into from
Mar 14, 2024
Merged

feat: add select all button to delete feed #234

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4798f24
feat: add select all button to delete feed
dracarys18 Mar 11, 2024
d5efd41
feat: close the menu when selectall is pressed and selectall checkbox…
dracarys18 Mar 13, 2024
bdf92d0
feat: remove checkbox for select all
dracarys18 Mar 13, 2024
8025a26
Revert "feat: remove checkbox for select all"
dracarys18 Mar 13, 2024
5a2599f
fix: remove isselected lambda
dracarys18 Mar 14, 2024
e7de134
fix: mergeDescendants=true
dracarys18 Mar 14, 2024
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
109 changes: 79 additions & 30 deletions app/src/main/java/com/nononsenseapps/feeder/ui/compose/deletefeed/DeleteFeedScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,38 @@ package com.nononsenseapps.feeder.ui.compose.deletefeed

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredHeightIn
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Checkbox
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.clearAndSetSemantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.nononsenseapps.feeder.R
Expand All @@ -45,12 +52,17 @@ fun DeleteFeedDialog(
var feedsToDelete by rememberSaveable {
mutableStateOf(emptyMap<Long, Boolean>())
}

val selectAllSelected by remember {
derivedStateOf {
feeds.item.all { feed -> feedsToDelete[feed.id] ?: false }
}
}
DeleteFeedDialog(
feeds = feeds,
isChecked = { feedId ->
feedsToDelete[feedId] ?: false
},
selectAllSelected = selectAllSelected,
onDismiss = onDismiss,
onOk = {
onDelete(feedsToDelete.filterValues { it }.keys)
Expand All @@ -59,6 +71,9 @@ fun DeleteFeedDialog(
onToggleFeed = { feedId, checked ->
feedsToDelete = feedsToDelete + (feedId to (checked ?: !feedsToDelete.contains(feedId)))
},
onSelectAll = { checked ->
feedsToDelete = feeds.item.associate { it.id to checked }
},
modifier = modifier,
)
}
Expand All @@ -67,11 +82,16 @@ fun DeleteFeedDialog(
fun DeleteFeedDialog(
feeds: ImmutableHolder<List<DeletableFeed>>,
isChecked: (Long) -> Boolean,
selectAllSelected: Boolean,
onDismiss: () -> Unit,
onOk: () -> Unit,
onToggleFeed: (Long, Boolean?) -> Unit,
onSelectAll: (Boolean) -> Unit,
modifier: Modifier = Modifier,
) {
var menuExpanded by rememberSaveable {
mutableStateOf(false)
}
AlertDialog(
modifier = modifier,
onDismissRequest = onDismiss,
Expand All @@ -86,14 +106,44 @@ fun DeleteFeedDialog(
}
},
title = {
Text(
text = stringResource(id = R.string.delete_feed),
style = MaterialTheme.typography.titleLarge,
textAlign = TextAlign.Center,
modifier =
Modifier
.padding(vertical = 8.dp),
)
Box(modifier = Modifier.fillMaxWidth()) {
val stateLabel = if (selectAllSelected) {
dracarys18 marked this conversation as resolved.
Show resolved Hide resolved
stringResource(androidx.compose.ui.R.string.selected)
} else {
stringResource(androidx.compose.ui.R.string.not_selected)
}
Text(
text = stringResource(id = R.string.delete_feed),
style = MaterialTheme.typography.titleMedium,
modifier = Modifier.align(Alignment.CenterStart)
)
Box(modifier = Modifier.align(Alignment.CenterEnd)) {
IconButton(onClick = { menuExpanded = true }) {
Icon(Icons.Default.MoreVert, contentDescription = stringResource(android.R.string.selectAll))
}

DropdownMenu(expanded = menuExpanded, onDismissRequest = { menuExpanded = false }) {
DropdownMenuItem(text = {
Row(verticalAlignment = Alignment.CenterVertically) {
Checkbox(checked = selectAllSelected, onCheckedChange = { checked ->
spacecowboy marked this conversation as resolved.
Show resolved Hide resolved
onSelectAll(checked)
menuExpanded = false
}, modifier = Modifier.clearAndSetSemantics { })
Spacer(modifier = Modifier.width(4.dp))
Text(
text = stringResource(id = android.R.string.selectAll),
style = MaterialTheme.typography.titleMedium,
)
}
}, onClick = {
onSelectAll(!selectAllSelected)
menuExpanded = false
}, modifier = Modifier.safeSemantics(mergeDescendants = true) {
stateDescription = stateLabel
})
}
}
}
},
text = {
LazyColumn(
Expand All @@ -103,25 +153,24 @@ fun DeleteFeedDialog(
feeds.item,
key = { feed -> feed.id },
) { feed ->
val stateLabel =
if (isChecked(feed.id)) {
stringResource(androidx.compose.ui.R.string.selected)
} else {
stringResource(androidx.compose.ui.R.string.not_selected)
}
val stateLabel = if (isChecked(feed.id)) {
stringResource(androidx.compose.ui.R.string.selected)
} else {
stringResource(androidx.compose.ui.R.string.not_selected)
}
Row(
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
modifier =
Modifier
.fillMaxWidth()
.requiredHeightIn(min = minimumTouchSize)
.clickable {
onToggleFeed(feed.id, !isChecked(feed.id))
}
.safeSemantics(mergeDescendants = true) {
stateDescription = stateLabel
},
Modifier
.fillMaxWidth()
.requiredHeightIn(min = minimumTouchSize)
.clickable {
onToggleFeed(feed.id, !isChecked(feed.id))
}
.safeSemantics(mergeDescendants = true) {
stateDescription = stateLabel
},
) {
Checkbox(
checked = isChecked(feed.id),
Expand Down Expand Up @@ -153,10 +202,10 @@ data class DeletableFeed(
private fun Preview() =
DeleteFeedDialog(
feeds =
immutableListHolderOf(
DeletableFeed(1, "A Feed"),
DeletableFeed(2, "Another Feed"),
),
immutableListHolderOf(
DeletableFeed(1, "A Feed"),
DeletableFeed(2, "Another Feed"),
),
onDismiss = {},
onDelete = {},
)
Loading