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

Jump to bottom

Fix SegmentedSwitch rendering in RTL #452

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Fix SegmentedSwitch rendering in RTL #452

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 13 additions & 6 deletions ui/src/main/java/kiwi/orbit/compose/ui/controls/SegmentedSwitch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.selected
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import kiwi.orbit.compose.ui.OrbitTheme
import kiwi.orbit.compose.ui.controls.field.FieldMessage
Expand Down Expand Up @@ -241,19 +243,24 @@ private fun SelectionOutline(
label = "SegmentedSwitchSelectedOffset",
)
val brushColor = OrbitTheme.colors.info.normal
val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
Canvas(
modifier = Modifier
.padding(1.dp)
.fillMaxSize(),
onDraw = {
val size = size.copy(width = size.width / optionsCount)
val rectSize = size.copy(width = size.width / optionsCount)
val topLeft = Offset(
x = when (isRtl) {
false -> animatedOffset * rectSize.width
true -> size.width - ((animatedOffset + 1) * rectSize.width)
},
y = 0f,
)
drawRoundRect(
brush = SolidColor(brushColor),
topLeft = Offset(
x = animatedOffset * size.width,
y = 0f,
),
size = size,
topLeft = topLeft,
size = rectSize,
cornerRadius = CornerRadius(5.dp.toPx(), 5.dp.toPx()),
style = Stroke(width = 2.dp.toPx()),
)
Expand Down