fankes/pagecurl-multiplatform
2
0
Fork 0
mirror of https://github.com/fankes/pagecurl-multiplatform.git synced 2025-09-08 03:24:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add tap gestures support in lib, rework settings popup

Browse Source
This commit is contained in:
Oleksandr Balan
2022-07-24 16:50:44 +02:00
parent 840093c2e7
commit faa198f7b0
9 changed files with 280 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
demo/src/main/kotlin/eu/wewox/pagecurl/MainActivity.kt
View File

@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -22,12 +23,17 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.center
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.unit.toOffset
import eu.wewox.pagecurl.components.SettingsAction
import eu.wewox.pagecurl.components.SettingsPopup
import eu.wewox.pagecurl.components.overlayControls
import eu.wewox.pagecurl.config.InteractionConfig
import eu.wewox.pagecurl.config.PageCurlConfig
import eu.wewox.pagecurl.config.copy
import eu.wewox.pagecurl.page.PageCurl
import eu.wewox.pagecurl.page.PageCurlState
import eu.wewox.pagecurl.page.rememberPageCurlState
import eu.wewox.pagecurl.ui.theme.PageCurlTheme
import kotlinx.coroutines.launch
@@ -38,28 +44,28 @@ class MainActivity : ComponentActivity() {
setContent {
PageCurlTheme {
Box {
val scope = rememberCoroutineScope()
val state = rememberPageCurlState(max = 6)
var showPopup by remember { mutableStateOf(false) }
var interaction by remember {
mutableStateOf(
InteractionConfig(
tap = InteractionConfig.Tap(
custom = InteractionConfig.Tap.CustomInteraction(true) { size, position ->
if ((position - size.center.toOffset()).getDistance() < 64.dp.toPx()) {
showPopup = true
true
} else {
false
}
}
)
)
)
}
PageCurl(
state = state,
config = PageCurlConfig(),
modifier = Modifier.overlayControls(
next = {
scope.launch {
state.next()
}
},
prev = {
scope.launch {
state.prev()
}
},
center = {
showPopup = true
}
)
config = PageCurlConfig(interaction = interaction)
) { index ->
Box(
modifier = Modifier
@@ -96,17 +102,10 @@ class MainActivity : ComponentActivity() {
if (showPopup) {
SettingsPopup(
onSnapToFirst = {
scope.launch {
state.snapTo(0)
showPopup = false
}
},
onSnapToLast = {
scope.launch {
state.snapTo(state.max - 1)
showPopup = false
}
state = state,
interaction = interaction,
onConfigChange = {
interaction = it
},
onDismiss = {
showPopup = false
@@ -119,6 +118,46 @@ class MainActivity : ComponentActivity() {
}
}
@Composable
private fun SettingsPopup(
state: PageCurlState,
interaction: InteractionConfig,
onConfigChange: (InteractionConfig) -> Unit,
onDismiss: () -> Unit,
) {
val scope = rememberCoroutineScope()
SettingsPopup(
interactionConfig = interaction,
onAction = { action ->
when (action) {
SettingsAction.GoToFirst -> {
scope.launch {
state.snapTo(0)
}
}
SettingsAction.GoToLast -> {
scope.launch {
state.snapTo(state.max - 1)
}
}
is SettingsAction.ForwardDragEnabled -> {
onConfigChange(interaction.copy(dragForwardEnabled = action.value))
}
is SettingsAction.BackwardDragEnabled -> {
onConfigChange(interaction.copy(dragBackwardEnabled = action.value))
}
is SettingsAction.ForwardTapEnabled -> {
onConfigChange(interaction.copy(tapForwardEnabled = action.value))
}
is SettingsAction.BackwardTapEnabled -> {
onConfigChange(interaction.copy(tapBackwardEnabled = action.value))
}
}
},
onDismiss = onDismiss
)
}
private object Data {
val Lorem1 =
"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam erat volutpat. Phasellus enim erat, vestibulum vel, aliquam a, posuere eu, velit. Et harum quidem rerum facilis est et expedita distinctio. In sem justo, commodo ut, suscipit at, pharetra vitae, orci. Vestibulum fermentum tortor id mi. Sed elit dui, pellentesque a, faucibus vel, interdum nec, diam. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat. Nunc tincidunt ante vitae massa. Maecenas fermentum, sem in pharetra pellentesque, velit turpis volutpat ante, in pharetra metus odio a lectus. Proin in tellus sit amet nibh dignissim sagittis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Etiam posuere lacus quis dolor. Class aptent taciti sociosqu ad litora."