fix: remove background content scope receiver.

oxyroid · Jan 13, 2024 · 3aea8e8 · 3aea8e8
1 parent 7d7655e
commit 3aea8e8
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 88 deletions.
diff --git a/androidApp/src/main/java/com/m3u/androidApp/ui/AppRootGraph.kt b/androidApp/src/main/java/com/m3u/androidApp/ui/AppRootGraph.kt
@@ -123,15 +123,17 @@ internal fun AppRootGraph(
             modifier = Modifier.fillMaxSize()
         ) { padding ->
             Background {
-                content(padding)
-                AppSnackHost(
-                    message = message,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(spacing.small)
-                        .align(Alignment.BottomCenter)
-                        .padding(padding)
-                )
+                Box {
+                    content(padding)
+                    AppSnackHost(
+                        message = message,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(spacing.small)
+                            .align(Alignment.BottomCenter)
+                            .padding(padding)
+                    )
+                }
             }
         }
     }

diff --git a/features/console/src/main/java/com/m3u/features/console/ConsoleScreen.kt b/features/console/src/main/java/com/m3u/features/console/ConsoleScreen.kt
@@ -1,6 +1,7 @@
 package com.m3u.features.console
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -73,52 +74,54 @@ private fun ConsoleScreen(
         contentColor = Color.White,
         modifier = modifier
     ) {
-        val commands = remember(output) { output.lines().asReversed() }
-        val state = rememberLazyListState()
-        LazyColumn(
-            state = state,
-            reverseLayout = true,
-            modifier = Modifier.fillMaxSize(),
-            verticalArrangement = Arrangement.Bottom,
-            horizontalAlignment = Alignment.Start,
-            contentPadding = contentPadding + PaddingValues(LocalSpacing.current.medium)
-        ) {
-            items(commands) { command ->
-                CompositionLocalProvider(
-                    LocalTextSelectionColors provides TextSelectionColors(
-                        backgroundColor = Color(0xff265c8e),
-                        handleColor = Color(0xff78c4dd)
-                    )
-                ) {
-                    SelectionContainer {
-                        MonoText(
-                            text = MonoStyle.get(command).actual(command),
-                            style = MaterialTheme.typography.bodyMedium,
-                            color = MonoStyle.get(command).color,
-                            modifier = Modifier.fillMaxWidth()
+        Box {
+            val commands = remember(output) { output.lines().asReversed() }
+            val state = rememberLazyListState()
+            LazyColumn(
+                state = state,
+                reverseLayout = true,
+                modifier = Modifier.fillMaxSize(),
+                verticalArrangement = Arrangement.Bottom,
+                horizontalAlignment = Alignment.Start,
+                contentPadding = contentPadding + PaddingValues(LocalSpacing.current.medium)
+            ) {
+                items(commands) { command ->
+                    CompositionLocalProvider(
+                        LocalTextSelectionColors provides TextSelectionColors(
+                            backgroundColor = Color(0xff265c8e),
+                            handleColor = Color(0xff78c4dd)
                         )
+                    ) {
+                        SelectionContainer {
+                            MonoText(
+                                text = MonoStyle.get(command).actual(command),
+                                style = MaterialTheme.typography.bodyMedium,
+                                color = MonoStyle.get(command).color,
+                                modifier = Modifier.fillMaxWidth()
+                            )
+                        }
                     }
                 }
             }
-        }
-        TextField(
-            text = input,
-            enabled = focus,
-            onValueChange = onInput,
-            singleLine = true,
-            placeholder = "command here...",
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomCenter)
-                .padding(
-                    start = LocalSpacing.current.medium,
-                    end = LocalSpacing.current.medium,
-                    bottom = LocalSpacing.current.medium,
-                ),
-            keyboardActions = KeyboardActions { onExecute() }
-        )
-        LaunchedEffect(commands) {
-            state.animateScrollToItem(0)
+            TextField(
+                text = input,
+                enabled = focus,
+                onValueChange = onInput,
+                singleLine = true,
+                placeholder = "command here...",
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.BottomCenter)
+                    .padding(
+                        start = LocalSpacing.current.medium,
+                        end = LocalSpacing.current.medium,
+                        bottom = LocalSpacing.current.medium,
+                    ),
+                keyboardActions = KeyboardActions { onExecute() }
+            )
+            LaunchedEffect(commands) {
+                state.animateScrollToItem(0)
+            }
         }
     }
 }
diff --git a/features/crash/src/main/java/com/m3u/features/crash/screen/detail/DetailScreen.kt b/features/crash/src/main/java/com/m3u/features/crash/screen/detail/DetailScreen.kt
@@ -1,6 +1,7 @@
 package com.m3u.features.crash.screen.detail
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
@@ -34,35 +35,37 @@ internal fun DetailScreen(
     }
     val state by viewModel.state.collectAsStateWithLifecycle()
     Background {
-        LazyColumn(
-            contentPadding = PaddingValues(spacing.medium),
-            modifier = modifier
-        ) {
-            item {
-                MonoText(
-                    text = state.text,
-                    color = LocalContentColor.current
-                )
-            }
-        }
-        Column(
-            verticalArrangement = Arrangement.spacedBy(spacing.small),
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(spacing.medium)
-        ) {
-            ExtendedFloatingActionButton(
-                text = { Text("SAVE") },
-                icon = {
-                    Icon(
-                        imageVector = Icons.Rounded.FileDownload,
-                        contentDescription = null
+        Box {
+            LazyColumn(
+                contentPadding = PaddingValues(spacing.medium),
+                modifier = modifier
+            ) {
+                item {
+                    MonoText(
+                        text = state.text,
+                        color = LocalContentColor.current
                     )
-                },
-                onClick = {
-                    viewModel.onEvent(DetailEvent.Save)
                 }
-            )
+            }
+            Column(
+                verticalArrangement = Arrangement.spacedBy(spacing.small),
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .padding(spacing.medium)
+            ) {
+                ExtendedFloatingActionButton(
+                    text = { Text("SAVE") },
+                    icon = {
+                        Icon(
+                            imageVector = Icons.Rounded.FileDownload,
+                            contentDescription = null
+                        )
+                    },
+                    onClick = {
+                        viewModel.onEvent(DetailEvent.Save)
+                    }
+                )
+            }
         }
     }
 }
diff --git a/features/foryou/src/main/java/com/m3u/features/foryou/ForyouViewModel.kt b/features/foryou/src/main/java/com/m3u/features/foryou/ForyouViewModel.kt
@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapMerge
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -76,7 +76,7 @@ class ForyouViewModel @Inject constructor(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     internal val recommend: StateFlow<Recommend> = unseensDuration
-        .flatMapMerge { streamRepository.observeAllUnseenFavourites(it) }
+        .flatMapLatest { streamRepository.observeAllUnseenFavourites(it) }
         .map { prev -> Recommend(prev.map { Recommend.UnseenSpec(it) }) }
         .stateIn(
             scope = viewModelScope,

diff --git a/features/playlist/src/main/java/com/m3u/features/playlist/PlaylistViewModel.kt b/features/playlist/src/main/java/com/m3u/features/playlist/PlaylistViewModel.kt
@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flatMapMerge
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -227,7 +227,7 @@ class PlaylistViewModel @Inject constructor(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     internal val unsorted: StateFlow<List<Stream>> = combine(
-        playlistUrl.flatMapMerge { url ->
+        playlistUrl.flatMapLatest { url ->
             playlistRepository.observeWithStreams(url)
         },
         query

diff --git a/features/playlist/src/main/java/com/m3u/features/playlist/impl/TvPlaylistScreenImpl.kt b/features/playlist/src/main/java/com/m3u/features/playlist/impl/TvPlaylistScreenImpl.kt
@@ -22,7 +22,6 @@ import androidx.compose.material.icons.rounded.Image
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.Search
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -58,6 +57,7 @@ import com.m3u.features.playlist.Channel
 import com.m3u.features.playlist.R
 import com.m3u.features.playlist.components.TvStreamItem
 import com.m3u.i18n.R.string
+import com.m3u.material.components.Background
 import com.m3u.material.components.IconButton
 import com.m3u.material.ktx.Edge
 import com.m3u.material.ktx.blurEdge
@@ -199,9 +199,7 @@ internal fun TvPlaylistScreenImpl(
         ImmersiveList(
             modifier = modifier.fillMaxWidth(),
             background = { id, hasFocus ->
-                CompositionLocalProvider(
-                    LocalContentColor provides MaterialTheme.colorScheme.onBackground
-                ) {
+                Background {
                     AnimatedVisibility(hasFocus) {
                         AnimatedContent(id) { id ->
                             Box(

diff --git a/material/src/main/java/com/m3u/material/components/Backgrounds.kt b/material/src/main/java/com/m3u/material/components/Backgrounds.kt
@@ -4,7 +4,6 @@ import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material3.LocalAbsoluteTonalElevation
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -24,7 +23,7 @@ inline fun Background(
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colorScheme.background,
     contentColor: Color = MaterialTheme.colorScheme.onBackground,
-    crossinline content: @Composable BoxScope.() -> Unit
+    crossinline content: @Composable () -> Unit
 ) {
     val actualContentColor = contentColor.ifUnspecified {
         if (!isTelevision()) LocalContentColor.current