parent
3d7c136320
commit
10d7349506
@ -1,12 +0,0 @@
|
|||||||
package eu.kanade.core.navigation
|
|
||||||
|
|
||||||
import cafe.adriel.voyager.core.screen.ScreenKey
|
|
||||||
import cafe.adriel.voyager.core.screen.uniqueScreenKey
|
|
||||||
import cafe.adriel.voyager.core.screen.Screen as VoyagerScreen
|
|
||||||
|
|
||||||
// TODO: this prevents crashes in nested navigators with transitions not being disposed
|
|
||||||
// properly. Go back to using vanilla Voyager Screens once fixed upstream.
|
|
||||||
abstract class Screen : VoyagerScreen {
|
|
||||||
|
|
||||||
override val key: ScreenKey = uniqueScreenKey
|
|
||||||
}
|
|
@ -0,0 +1,261 @@
|
|||||||
|
package tachiyomi.presentation.core.components
|
||||||
|
|
||||||
|
import androidx.activity.compose.BackHandler
|
||||||
|
import androidx.compose.animation.core.animateFloatAsState
|
||||||
|
import androidx.compose.animation.core.tween
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.gestures.Orientation
|
||||||
|
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||||
|
import androidx.compose.foundation.layout.WindowInsets
|
||||||
|
import androidx.compose.foundation.layout.WindowInsetsSides
|
||||||
|
import androidx.compose.foundation.layout.consumeWindowInsets
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.offset
|
||||||
|
import androidx.compose.foundation.layout.only
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.requiredWidthIn
|
||||||
|
import androidx.compose.foundation.layout.systemBars
|
||||||
|
import androidx.compose.foundation.layout.systemBarsPadding
|
||||||
|
import androidx.compose.foundation.layout.widthIn
|
||||||
|
import androidx.compose.foundation.layout.windowInsetsPadding
|
||||||
|
import androidx.compose.foundation.shape.ZeroCornerSize
|
||||||
|
import androidx.compose.material.SwipeableState
|
||||||
|
import androidx.compose.material.rememberSwipeableState
|
||||||
|
import androidx.compose.material.swipeable
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.runtime.snapshotFlow
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.alpha
|
||||||
|
import androidx.compose.ui.geometry.Offset
|
||||||
|
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
|
||||||
|
import androidx.compose.ui.input.nestedscroll.NestedScrollSource
|
||||||
|
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||||
|
import androidx.compose.ui.unit.Dp
|
||||||
|
import androidx.compose.ui.unit.IntOffset
|
||||||
|
import androidx.compose.ui.unit.Velocity
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
import kotlinx.coroutines.flow.collectLatest
|
||||||
|
import kotlinx.coroutines.flow.drop
|
||||||
|
import kotlinx.coroutines.flow.filter
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import kotlin.math.roundToInt
|
||||||
|
import kotlin.time.Duration.Companion.milliseconds
|
||||||
|
|
||||||
|
private const val SheetAnimationDuration = 500
|
||||||
|
private val SheetAnimationSpec = tween<Float>(durationMillis = SheetAnimationDuration)
|
||||||
|
private const val ScrimAnimationDuration = 350
|
||||||
|
private val ScrimAnimationSpec = tween<Float>(durationMillis = ScrimAnimationDuration)
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun AdaptiveSheet(
|
||||||
|
isTabletUi: Boolean,
|
||||||
|
tonalElevation: Dp,
|
||||||
|
enableSwipeDismiss: Boolean,
|
||||||
|
onDismissRequest: () -> Unit,
|
||||||
|
content: @Composable () -> Unit,
|
||||||
|
) {
|
||||||
|
val scope = rememberCoroutineScope()
|
||||||
|
if (isTabletUi) {
|
||||||
|
var targetAlpha by remember { mutableStateOf(0f) }
|
||||||
|
val alpha by animateFloatAsState(
|
||||||
|
targetValue = targetAlpha,
|
||||||
|
animationSpec = ScrimAnimationSpec,
|
||||||
|
)
|
||||||
|
val internalOnDismissRequest: () -> Unit = {
|
||||||
|
scope.launch {
|
||||||
|
targetAlpha = 0f
|
||||||
|
delay(ScrimAnimationSpec.durationMillis.milliseconds)
|
||||||
|
onDismissRequest()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BoxWithConstraints(
|
||||||
|
modifier = Modifier
|
||||||
|
.clickable(
|
||||||
|
enabled = true,
|
||||||
|
interactionSource = remember { MutableInteractionSource() },
|
||||||
|
indication = null,
|
||||||
|
onClick = internalOnDismissRequest,
|
||||||
|
)
|
||||||
|
.fillMaxSize()
|
||||||
|
.alpha(alpha),
|
||||||
|
contentAlignment = Alignment.Center,
|
||||||
|
) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.matchParentSize()
|
||||||
|
.background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.32f)),
|
||||||
|
)
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier
|
||||||
|
.requiredWidthIn(max = 460.dp)
|
||||||
|
.clickable(
|
||||||
|
interactionSource = remember { MutableInteractionSource() },
|
||||||
|
indication = null,
|
||||||
|
onClick = {},
|
||||||
|
)
|
||||||
|
.systemBarsPadding()
|
||||||
|
.padding(vertical = 16.dp),
|
||||||
|
shape = MaterialTheme.shapes.extraLarge,
|
||||||
|
tonalElevation = tonalElevation,
|
||||||
|
content = {
|
||||||
|
BackHandler(enabled = alpha > 0f, onBack = internalOnDismissRequest)
|
||||||
|
content()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
LaunchedEffect(Unit) {
|
||||||
|
targetAlpha = 1f
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val swipeState = rememberSwipeableState(
|
||||||
|
initialValue = 1,
|
||||||
|
animationSpec = SheetAnimationSpec,
|
||||||
|
)
|
||||||
|
val internalOnDismissRequest: () -> Unit = { if (swipeState.currentValue == 0) scope.launch { swipeState.animateTo(1) } }
|
||||||
|
BoxWithConstraints(
|
||||||
|
modifier = Modifier
|
||||||
|
.clickable(
|
||||||
|
interactionSource = remember { MutableInteractionSource() },
|
||||||
|
indication = null,
|
||||||
|
onClick = internalOnDismissRequest,
|
||||||
|
)
|
||||||
|
.fillMaxSize(),
|
||||||
|
contentAlignment = Alignment.BottomCenter,
|
||||||
|
) {
|
||||||
|
val fullHeight = constraints.maxHeight.toFloat()
|
||||||
|
val anchors = mapOf(0f to 0, fullHeight to 1)
|
||||||
|
val scrimAlpha by animateFloatAsState(
|
||||||
|
targetValue = if (swipeState.targetValue == 1) 0f else 1f,
|
||||||
|
animationSpec = ScrimAnimationSpec,
|
||||||
|
)
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.matchParentSize()
|
||||||
|
.alpha(scrimAlpha)
|
||||||
|
.background(MaterialTheme.colorScheme.scrim.copy(alpha = 0.32f)),
|
||||||
|
)
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier
|
||||||
|
.widthIn(max = 460.dp)
|
||||||
|
.clickable(
|
||||||
|
interactionSource = remember { MutableInteractionSource() },
|
||||||
|
indication = null,
|
||||||
|
onClick = {},
|
||||||
|
)
|
||||||
|
.nestedScroll(
|
||||||
|
remember(enableSwipeDismiss, anchors) {
|
||||||
|
swipeState.preUpPostDownNestedScrollConnection(
|
||||||
|
enabled = enableSwipeDismiss,
|
||||||
|
anchor = anchors,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.offset {
|
||||||
|
IntOffset(
|
||||||
|
0,
|
||||||
|
swipeState.offset.value.roundToInt(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.swipeable(
|
||||||
|
enabled = enableSwipeDismiss,
|
||||||
|
state = swipeState,
|
||||||
|
anchors = anchors,
|
||||||
|
orientation = Orientation.Vertical,
|
||||||
|
resistance = null,
|
||||||
|
)
|
||||||
|
.windowInsetsPadding(
|
||||||
|
WindowInsets.systemBars
|
||||||
|
.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
|
||||||
|
)
|
||||||
|
.consumeWindowInsets(
|
||||||
|
WindowInsets.systemBars
|
||||||
|
.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal),
|
||||||
|
),
|
||||||
|
shape = MaterialTheme.shapes.extraLarge.copy(bottomStart = ZeroCornerSize, bottomEnd = ZeroCornerSize),
|
||||||
|
tonalElevation = tonalElevation,
|
||||||
|
content = {
|
||||||
|
BackHandler(enabled = swipeState.targetValue == 0, onBack = internalOnDismissRequest)
|
||||||
|
content()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
LaunchedEffect(swipeState) {
|
||||||
|
scope.launch { swipeState.animateTo(0) }
|
||||||
|
snapshotFlow { swipeState.currentValue }
|
||||||
|
.drop(1)
|
||||||
|
.filter { it == 1 }
|
||||||
|
.collectLatest {
|
||||||
|
delay(ScrimAnimationSpec.durationMillis.milliseconds)
|
||||||
|
onDismissRequest()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Yoinked from Swipeable.kt with modifications to disable
|
||||||
|
*/
|
||||||
|
private fun <T> SwipeableState<T>.preUpPostDownNestedScrollConnection(
|
||||||
|
enabled: Boolean = true,
|
||||||
|
anchor: Map<Float, T>,
|
||||||
|
) = object : NestedScrollConnection {
|
||||||
|
override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
|
||||||
|
val delta = available.toFloat()
|
||||||
|
return if (enabled && delta < 0 && source == NestedScrollSource.Drag) {
|
||||||
|
performDrag(delta).toOffset()
|
||||||
|
} else {
|
||||||
|
Offset.Zero
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onPostScroll(
|
||||||
|
consumed: Offset,
|
||||||
|
available: Offset,
|
||||||
|
source: NestedScrollSource,
|
||||||
|
): Offset {
|
||||||
|
return if (enabled && source == NestedScrollSource.Drag) {
|
||||||
|
performDrag(available.toFloat()).toOffset()
|
||||||
|
} else {
|
||||||
|
Offset.Zero
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun onPreFling(available: Velocity): Velocity {
|
||||||
|
val toFling = Offset(available.x, available.y).toFloat()
|
||||||
|
return if (enabled && toFling < 0 && offset.value > anchor.keys.minOrNull()!!) {
|
||||||
|
performFling(velocity = toFling)
|
||||||
|
// since we go to the anchor with tween settling, consume all for the best UX
|
||||||
|
available
|
||||||
|
} else {
|
||||||
|
Velocity.Zero
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
|
||||||
|
return if (enabled) {
|
||||||
|
performFling(velocity = Offset(available.x, available.y).toFloat())
|
||||||
|
available
|
||||||
|
} else {
|
||||||
|
Velocity.Zero
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun Float.toOffset(): Offset = Offset(0f, this)
|
||||||
|
|
||||||
|
private fun Offset.toFloat(): Float = this.y
|
||||||
|
}
|
@ -0,0 +1,133 @@
|
|||||||
|
package tachiyomi.presentation.core.screens
|
||||||
|
|
||||||
|
import androidx.annotation.StringRes
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.paddingFromBaseline
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import tachiyomi.presentation.core.components.material.padding
|
||||||
|
import tachiyomi.presentation.core.util.secondaryItemAlpha
|
||||||
|
import kotlin.random.Random
|
||||||
|
|
||||||
|
data class EmptyScreenAction(
|
||||||
|
@StringRes val stringResId: Int,
|
||||||
|
val icon: ImageVector,
|
||||||
|
val onClick: () -> Unit,
|
||||||
|
)
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun EmptyScreen(
|
||||||
|
@StringRes textResource: Int,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
actions: List<EmptyScreenAction>? = null,
|
||||||
|
) {
|
||||||
|
EmptyScreen(
|
||||||
|
message = stringResource(textResource),
|
||||||
|
modifier = modifier,
|
||||||
|
actions = actions,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun EmptyScreen(
|
||||||
|
message: String,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
actions: List<EmptyScreenAction>? = null,
|
||||||
|
) {
|
||||||
|
val face = remember { getRandomErrorFace() }
|
||||||
|
Column(
|
||||||
|
modifier = modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.padding(horizontal = 24.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
verticalArrangement = Arrangement.Center,
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = face,
|
||||||
|
modifier = Modifier.secondaryItemAlpha(),
|
||||||
|
style = MaterialTheme.typography.displayMedium,
|
||||||
|
)
|
||||||
|
|
||||||
|
Text(
|
||||||
|
text = message,
|
||||||
|
modifier = Modifier.paddingFromBaseline(top = 24.dp).secondaryItemAlpha(),
|
||||||
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
)
|
||||||
|
|
||||||
|
if (!actions.isNullOrEmpty()) {
|
||||||
|
Row(
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(
|
||||||
|
top = 24.dp,
|
||||||
|
start = 24.dp,
|
||||||
|
end = 24.dp,
|
||||||
|
),
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
|
||||||
|
) {
|
||||||
|
actions.forEach {
|
||||||
|
ActionButton(
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
title = stringResource(it.stringResId),
|
||||||
|
icon = it.icon,
|
||||||
|
onClick = it.onClick,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun ActionButton(
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
title: String,
|
||||||
|
icon: ImageVector,
|
||||||
|
onClick: () -> Unit,
|
||||||
|
) {
|
||||||
|
TextButton(
|
||||||
|
modifier = modifier,
|
||||||
|
onClick = onClick,
|
||||||
|
) {
|
||||||
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
Icon(
|
||||||
|
imageVector = icon,
|
||||||
|
contentDescription = null,
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(4.dp))
|
||||||
|
Text(
|
||||||
|
text = title,
|
||||||
|
textAlign = TextAlign.Center,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private val ERROR_FACES = listOf(
|
||||||
|
"(・o・;)",
|
||||||
|
"Σ(ಠ_ಠ)",
|
||||||
|
"ಥ_ಥ",
|
||||||
|
"(˘・_・˘)",
|
||||||
|
"(; ̄Д ̄)",
|
||||||
|
"(・Д・。",
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun getRandomErrorFace(): String {
|
||||||
|
return ERROR_FACES[Random.nextInt(ERROR_FACES.size)]
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package tachiyomi.presentation.core.components
|
package tachiyomi.presentation.core.screens
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
Loading…
Reference in new issue