Add support for inverted rendered expression colors in dark theme

#24
nsh07 · Dec 28, 2024 · 92d0d5c · 92d0d5c
1 parent 673caaf
commit 92d0d5c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/app/src/main/java/org/nsh07/wikireader/ui/homeScreen/AppHomeScreen.kt b/app/src/main/java/org/nsh07/wikireader/ui/homeScreen/AppHomeScreen.kt
@@ -34,6 +34,7 @@ import org.nsh07.wikireader.R
 import org.nsh07.wikireader.data.WRStatus
 import org.nsh07.wikireader.data.langCodeToName
 import org.nsh07.wikireader.ui.image.ImageCard
+import org.nsh07.wikireader.ui.theme.isDark
 import org.nsh07.wikireader.ui.viewModel.HomeScreenState
 import org.nsh07.wikireader.ui.viewModel.PreferencesState
 
@@ -156,6 +157,7 @@ fun AppHomeScreen(
                             description = photoDesc?.description?.get(0) ?: "",
                             intro = true,
                             renderMath = preferencesState.renderMath,
+                            darkTheme = MaterialTheme.colorScheme.isDark(),
                             onLinkClick = onLinkClick
                         )
                     }
@@ -172,6 +174,7 @@ fun AppHomeScreen(
                                 description = photoDesc?.description?.get(0) ?: "",
                                 expanded = preferencesState.expandedSections,
                                 onLinkClick = onLinkClick,
+                                darkTheme = MaterialTheme.colorScheme.isDark(),
                                 renderMath = preferencesState.renderMath
                             )
                         }

diff --git a/app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ExpandableSection.kt b/app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ExpandableSection.kt
@@ -40,6 +40,7 @@ fun ExpandableSection(
     description: String,
     expanded: Boolean,
     renderMath: Boolean,
+    darkTheme: Boolean,
     onLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -91,7 +92,8 @@ fun ExpandableSection(
                 fontSize = fontSize,
                 description = description,
                 onLinkClick = onLinkClick,
-                renderMath = renderMath
+                renderMath = renderMath,
+                darkTheme = darkTheme
             )
         }
     }
@@ -109,7 +111,8 @@ fun ExpandableSectionPreview() {
             description = "",
             onLinkClick = {},
             expanded = false,
-            renderMath = true
+            renderMath = true,
+            darkTheme = false
         )
     }
 }
diff --git a/app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ParsedBodyText.kt b/app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ParsedBodyText.kt
@@ -1,5 +1,7 @@
 package org.nsh07.wikireader.ui.homeScreen
 
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -12,6 +14,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.asComposeColorFilter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.LinkAnnotation
@@ -34,12 +37,13 @@ fun ParsedBodyText(
     body: String,
     fontSize: Int,
     description: String,
-    intro: Boolean = false,
     renderMath: Boolean,
+    darkTheme: Boolean,
+    intro: Boolean = false,
     onLinkClick: (String) -> Unit
 ) {
     if (!description.contains("disambiguation") && title != "See also") {
-        if (renderMath) {
+        if (renderMath) { // Split content by newlines and render LaTeX if line starts with \{displaystyle
             val context = LocalContext.current
             val dpi = context.resources.displayMetrics.density
             Column(horizontalAlignment = Alignment.CenterHorizontally) {
@@ -68,13 +72,20 @@ fun ParsedBodyText(
                                 placeholder = painterResource(R.drawable.more_horiz),
                                 error = painterResource(R.drawable.error),
                                 contentDescription = null,
+                                colorFilter = if (darkTheme)
+                                    PorterDuffColorFilter(
+                                        0xffffffff.toInt(),
+                                        PorterDuff.Mode.SRC_IN
+                                    ).asComposeColorFilter()
+                                else null,
                                 modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp)
                             )
                         }
                 }
             }
-        } else {
-            val pattern = remember{ "\n {6}\n {4}\n {3} \\{\\\\displaystyle.*\\}\n {2}\n".toRegex() }
+        } else { // Clean up string and then display
+            val pattern =
+                remember { "\n {6}\n {4}\n {3} \\{\\\\displaystyle.*\\}\n {2}\n".toRegex() }
             val multipleSpaces = remember { "[^\\S\\n]{2,}".toRegex() }
             Text(
                 text = body

diff --git a/app/src/main/java/org/nsh07/wikireader/ui/theme/Theme.kt b/app/src/main/java/org/nsh07/wikireader/ui/theme/Theme.kt
@@ -3,13 +3,15 @@ package org.nsh07.wikireader.ui.theme
 import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
@@ -74,3 +76,6 @@ fun WikiReaderTheme(
         content = content
     )
 }
+
+@Composable
+fun ColorScheme.isDark() = this.background.luminance() < 0.5