Skip to content

Swipeitem refactor #463

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

Merged
merged 6 commits into from
Feb 28, 2025
Merged

Swipeitem refactor #463

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d751d51
Refactor search bar examples
jakeroseman Feb 25, 2025
705a6cc
Add comments
jakeroseman Feb 25, 2025
79fcb85
Apply Spotless
jakeroseman Feb 25, 2025
73c652a
minor refactoring for swipe to dismiss example
jakeroseman Feb 25, 2025
e5d9c12
Apply Spotless
jakeroseman Feb 25, 2025
ea42399
Merge branch 'main' into swipeitem-refactor
jakeroseman Feb 25, 2025
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
82 changes: 36 additions & 46 deletions compose/snippets/src/main/java/com/example/compose/snippets/components/SwipeToDismissBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ data class TodoItem(
// [START android_compose_components_swipeitem]
@Composable
fun SwipeItem(
value: TodoItem,
todoItem: TodoItem,
startToEndAction: (TodoItem) -> Unit,
endToStartAction: (TodoItem) -> Unit,
modifier: Modifier = Modifier,
Expand All @@ -87,12 +87,12 @@ fun SwipeItem(
confirmValueChange = {
when (it) {
SwipeToDismissBoxValue.StartToEnd -> {
startToEndAction(value)
startToEndAction(todoItem)
// Do not dismiss this item.
false
}
SwipeToDismissBoxValue.EndToStart -> {
endToStartAction(value)
endToStartAction(todoItem)
true
}
SwipeToDismissBoxValue.Settled -> {
Expand All @@ -104,8 +104,7 @@ fun SwipeItem(

SwipeToDismissBox(
state = swipeToDismissBoxState,
modifier = modifier
.fillMaxSize(),
modifier = modifier.fillMaxSize(),
backgroundContent = {
Row(
modifier = Modifier
Expand All @@ -128,23 +127,20 @@ fun SwipeItem(
) {
when (swipeToDismissBoxState.dismissDirection) {
SwipeToDismissBoxValue.StartToEnd -> {
if (value.isItemDone) {
Icon(
imageVector = Icons.Default.CheckBox,
contentDescription = "Item done",
tint = Color.White,
modifier = Modifier
.padding(12.dp)
)
val icon = if (todoItem.isItemDone) {
Icons.Default.CheckBox
} else {
Icon(
imageVector = Icons.Default.CheckBoxOutlineBlank,
contentDescription = "Item not done",
tint = Color.White,
modifier = Modifier
.padding(12.dp)
)
Icons.Default.CheckBoxOutlineBlank
}

val contentDescription = if (todoItem.isItemDone) "Done" else "Not done"

Icon(
icon,
contentDescription,
Modifier.padding(12.dp),
tint = Color.White
)
}

SwipeToDismissBoxValue.EndToStart -> {
Expand All @@ -153,8 +149,7 @@ fun SwipeItem(
imageVector = Icons.Default.Delete,
contentDescription = "Remove item",
tint = Color.White,
modifier = Modifier
.padding(12.dp)
modifier = Modifier.padding(12.dp)
)
}

Expand All @@ -163,7 +158,7 @@ fun SwipeItem(
}
}
) {
content(value)
content(todoItem)
}
}
// [END android_compose_components_swipeitem]
Expand All @@ -187,7 +182,7 @@ private fun SwipeItemExample() {
key = { it.itemDescription }
) { todoItem ->
SwipeItem(
value = todoItem,
todoItem = todoItem,
startToEndAction = {
todoItem.isItemDone = !todoItem.isItemDone
},
Expand All @@ -208,23 +203,24 @@ private fun SwipeItemExample() {
// [START android_compose_components_swipecarditem]
@Composable
fun SwipeCardItem(
value: TodoItem,
todoItem: TodoItem,
startToEndAction: (TodoItem) -> Unit,
endToStartAction: (TodoItem) -> Unit,
modifier: Modifier = Modifier,
content: @Composable (TodoItem) -> Unit
) {
// [START_EXCLUDE]
val swipeToDismissState = rememberSwipeToDismissBoxState(
positionalThreshold = { totalDistance -> totalDistance * 0.25f },
confirmValueChange = {
when (it) {
SwipeToDismissBoxValue.StartToEnd -> {
startToEndAction(value)
startToEndAction(todoItem)
// Do not dismiss this item.
false
}
SwipeToDismissBoxValue.EndToStart -> {
endToStartAction(value)
endToStartAction(todoItem)
true
}
SwipeToDismissBoxValue.Settled -> {
Expand All @@ -234,6 +230,7 @@ fun SwipeCardItem(
}
)

// [END_EXCLUDE]
SwipeToDismissBox(
modifier = Modifier,
state = swipeToDismissState,
Expand All @@ -250,6 +247,7 @@ fun SwipeCardItem(
},
label = "swipeable card item background color"
)
// [START_EXCLUDE]
Row(
modifier = Modifier
.background(color)
Expand All @@ -259,23 +257,15 @@ fun SwipeCardItem(
) {
when (swipeToDismissState.dismissDirection) {
SwipeToDismissBoxValue.StartToEnd -> {
if (value.isItemDone) {
Icon(
imageVector = Icons.Default.CheckBox,
contentDescription = "Item done",
tint = Color.White,
modifier = Modifier
.padding(12.dp)
)
val icon = if (todoItem.isItemDone) {
Icons.Default.CheckBox
} else {
Icon(
imageVector = Icons.Default.CheckBoxOutlineBlank,
contentDescription = "Item not done",
tint = Color.White,
modifier = Modifier
.padding(12.dp)
)
Icons.Default.CheckBoxOutlineBlank
}

val contentDescription = if (todoItem.isItemDone) "Done" else "Not done"

Icon(icon, contentDescription, Modifier.padding(12.dp), tint = Color.White)
}

SwipeToDismissBoxValue.EndToStart -> {
Expand All @@ -284,8 +274,7 @@ fun SwipeCardItem(
imageVector = Icons.Default.Delete,
contentDescription = "Remove item",
tint = Color.White,
modifier = Modifier
.padding(12.dp)
modifier = Modifier.padding(12.dp)
)
}

Expand All @@ -294,8 +283,9 @@ fun SwipeCardItem(
}
}
) {
content(value)
content(todoItem)
}
// [END_EXCLUDE]
}
// [END android_compose_components_swipecarditem]

Expand All @@ -318,7 +308,7 @@ private fun SwipeCardItemExample() {
key = { it.itemDescription }
) { todoItem ->
SwipeCardItem(
value = todoItem,
todoItem = todoItem,
startToEndAction = {
todoItem.isItemDone = !todoItem.isItemDone
},
Expand Down