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

fix: icon placement in rtl layouts #33

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

fix: icon placement in rtl layouts #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a35f21e
fix: icon placement in rtl layouts
JunkFood02 Oct 2, 2024
0867761
test: add test for rtl
JunkFood02 Nov 23, 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
4 changes: 2 additions & 2 deletions library/src/commonMain/kotlin/me/saket/swipe/SwipeableActionsBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ private fun ActionIconBox(
layout(width = placeable.width, height = placeable.height) {
// Align icon with the left/right edge of the content being swiped.
val iconOffset = if (action.isOnRightSide) constraints.maxWidth + offset else offset - placeable.width
placeable.placeRelative(x = iconOffset.roundToInt(), y = 0)
placeable.place(x = iconOffset.roundToInt(), y = 0)
}
}
.background(color = backgroundColor),
horizontalArrangement = if (action.isOnRightSide) Arrangement.Start else Arrangement.End,
horizontalArrangement = if (action.isOnRightSide) Arrangement.Absolute.Left else Arrangement.Absolute.Right,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a screenshot test to verify this? Here are some examples: https://github.com/saket/swipe/blob/trunk/library/src/test/kotlin/me/saket/swipe/SwipeableActionsBoxTest.kt#L43

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I did this correctly. Please take another look!

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep this looks good, thank you!

verticalAlignment = Alignment.CenterVertically,
) {
content()
Expand Down
20 changes: 20 additions & 0 deletions library/src/test/kotlin/me/saket/swipe/SwipeableActionsBoxTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,19 @@ import androidx.compose.material.icons.twotone.Snooze
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.isSpecified
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import app.cash.paparazzi.DeviceConfig
import app.cash.paparazzi.Paparazzi
Expand Down Expand Up @@ -140,6 +144,22 @@ class SwipeableActionsBoxTest {
}
}

@Test
fun `rtl alignment test`() {
paparazzi.snapshot {
CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
Scaffold {
SwipeableActionsBox(
state = rememberSwipeActionsState(initialOffset = 80.dp),
startActions = listOf(replyAll),
endActions = listOf(snooze),
content = { BatmanIpsumItem() },
)
}
}
}
}

@Composable
private fun Scaffold(content: @Composable BoxWithConstraintsScope.() -> Unit) {
BoxWithConstraints(
Expand Down
Binary file added .../snapshots/images/me.saket.swipe_SwipeableActionsBoxTest_rtl alignment test.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.