yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

composed Modifier changes (#9631)

Browse Source 
Referring at the examples and other internal usages, the
resulting stateful Modifier should be separated from
all the previous Modifier chain.
This commit is contained in:
Ivan Iskandar 2023-06-24 04:54:01 +07:00 committed by GitHub
parent 6808fbbb21
commit 25b0458930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt
View File

@ -245,7 +245,7 @@ private fun Modifier.commonClickable(
) = composed { ) = composed {
val haptic = LocalHapticFeedback.current val haptic = LocalHapticFeedback.current
this.combinedClickable( Modifier.combinedClickable(
enabled = enabled, enabled = enabled,
onLongClick = { onLongClick = {
onLongClick() onLongClick()

2
app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt
View File

@ -113,7 +113,7 @@ internal fun Modifier.highlightBackground(highlighted: Boolean): Modifier = comp
tween(200) tween(200)
}, },
) )
then(Modifier.background(color = highlight)) Modifier.background(color = highlight)
} }
internal val TrailingWidgetBuffer = 16.dp internal val TrailingWidgetBuffer = 16.dp

29
presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
View File

@ -29,20 +29,21 @@ import tachiyomi.presentation.core.components.Pill
private fun Modifier.tabIndicatorOffset( private fun Modifier.tabIndicatorOffset(
currentTabPosition: TabPosition, currentTabPosition: TabPosition,
currentPageOffsetFraction: Float, currentPageOffsetFraction: Float,
) = composed { ) = fillMaxWidth()
val currentTabWidth by animateDpAsState( .wrapContentSize(Alignment.BottomStart)
targetValue = currentTabPosition.width, .composed {
animationSpec = spring(stiffness = Spring.StiffnessMediumLow), val currentTabWidth by animateDpAsState(
) targetValue = currentTabPosition.width,
val offset by animateDpAsState( animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
targetValue = currentTabPosition.left + (currentTabWidth * currentPageOffsetFraction), )
animationSpec = spring(stiffness = Spring.StiffnessMediumLow), val offset by animateDpAsState(
) targetValue = currentTabPosition.left + (currentTabWidth * currentPageOffsetFraction),
fillMaxWidth() animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
.wrapContentSize(Alignment.BottomStart) )
.offset { IntOffset(x = offset.roundToPx(), y = 0) } Modifier
.width(currentTabWidth) .offset { IntOffset(x = offset.roundToPx(), y = 0) }
} .width(currentTabWidth)
}
@Composable @Composable
fun TabIndicator( fun TabIndicator(

12
presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt
View File

@ -25,13 +25,13 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalFocusManager
import tachiyomi.presentation.core.components.material.SecondaryItemAlpha import tachiyomi.presentation.core.components.material.SecondaryItemAlpha
fun Modifier.selectedBackground(isSelected: Boolean): Modifier = composed { fun Modifier.selectedBackground(isSelected: Boolean): Modifier = if (isSelected) {
if (isSelected) { composed {
val alpha = if (isSystemInDarkTheme()) 0.16f else 0.22f val alpha = if (isSystemInDarkTheme()) 0.16f else 0.22f
background(MaterialTheme.colorScheme.secondary.copy(alpha = alpha)) Modifier.background(MaterialTheme.colorScheme.secondary.copy(alpha = alpha))
} else {
this
} }
} else {
this
} }
fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(SecondaryItemAlpha) fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(SecondaryItemAlpha)
@ -40,7 +40,7 @@ fun Modifier.clickableNoIndication(
onLongClick: (() -> Unit)? = null, onLongClick: (() -> Unit)? = null,
onClick: () -> Unit, onClick: () -> Unit,
): Modifier = composed { ): Modifier = composed {
this.combinedClickable( Modifier.combinedClickable(
interactionSource = remember { MutableInteractionSource() }, interactionSource = remember { MutableInteractionSource() },
indication = null, indication = null,
onLongClick = onLongClick, onLongClick = onLongClick,