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

[fluent] feat: Implement GridViewItem ,FlipView and PipsPager component #98

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

[fluent] feat: Implement GridViewItem ,FlipView and PipsPager component #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cfa11e
[fluent] feat: Implement GridViewItem component
Sanlorng Dec 20, 2024
f9c70f3
[fluent] Add FlipView component
Sanlorng Dec 22, 2024
9469366
[fluent] feat: Add PipsPager component
Sanlorng Dec 22, 2024
1f39b80
[fluent] Fix: PipsPager scroll calculation
Sanlorng Dec 22, 2024
abedb35
[fluent] Fix: Correct order of modifiers in PipsPagerItem
Sanlorng Dec 22, 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
43 changes: 26 additions & 17 deletions fluent/src/commonMain/kotlin/com/konyaco/fluent/background/Layer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,18 +172,26 @@ private fun Modifier.layer(
@Immutable
@JvmInline
internal value class BackgroundPaddingShape(private val borderShape: CornerBasedShape) : Shape {

override fun createOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline {
return with(density) {
createInnerOutline(size, density, layoutDirection, borderShape.calculateBorderPadding(density))
LayerShapeHelper.createInnerOutline(borderShape, size, density, layoutDirection, borderShape.calculateBorderPadding(density))
}
}
}

internal object LayerShapeHelper {

/**
* Fork from [CornerBasedShape.createOutline], add padding to corner size and outline rect size.
*/
private fun createInnerOutline(size: Size, density: Density, layoutDirection: LayoutDirection, paddingPx: Float) =
borderShape.run {
fun createInnerOutline(
outsideShape: CornerBasedShape,
size: Size,
density: Density,
layoutDirection: LayoutDirection,
paddingPx: Float,
): Outline {
return outsideShape.run {
val cornerPaddingPx = if (this is CutCornerShape) {
/** padding for cut corner shape */
(paddingPx / sqrt(2f)).toInt().toFloat()
Expand All @@ -192,10 +200,10 @@ internal value class BackgroundPaddingShape(private val borderShape: CornerBased
}
val innerSize = Size(size.width - 2 * paddingPx, size.height - 2 * paddingPx)
/** add padding to corner size */
var topStart = (borderShape.topStart.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var topEnd = (borderShape.topEnd.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var bottomEnd = (borderShape.bottomEnd.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var bottomStart = (borderShape.bottomStart.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var topStart = (outsideShape.topStart.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var topEnd = (outsideShape.topEnd.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var bottomEnd = (outsideShape.bottomEnd.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
var bottomStart = (outsideShape.bottomStart.toPx(size, density) - cornerPaddingPx).coerceAtLeast(0f)
val minDimension = innerSize.minDimension
if (topStart + bottomStart > minDimension) {
val scale = minDimension / (topStart + bottomStart)
Expand Down Expand Up @@ -227,40 +235,41 @@ internal value class BackgroundPaddingShape(private val borderShape: CornerBased
is Outline.Generic -> Outline.Generic(oldOutline.path.apply { translate(Offset(paddingPx, paddingPx)) })
}
}
}
}

/**
* This is a workaround solution to eliminate 1 pixel gap
* when density is not integer or `(density % 1) < 0.5`
*/
@Stable
private fun calcPadding(density: Density): Dp {
private fun calcPadding(density: Density, borderSize: Dp): Dp {
val remainder = density.density % 1f

return with(density) {
when {
remainder == 0f -> 1.dp
else -> (1.dp.toPx() - remainder + 1).toDp()
remainder == 0f -> borderSize
else -> (borderSize.toPx() - remainder + 1).toDp()
}
}
}

@Stable
private fun calcCircularPadding(density: Density): Dp {
private fun calcCircularPadding(density: Density, borderSize: Dp): Dp {
val remainder = density.density % 1f

return with(density) {
if (remainder == 0f) 1.dp
else (1.dp.toPx() - remainder + 1).toDp()
if (remainder == 0f) borderSize
else (borderSize.toPx() - remainder + 1).toDp()
}
}

internal fun Shape.calculateBorderPadding(density: Density): Float {
internal fun Shape.calculateBorderPadding(density: Density, borderSize: Dp = 1.dp): Float {
val circular = this == CircleShape
return with(density) {
when {
circular -> calcCircularPadding(density)
else -> calcPadding(density)
circular -> calcCircularPadding(density, borderSize)
else -> calcPadding(density, borderSize)
}.toPx()
}
}
Loading