admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use m3 ripple and clean up interactionSource usage (#675)

Browse Source 
Also remove a leftover of scoped storage adaptation.

(cherry picked from commit f27ca3b1b2f92258c213bca6b27d8eff4c7363ad)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
This commit is contained in:
FooIbar
2024-04-17 15:21:24 +08:00
committed by Jobobby04
parent b24719a3e9
commit 5895e78b39
7 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
presentation-core/src/main/java/tachiyomi/presentation/core/components/AdaptiveSheet.kt
+4 -6
View File
@@ -10,7 +10,6 @@ import androidx.compose.foundation.gestures.DraggableAnchors
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.anchoredDraggable
import androidx.compose.foundation.gestures.animateTo
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
@@ -78,8 +77,7 @@ fun AdaptiveSheet(
Box(
modifier = Modifier
.clickable(
enabled = true,
interactionSource = remember { MutableInteractionSource() },
interactionSource = null,
indication = null,
onClick = internalOnDismissRequest,
)
@@ -91,7 +89,7 @@ fun AdaptiveSheet(
modifier = Modifier
.requiredWidthIn(max = 460.dp)
.clickable(
interactionSource = remember { MutableInteractionSource() },
interactionSource = null,
indication = null,
onClick = {},
)
@@ -129,7 +127,7 @@ fun AdaptiveSheet(
Box(
modifier = Modifier
.clickable(
interactionSource = remember { MutableInteractionSource() },
interactionSource = null,
indication = null,
onClick = internalOnDismissRequest,
)
@@ -147,7 +145,7 @@ fun AdaptiveSheet(
modifier = Modifier
.widthIn(max = 460.dp)
.clickable(
interactionSource = remember { MutableInteractionSource() },
interactionSource = null,
indication = null,
onClick = {},
)
presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Surface.kt
+1 -1
View File
@@ -6,13 +6,13 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.material.ripple
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.LocalAbsoluteTonalElevation
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.contentColorFor
import androidx.compose.material3.minimumInteractiveComponentSize
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.NonRestartableComposable
presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt
+6 -9
View File
@@ -1,7 +1,6 @@
package tachiyomi.presentation.core.util
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.isImeVisible
@@ -42,14 +41,12 @@ fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(SecondaryItemAlpha)
fun Modifier.clickableNoIndication(
onLongClick: (() -> Unit)? = null,
onClick: () -> Unit,
): Modifier = composed {
Modifier.combinedClickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
onLongClick = onLongClick,
onClick = onClick,
)
}
) = this.combinedClickable(
interactionSource = null,
indication = null,
onLongClick = onLongClick,
onClick = onClick,
)
/**
* For TextField, the provided [action] will be invoked when