From 37fe25ac06ff58d9d91f619bfb13cd516b369a90 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 26 Jun 2022 10:00:56 -0400
Subject: [PATCH] Fix manga info header using wrong text color (fixes #7368)

---
 .../presentation/components/Scaffold.kt       |  1 -
 .../manga/components/MangaInfoHeader.kt       | 76 +++++++++++--------
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/components/Scaffold.kt b/app/src/main/java/eu/kanade/presentation/components/Scaffold.kt
index e534801099..08492cdcf1 100644
--- a/app/src/main/java/eu/kanade/presentation/components/Scaffold.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/Scaffold.kt
@@ -123,7 +123,6 @@ private fun ScaffoldLayout(
     snackbar: @Composable () -> Unit,
     fab: @Composable () -> Unit,
     bottomBar: @Composable () -> Unit,
-
 ) {
     SubcomposeLayout { constraints ->
         val layoutWidth = constraints.maxWidth
diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
index 14742c157c..053e0b2409 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
@@ -35,6 +35,7 @@ import androidx.compose.material.icons.filled.Schedule
 import androidx.compose.material.icons.filled.Sync
 import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.LocalMinimumTouchTargetEnforcement
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
@@ -129,34 +130,36 @@ fun MangaInfoHeader(
             )
 
             // Manga & source info
-            if (windowWidthSizeClass == WindowWidthSizeClass.Compact) {
-                MangaAndSourceTitlesSmall(
-                    appBarPadding = appBarPadding,
-                    coverDataProvider = coverDataProvider,
-                    onCoverClick = onCoverClick,
-                    title = title,
-                    context = context,
-                    doSearch = doSearch,
-                    author = author,
-                    artist = artist,
-                    status = status,
-                    sourceName = sourceName,
-                    isStubSource = isStubSource,
-                )
-            } else {
-                MangaAndSourceTitlesLarge(
-                    appBarPadding = appBarPadding,
-                    coverDataProvider = coverDataProvider,
-                    onCoverClick = onCoverClick,
-                    title = title,
-                    context = context,
-                    doSearch = doSearch,
-                    author = author,
-                    artist = artist,
-                    status = status,
-                    sourceName = sourceName,
-                    isStubSource = isStubSource,
-                )
+            CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurface) {
+                if (windowWidthSizeClass == WindowWidthSizeClass.Compact) {
+                    MangaAndSourceTitlesSmall(
+                        appBarPadding = appBarPadding,
+                        coverDataProvider = coverDataProvider,
+                        onCoverClick = onCoverClick,
+                        title = title,
+                        context = context,
+                        doSearch = doSearch,
+                        author = author,
+                        artist = artist,
+                        status = status,
+                        sourceName = sourceName,
+                        isStubSource = isStubSource,
+                    )
+                } else {
+                    MangaAndSourceTitlesLarge(
+                        appBarPadding = appBarPadding,
+                        coverDataProvider = coverDataProvider,
+                        onCoverClick = onCoverClick,
+                        title = title,
+                        context = context,
+                        doSearch = doSearch,
+                        author = author,
+                        artist = artist,
+                        status = status,
+                        sourceName = sourceName,
+                        isStubSource = isStubSource,
+                    )
+                }
             }
         }
 
@@ -409,13 +412,19 @@ private fun MangaAndSourceTitlesSmall(
                 text = title.ifBlank { stringResource(R.string.unknown) },
                 style = MaterialTheme.typography.titleLarge,
                 modifier = Modifier.clickableNoIndication(
-                    onLongClick = { if (title.isNotBlank()) context.copyToClipboard(title, title) },
+                    onLongClick = {
+                        if (title.isNotBlank()) context.copyToClipboard(
+                            title,
+                            title,
+                        )
+                    },
                     onClick = { if (title.isNotBlank()) doSearch(title, true) },
                 ),
             )
             Spacer(modifier = Modifier.height(2.dp))
             Text(
-                text = author?.takeIf { it.isNotBlank() } ?: stringResource(R.string.unknown_author),
+                text = author?.takeIf { it.isNotBlank() }
+                    ?: stringResource(R.string.unknown_author),
                 style = MaterialTheme.typography.titleSmall,
                 modifier = Modifier
                     .secondaryItemAlpha()
@@ -488,7 +497,12 @@ private fun MangaAndSourceTitlesSmall(
                     }
                     Text(
                         text = sourceName,
-                        modifier = Modifier.clickableNoIndication { doSearch(sourceName, false) },
+                        modifier = Modifier.clickableNoIndication {
+                            doSearch(
+                                sourceName,
+                                false,
+                            )
+                        },
                     )
                 }
             }