BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 11:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add combinedClickable, rippleCombinedClickable in Interaction

Browse Source
This commit is contained in:
fankesyooni
2023-12-03 01:35:43 +08:00
parent 2abe50fde5
commit 556ef3d55d
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/interaction/Interaction.kt
View File

@@ -36,6 +36,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import androidx.compose.foundation.clickable as foundationClickable import androidx.compose.foundation.clickable as foundationClickable
import androidx.compose.foundation.combinedClickable as foundationCombinedClickable
import androidx.compose.foundation.selection.selectable as foundationSelectable import androidx.compose.foundation.selection.selectable as foundationSelectable
import androidx.compose.foundation.selection.toggleable as foundationToggleable import androidx.compose.foundation.selection.toggleable as foundationToggleable
import androidx.compose.material.ripple.rememberRipple as materialRememberRipple import androidx.compose.material.ripple.rememberRipple as materialRememberRipple
@@ -60,6 +61,19 @@ fun Modifier.clickable(
onClick: () -> Unit onClick: () -> Unit
) = foundationClickable(interactionSource, indication, enabled, onClickLabel, role, onClick) ) = foundationClickable(interactionSource, indication, enabled, onClickLabel, role, onClick)
@Composable
fun Modifier.combinedClickable(
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
indication: Indication? = null,
enabled: Boolean = true,
onClickLabel: String? = null,
role: Role? = null,
onLongClickLabel: String? = null,
onLongClick: (() -> Unit)? = null,
onDoubleClick: (() -> Unit)? = null,
onClick: () -> Unit
) = foundationCombinedClickable(interactionSource, indication, enabled, onClickLabel, role, onLongClickLabel, onLongClick, onDoubleClick, onClick)
@Composable @Composable
fun Modifier.toggleable( fun Modifier.toggleable(
value: Boolean, value: Boolean,
@@ -97,6 +111,29 @@ fun Modifier.rippleClickable(
role = role role = role
) )
@Composable
fun Modifier.rippleCombinedClickable(
rippleStyle: RippleStyle = Interaction.rippleStyle,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
enabled: Boolean = true,
onClickLabel: String? = null,
role: Role? = null,
onLongClickLabel: String? = null,
onLongClick: (() -> Unit)? = null,
onDoubleClick: (() -> Unit)? = null,
onClick: () -> Unit
) = combinedClickable(
interactionSource = interactionSource,
indication = rememberRipple(rippleStyle),
enabled = enabled,
onClickLabel = onClickLabel,
role = role,
onLongClickLabel = onLongClickLabel,
onLongClick = onLongClick,
onDoubleClick = onDoubleClick,
onClick = onClick
)
@Composable @Composable
fun Modifier.rippleToggleable( fun Modifier.rippleToggleable(
value: Boolean, value: Boolean,