Skip to content

Commit

Permalink
Added select all button to delete feed dialog (#234)
Browse files Browse the repository at this point in the history 
* feat: add select all button to delete feed

* feat: close the menu when selectall is pressed and selectall checkbox fix

* feat: remove checkbox for select all

* Revert "feat: remove checkbox for select all"

This reverts commit bdf92d0.

* fix: remove isselected lambda

* fix: mergeDescendants=true
  • Loading branch information
@dracarys18
dracarys18 authored Mar 14, 2024
1 parent 3684b5d commit 10437fa
Showing 1 changed file with 79 additions and 30 deletions.
109 changes: 79 additions & 30 deletions app/src/main/java/com/nononsenseapps/feeder/ui/compose/deletefeed/DeleteFeedScreen.kt
View file
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) {
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 ->
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 = {},
)

0 comments on commit 10437fa

Please sign in to comment.