justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fix backdrop colors when RTL

Browse source
This commit is contained in:
Damontecres 2026-05-16 12:28:04 -04:00
parent 59ccce9d54
commit bd767c570b
No known key found for this signature in database
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/github/damontecres/wholphin/ui/nav/Backdrop.kt
View file

@ -23,6 +23,8 @@ import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.unit.LayoutDirection
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.tv.material3.MaterialTheme import androidx.tv.material3.MaterialTheme
@ -75,6 +77,7 @@ fun Backdrop(
useExistingImageAsPlaceholder: Boolean = false, useExistingImageAsPlaceholder: Boolean = false,
crossfadeDuration: Duration = 800.milliseconds, crossfadeDuration: Duration = 800.milliseconds,
) { ) {
val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
val baseBackgroundColor = MaterialTheme.colorScheme.background val baseBackgroundColor = MaterialTheme.colorScheme.background
if (backdrop.hasColors && if (backdrop.hasColors &&
(backdropStyle == BackdropStyle.BACKDROP_DYNAMIC_COLOR || backdropStyle == BackdropStyle.UNRECOGNIZED) (backdropStyle == BackdropStyle.BACKDROP_DYNAMIC_COLOR || backdropStyle == BackdropStyle.UNRECOGNIZED)
@ -100,12 +103,14 @@ fun Backdrop(
.fillMaxSize() .fillMaxSize()
.drawBehind { .drawBehind {
drawRect(color = baseBackgroundColor) drawRect(color = baseBackgroundColor)
val start = if (isRtl) size.width else 0f
val end = if (isRtl) 0f else size.width
// Top Left (Vibrant/Muted) // Top Left (Vibrant/Muted)
drawRect( drawRect(
brush = brush =
Brush.radialGradient( Brush.radialGradient(
colors = listOf(animSecondary, Color.Transparent), colors = listOf(animSecondary, Color.Transparent),
center = Offset(0f, 0f), center = Offset(start, 0f),
radius = size.width * 0.8f, radius = size.width * 0.8f,
), ),
) )
@ -114,7 +119,7 @@ fun Backdrop(
brush = brush =
Brush.radialGradient( Brush.radialGradient(
colors = listOf(animPrimary, Color.Transparent), colors = listOf(animPrimary, Color.Transparent),
center = Offset(size.width, size.height), center = Offset(end, size.height),
radius = size.width * 0.8f, radius = size.width * 0.8f,
), ),
) )
@ -127,7 +132,7 @@ fun Backdrop(
baseBackgroundColor, baseBackgroundColor,
Color.Transparent, Color.Transparent,
), ),
center = Offset(0f, size.height), center = Offset(start, size.height),
radius = size.width * 0.8f, radius = size.width * 0.8f,
), ),
) )
@ -136,7 +141,7 @@ fun Backdrop(
brush = brush =
Brush.radialGradient( Brush.radialGradient(
colors = listOf(animTertiary, Color.Transparent), colors = listOf(animTertiary, Color.Transparent),
center = Offset(size.width, 0f), center = Offset(end, 0f),
radius = size.width * 0.8f, radius = size.width * 0.8f,
), ),
) )
@ -165,6 +170,7 @@ fun Backdrop(
.fillMaxWidth(.7f) .fillMaxWidth(.7f)
.graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen) .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
.drawWithContent { .drawWithContent {
val start = if (isRtl) size.width else 0f
drawContent() drawContent()
if (drawerIsOpen) { if (drawerIsOpen) {
drawRect( drawRect(
@ -190,7 +196,7 @@ fun Backdrop(
brush = brush =
Brush.horizontalGradient( Brush.horizontalGradient(
colors = listOf(Color.Transparent, Color.Black), colors = listOf(Color.Transparent, Color.Black),
startX = 0f, startX = start,
endX = size.width * 0.6f, endX = size.width * 0.6f,
), ),
blendMode = BlendMode.DstIn, blendMode = BlendMode.DstIn,