Skip to content

[Feature] #2

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
TeddKo merged 1 commit into from
Nov 4, 2024
Merged

[Feature] #2

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion library/ui/src/main/kotlin/tddy/ko/cardstack/ui/CardStack.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch

/**
Expand Down Expand Up @@ -294,7 +295,7 @@ private fun DraggableCard(
}
.shadow(elevation = animatedElevation.dp, shape = RoundedCornerShape(12.dp))
.then(
if (index == 0 && !isAnimating) {
if (!isAnimating) {
Modifier.pointerInput(Unit) {
val velocityTracker = VelocityTracker()
detectDragGestures(
Expand Down Expand Up @@ -328,9 +329,11 @@ private fun DraggableCard(
cardAlignment = cardAlignment
)
offset = targetOffset
delay(10)
updatedOnSwipe(direction)
}
offset = Offset.Zero
delay(10)
isAnimating = false
}
}
Expand Down
77 changes: 32 additions & 45 deletions library/ui/src/main/kotlin/tddy/ko/cardstack/ui/CardStackHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.ui.graphics.GraphicsLayerScope
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.Velocity
import kotlin.math.absoluteValue
import kotlin.math.pow

/**
* Represents the possible directions for card swiping gestures.
Expand Down Expand Up @@ -111,8 +112,6 @@ internal fun calculateSwipeProgress(offset: Offset, velocityThresholdPx: Float):
* Calculates the scale factor for each card in the stack.
*
* @param index The index of the card in the stack
* @param itemCount Total number of cards
* @param stackDragProgress The current drag progress of the stack
* @return The calculated scale factor
**/
internal fun calculateScales(index: Int, itemCount: Int, stackDragProgress: Float): Float {
Expand Down Expand Up @@ -165,52 +164,40 @@ internal fun calculateDragBasedOffset(
spacingPx: Float,
itemCount: Int,
cardAlignment: CardAlignment
): Offset = when {
index == itemCount - 1 && stackDragProgress < 0f -> {
val progress = stackDragProgress * (itemCount - index)
when (cardAlignment) {
CardAlignment.TOP -> Offset(0f, -(spacingPx * progress) * progress)
CardAlignment.BOTTOM -> Offset(0f, (spacingPx * progress) * progress)
CardAlignment.TOP_START, CardAlignment.BOTTOM_START ->
Offset(
(spacingPx * progress) * progress,
(spacingPx * progress) * progress * if (cardAlignment == CardAlignment.BOTTOM_START) 1 else -1
)

CardAlignment.TOP_END, CardAlignment.BOTTOM_END ->
Offset(
-(spacingPx * progress) * progress,
(spacingPx * progress) * progress * if (cardAlignment == CardAlignment.BOTTOM_END) 1 else -1
)

CardAlignment.START -> Offset((spacingPx * progress) * progress, 0f)
CardAlignment.END -> Offset(-(spacingPx * progress) * progress, 0f)
}
): Offset {
val progress = if (index == itemCount - 1 && stackDragProgress < 0f) {
(-stackDragProgress).coerceIn(0f, 1f)
} else {
(stackDragProgress * (1f - (index.toFloat() / itemCount))).coerceIn(-1f, 1f)
}

index > 0 && stackDragProgress != 0f -> {
val progress = (stackDragProgress * (itemCount - index)).coerceIn(0f, 1f)
when (cardAlignment) {
CardAlignment.TOP -> Offset(0f, -spacingPx * progress)
CardAlignment.BOTTOM -> Offset(0f, spacingPx * progress)
CardAlignment.TOP_START, CardAlignment.BOTTOM_START ->
Offset(
spacingPx * progress,
spacingPx * progress * if (cardAlignment == CardAlignment.BOTTOM_START) 1 else -1
)

CardAlignment.TOP_END, CardAlignment.BOTTOM_END ->
Offset(
-spacingPx * progress,
spacingPx * progress * if (cardAlignment == CardAlignment.BOTTOM_END) 1 else -1
)

CardAlignment.START -> Offset(spacingPx * progress, 0f)
CardAlignment.END -> Offset(-spacingPx * progress, 0f)
}
val easedProgress = progress * progress * (3 - 2 * progress)

return when (cardAlignment) {
CardAlignment.TOP -> Offset(
0f,
spacingPx * easedProgress * if (index == itemCount - 1 && stackDragProgress < 0f) 1f else -1f
)
CardAlignment.BOTTOM -> Offset(0f, spacingPx * easedProgress)
CardAlignment.TOP_START -> Offset(
spacingPx * easedProgress,
-spacingPx * easedProgress
)
CardAlignment.BOTTOM_START -> Offset(
spacingPx * easedProgress,
spacingPx * easedProgress
)
CardAlignment.TOP_END -> Offset(
-spacingPx * easedProgress,
-spacingPx * easedProgress
)
CardAlignment.BOTTOM_END -> Offset(
-spacingPx * easedProgress,
spacingPx * easedProgress
)
CardAlignment.START -> Offset(spacingPx * easedProgress, 0f)
CardAlignment.END -> Offset(-spacingPx * easedProgress, 0f)
}

else -> Offset.Zero
}

/**
Expand Down