neoris/NewPipe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use faded marquee text in long press menu header

Browse Source
This commit is contained in:
Stypox 2025-02-14 14:36:21 +01:00
parent 612122c261
commit a18933792b
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
2 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenu.kt
View File

@ -7,7 +7,6 @@ import android.content.Context
import android.content.res.Configuration
import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams
import androidx.compose.foundation.basicMarquee
import androidx.compose.foundation.clickable
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
@ -75,6 +74,7 @@ import org.schabi.newpipe.ui.theme.AppTheme
import org.schabi.newpipe.ui.theme.customColors
import org.schabi.newpipe.util.Either
import org.schabi.newpipe.util.Localization
import org.schabi.newpipe.util.text.fadedMarquee
import java.time.OffsetDateTime
fun openLongPressMenuInActivity(
@ -356,19 +356,15 @@ fun LongPressMenuHeader(
}
Column(
modifier = Modifier.padding(vertical = 12.dp, horizontal = 12.dp),
modifier = Modifier.padding(vertical = 12.dp),
) {
val marquee = Modifier.basicMarquee(
// wait some time before starting animations, to not distract the user
initialDelayMillis = 4000,
iterations = Int.MAX_VALUE
)
Text(
text = item.title,
style = MaterialTheme.typography.titleMedium,
maxLines = 1,
modifier = marquee,
modifier = Modifier
.fillMaxWidth()
.fadedMarquee(edgeWidth = 12.dp),
)
val subtitle = getSubtitleAnnotatedString(
@ -389,7 +385,7 @@ fun LongPressMenuHeader(
Modifier.clickable(onClick = onUploaderClick)
}
.fillMaxWidth()
.then(marquee)
.fadedMarquee(edgeWidth = 12.dp)
)
}
}

54
app/src/main/java/org/schabi/newpipe/util/text/FadedMarqueeModifier.kt Normal file
View File

@ -0,0 +1,54 @@
package org.schabi.newpipe.util.text
import androidx.compose.foundation.MarqueeSpacing
import androidx.compose.foundation.basicMarquee
import androidx.compose.foundation.layout.padding
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.CompositingStrategy
import androidx.compose.ui.graphics.drawscope.ContentDrawScope
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.unit.Dp
/**
* Note: the values in [basicMarquee] are hardcoded, but feel free to expose them as parameters
* in case that will be needed in the future.
*
* Taken from sample [androidx.compose.foundation.samples.BasicMarqueeWithFadedEdgesSample].
*/
fun Modifier.fadedMarquee(edgeWidth: Dp): Modifier {
fun ContentDrawScope.drawFadedEdge(leftEdge: Boolean) {
val edgeWidthPx = edgeWidth.toPx()
drawRect(
topLeft = Offset(if (leftEdge) 0f else size.width - edgeWidthPx, 0f),
size = Size(edgeWidthPx, size.height),
brush = Brush.horizontalGradient(
colors = listOf(Color.Transparent, Color.Black),
startX = if (leftEdge) 0f else size.width,
endX = if (leftEdge) edgeWidthPx else size.width - edgeWidthPx
),
blendMode = BlendMode.DstIn
)
}
return this
.graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }
.drawWithContent {
drawContent()
drawFadedEdge(leftEdge = true)
drawFadedEdge(leftEdge = false)
}
.basicMarquee(
repeatDelayMillis = 2000,
// wait some time before starting animations, to not distract the user
initialDelayMillis = 4000,
iterations = Int.MAX_VALUE,
spacing = MarqueeSpacing(edgeWidth)
)
.padding(start = edgeWidth)
}