Fix black theme, remove manual background definition

Isira-Seneviratne · Isira-Seneviratne · commit 61bb81f2d68b · 2025-02-01T05:25:48.000+05:30
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryFragment.kt b/app/src/main/java/org/schabi/newpipe/local/history/HistoryFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.fragment.app.Fragment
 import androidx.fragment.compose.content
@@ -20,7 +19,7 @@ class HistoryFragment : Fragment() {
         savedInstanceState: Bundle?,
     ) = content {
         AppTheme {
-            Surface(color = MaterialTheme.colorScheme.background) {
+            Surface {
                 HistoryScreen()
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseDialog.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseDialog.kt
@@ -6,13 +6,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
-import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.dp
@@ -24,25 +20,18 @@ fun LicenseDialog(licenseHtml: AnnotatedString, onDismissRequest: () -> Unit) {
     val lazyListState = rememberLazyListState()
 
     ModalBottomSheet(onDismissRequest) {
-        CompositionLocalProvider(
-            // contentColorFor(MaterialTheme.colorScheme.containerColor), i.e. ModalBottomSheet's
-            // default background color, does not resolve correctly, so need to manually set the
-            // content color for MaterialTheme.colorScheme.background instead
-            LocalContentColor provides contentColorFor(MaterialTheme.colorScheme.background)
-        ) {
-            LazyColumnThemedScrollbar(state = lazyListState) {
-                LazyColumn(
-                    state = lazyListState
-                ) {
-                    item {
-                        if (licenseHtml.isEmpty()) {
-                            LoadingIndicator(modifier = Modifier.padding(32.dp))
-                        } else {
-                            Text(
-                                text = licenseHtml,
-                                modifier = Modifier.padding(horizontal = 12.dp),
-                            )
-                        }
+        LazyColumnThemedScrollbar(state = lazyListState) {
+            LazyColumn(
+                state = lazyListState
+            ) {
+                item {
+                    if (licenseHtml.isEmpty()) {
+                        LoadingIndicator(modifier = Modifier.padding(32.dp))
+                    } else {
+                        Text(
+                            text = licenseHtml,
+                            modifier = Modifier.padding(horizontal = 12.dp),
+                        )
                     }
                 }
             }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/common/IconButtonWithLabel.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/IconButtonWithLabel.kt
@@ -8,7 +8,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -42,7 +41,7 @@ fun IconButtonWithLabel(
 @Composable
 private fun IconButtonWithLabelPreview() {
     AppTheme {
-        Surface(color = MaterialTheme.colorScheme.background) {
+        Surface {
             IconButtonWithLabel(Icons.Default.Info, R.string.name) {}
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamCardItem.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamCardItem.kt
@@ -84,7 +84,7 @@ private fun StreamCardItemPreview(
     @PreviewParameter(StreamItemPreviewProvider::class) stream: Stream
 ) {
     AppTheme {
-        Surface(color = MaterialTheme.colorScheme.background) {
+        Surface {
             StreamCardItem(stream, showProgress = false, isSelected = false)
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamGridItem.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamGridItem.kt
@@ -74,7 +74,7 @@ private fun StreamGridItemPreview(
     @PreviewParameter(StreamItemPreviewProvider::class) stream: Stream
 ) {
     AppTheme {
-        Surface(color = MaterialTheme.colorScheme.background) {
+        Surface {
             StreamGridItem(stream, showProgress = false, isSelected = false)
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt b/app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt
@@ -2,10 +2,6 @@
 
 package org.schabi.newpipe.ui.emptystate
 
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import org.schabi.newpipe.ui.theme.AppTheme
@@ -18,13 +14,7 @@ fun ComposeView.setEmptyStateComposable(
     setViewCompositionStrategy(strategy)
     setContent {
         AppTheme {
-            CompositionLocalProvider(
-                LocalContentColor provides contentColorFor(MaterialTheme.colorScheme.background)
-            ) {
-                EmptyStateComposable(
-                    spec = spec
-                )
-            }
+            EmptyStateComposable(spec = spec)
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt b/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt
@@ -77,7 +77,7 @@ fun AboutScreen(padding: PaddingValues) {
 @Composable
 private fun AboutScreenPreview() {
     AppTheme {
-        Surface(color = MaterialTheme.colorScheme.background) {
+        Surface {
             AboutScreen(PaddingValues(8.dp))
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/screens/HistoryScreen.kt b/app/src/main/java/org/schabi/newpipe/ui/screens/HistoryScreen.kt
@@ -20,7 +20,6 @@ import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MenuAnchorType
 import androidx.compose.material3.PlainTooltip
 import androidx.compose.material3.Surface
@@ -189,7 +188,7 @@ private fun HistoryHeader(
 @Composable
 private fun HistoryHeaderPreview() {
     AppTheme {
-        Surface(color = MaterialTheme.colorScheme.background) {
+        Surface {
             HistoryHeader(SortKey.MOST_PLAYED, {}, {}, {}, {}, {})
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt
@@ -85,7 +85,10 @@ private val darkScheme = darkColorScheme(
     surfaceContainerHighest = surfaceContainerHighestDark,
 )
 
-private val blackScheme = darkScheme.copy(surface = Color.Black)
+private val blackScheme = darkScheme.copy(
+    background = Color.Black,
+    surface = Color.Black
+)
 
 @Composable
 fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private fun StreamCardItemPreview(`
`84`	`84`	`@PreviewParameter(StreamItemPreviewProvider::class) stream: Stream`
`85`	`85`	`) {`
`86`	`86`	`AppTheme {`
`87`		`- Surface(color = MaterialTheme.colorScheme.background) {`
	`87`	`+ Surface {`
`88`	`88`	`StreamCardItem(stream, showProgress = false, isSelected = false)`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private fun StreamGridItemPreview(`
`74`	`74`	`@PreviewParameter(StreamItemPreviewProvider::class) stream: Stream`
`75`	`75`	`) {`
`76`	`76`	`AppTheme {`
`77`		`- Surface(color = MaterialTheme.colorScheme.background) {`
	`77`	`+ Surface {`
`78`	`78`	`StreamGridItem(stream, showProgress = false, isSelected = false)`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fun AboutScreen(padding: PaddingValues) {`
`77`	`77`	`@Composable`
`78`	`78`	`private fun AboutScreenPreview() {`
`79`	`79`	`AppTheme {`
`80`		`- Surface(color = MaterialTheme.colorScheme.background) {`
	`80`	`+ Surface {`
`81`	`81`	`AboutScreen(PaddingValues(8.dp))`
`82`	`82`	`}`
`83`	`83`	`}`