IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverted swipe modifier to original

Browse Source
This commit is contained in:
Jesse Horne
2023-11-28 13:57:46 -05:00
parent 64662435e2
commit ff3ad7487c
3 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/Modifiers.android.kt
View File

@@ -1,44 +0,0 @@
package chat.simplex.common.views.helpers
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.offset
import androidx.compose.material.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.layout
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.LayoutDirection
import kotlin.math.roundToInt
fun Modifier.badgeLayout() =
layout { measurable, constraints ->
val placeable = measurable.measure(constraints)
// based on the expectation of only one line of text
val minPadding = placeable.height / 4
val width = maxOf(placeable.width + minPadding, placeable.height)
layout(width, placeable.height) {
placeable.place((width - placeable.width) / 2, 0)
}
}
@Composable
actual fun SwipeToDismissModifier(
state: DismissState,
directions: Set<DismissDirection>,
swipeDistance: Float,
): Modifier {
val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
val anchors = mutableMapOf(0f to DismissValue.Default)
if (DismissDirection.StartToEnd in directions) anchors += swipeDistance to DismissValue.DismissedToEnd
if (DismissDirection.EndToStart in directions) anchors += -swipeDistance to DismissValue.DismissedToStart
return Modifier.swipeable(
state = state,
anchors = anchors,
thresholds = { _, _ -> FractionalThreshold(0.5f) },
orientation = Orientation.Horizontal,
reverseDirection = isRtl,
).offset { IntOffset(state.offset.value.roundToInt(), 0) }
}

19
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Modifiers.kt
View File

@@ -25,8 +25,21 @@ fun Modifier.badgeLayout() =
}
@Composable
expect fun SwipeToDismissModifier(
fun SwipeToDismissModifier(
state: DismissState,
directions: Set<DismissDirection> = setOf(DismissDirection.EndToStart, DismissDirection.StartToEnd),
directions: Set<DismissDirection>,
swipeDistance: Float,
): Modifier
): Modifier {
val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
val anchors = mutableMapOf(0f to DismissValue.Default)
if (DismissDirection.StartToEnd in directions) anchors += swipeDistance to DismissValue.DismissedToEnd
if (DismissDirection.EndToStart in directions) anchors += -swipeDistance to DismissValue.DismissedToStart
return Modifier.swipeable(
state = state,
anchors = anchors,
thresholds = { _, _ -> FractionalThreshold(0.5f) },
orientation = Orientation.Horizontal,
reverseDirection = isRtl,
).offset { IntOffset(state.offset.value.roundToInt(), 0) }
}

14
apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Modifiers.desktop.kt
View File

@@ -1,14 +0,0 @@
package chat.simplex.common.views.helpers
import androidx.compose.material.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@Composable
actual fun SwipeToDismissModifier(
state: DismissState,
directions: Set<DismissDirection>,
swipeDistance: Float,
): Modifier {
return Modifier
}