Improve table handling, add support for nobility table header template

Closes #154

Author: nsh07

app/src/main/java/org/nsh07/wikireader/parser/cleanUpWikitext.kt

@@ -6,11 +6,14 @@ package org.nsh07.wikireader.parser
  * @param wikitext Source Wikitext to clean up
  */
 fun cleanUpWikitext(wikitext: String): String {
-    var bodyText = wikitext
+    return wikitext
         .replace(
             "<ref[^/]*?>.+?</ref>|<ref.*?/>".toRegex(RegexOption.DOT_MATCHES_ALL),
             ""
         )
-    bodyText = bodyText.replace("<var>|</var>".toRegex(), "''")
-    return bodyText
+        .replace(
+            "\\{\\{nobility table header.*?\\}\\}"
+                .toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.DOT_MATCHES_ALL)),
+            "{| class=\"wikitable\"\n"
+        )
 }

app/src/main/java/org/nsh07/wikireader/parser/parseWikitable.kt

@@ -15,7 +15,8 @@ fun parseWikitable(
     val rows = mutableListOf<MutableList<AnnotatedString>>()
     var caption = AnnotatedString("")
     val lines = table.lines().map { it.trim() }.filter { it.isNotEmpty() }
-    val styling = "class=|align=|scope=|style=|rowspan=|colspan=|width=|nowrap|data-sort".toRegex()
+    val styling =
+        "class=|align=|scope=|style=|rowspan=|colspan=|width=|[^{]nowrap|data-sort".toRegex()
 
     var currentRow = mutableListOf<AnnotatedString>()
     val rowSpan = mutableMapOf<Int, Int>()

app/src/main/java/org/nsh07/wikireader/parser/wikitextToAnnotatedString.kt

@@ -39,6 +39,7 @@ fun String.toWikitextAnnotatedString(
     newLine: Boolean = true,
     inIndentCode: Boolean = false
 ): AnnotatedString {
+    val hrChar = '─'
     val input = this
     var i = 0
     var number = 1 // Count for numbered lists
@@ -92,6 +93,13 @@ fun String.toWikitextAnnotatedString(
                             i += currSubstring.substringBefore('>').length
                         }
 
+                        currSubstring.startsWith("<hr", ignoreCase = true) -> {
+                            append('\n')
+                            repeat(5) { append(hrChar) }
+                            append('\n')
+                            i += currSubstring.substringBefore('>').length
+                        }
+
                         currSubstring.startsWith("<u>") -> {
                             val curr = currSubstring.substringBefore("</u>").substringAfter('>')
                             withStyle(SpanStyle(textDecoration = TextDecoration.Underline)) {
@@ -156,6 +164,12 @@ fun String.toWikitextAnnotatedString(
                             i += 5 + curr.length + 5
                         }
 
+                        currSubstring.startsWith("<var>") -> {
+                            val curr = currSubstring.substringBefore("</var>").substringAfter('>')
+                            append("''$curr''".twasNoNewline())
+                            i += 5 + curr.length + 5
+                        }
+
                         currSubstring.startsWith("<sup>") -> {
                             val curr = currSubstring.substringBefore("</sup>").substringAfter('>')
                             withStyle(
@@ -262,12 +276,10 @@ fun String.toWikitextAnnotatedString(
                             currSubstring.startsWith("{{math", ignoreCase = true) ||
                                     currSubstring.startsWith("{{mvar", ignoreCase = true)
                                 -> {
-                                val curr = currSubstring.substringAfter(
-                                    '|',
-                                    currSubstring.substringAfter("{{").substringBefore("}}")
-                                )
+                                val curr = currSubstring.substringAfter('|').removePrefix("1=")
                                 withStyle(SpanStyle(fontFamily = FontFamily.Serif)) {
                                     append(curr.replace(' ', nbsp).twas())
+                                    append(curr.replace(' ', nbsp).twas())
                                 }
                             }
 
@@ -276,6 +288,20 @@ fun String.toWikitextAnnotatedString(
                                 append(curr.twas())
                             }
 
+                            currSubstring.startsWith("{{var", ignoreCase = true) -> {
+                                val curr = currSubstring.substringAfter('|')
+                                append("''$curr''".twas())
+                            }
+
+                            arrayOf("{{small", "{{smaller", "{{petit", "{{hw-small", "{{sma").any {
+                                currSubstring.startsWith(it, ignoreCase = true)
+                            } -> {
+                                val curr = currSubstring.substringAfter('|')
+                                withStyle(SpanStyle(fontSize = (fontSize - 2).sp)) {
+                                    append(curr.twas())
+                                }
+                            }
+
                             currSubstring.startsWith("{{main", ignoreCase = true) -> {
                                 val curr = currSubstring.substringAfter('|')
                                 val splitList = curr.split('|')

app/src/main/java/org/nsh07/wikireader/ui/homeScreen/EquationImage.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.ColorMatrix
@@ -16,6 +15,7 @@ import coil3.compose.AsyncImage
 import coil3.request.ImageRequest
 import coil3.size.Size
 import org.nsh07.wikireader.R
+import org.nsh07.wikireader.ui.theme.ColorConstants.colorMatrixInvert
 
 @Composable
 fun EquationImage(
@@ -25,15 +25,6 @@ fun EquationImage(
     fontSize: Int,
     darkTheme: Boolean
 ) {
-    val colorMatrixInvert = remember {
-        floatArrayOf(
-            -1f, 0f, 0f, 0f, 255f, // Red
-            0f, -1f, 0f, 0f, 255f, // Green
-            0f, 0f, -1f, 0f, 255f, // Blue
-            0f, 0f, 0f, 1f, 0f   // Alpha
-        )
-    }
-
     Box(modifier = Modifier.horizontalScroll(rememberScrollState())) {
         AsyncImage(
             model = ImageRequest.Builder(context)

app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ImageWithCaption.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.unit.sp
 import coil3.ImageLoader
 import org.nsh07.wikireader.parser.toWikitextAnnotatedString
 import org.nsh07.wikireader.ui.image.FeedImage
+import org.nsh07.wikireader.ui.theme.ColorConstants.colorMatrixInvert
 
 @Composable
 fun ImageWithCaption(
@@ -29,17 +30,9 @@ fun ImageWithCaption(
     background: Boolean,
     imageLoader: ImageLoader,
     onLinkClick: (String) -> Unit,
-    onClick: (String, String) -> Unit
+    onClick: (String, String) -> Unit,
+    modifier: Modifier = Modifier
 ) {
-    val colorMatrixInvert = remember {
-        floatArrayOf(
-            -1f, 0f, 0f, 0f, 255f, // Red
-            0f, -1f, 0f, 0f, 255f, // Green
-            0f, 0f, -1f, 0f, 255f, // Blue
-            0f, 0f, 0f, 1f, 0f   // Alpha
-        )
-    }
-
     val uriLow = remember(text) {
         "https://commons.wikimedia.org/wiki/Special:FilePath/${
             text.substringAfter(':').substringBefore('|').substringBefore("]]")
@@ -62,7 +55,7 @@ fun ImageWithCaption(
             ColorFilter.colorMatrix(ColorMatrix(colorMatrixInvert))
         else null,
         background = background,
-        modifier = Modifier
+        modifier = modifier
             .padding(horizontal = 16.dp)
             .padding(top = 8.dp)
             .clip(shapes.large)

app/src/main/java/org/nsh07/wikireader/ui/homeScreen/ParsedBodyText.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.style.Hyphens
@@ -34,7 +35,7 @@ fun ParsedBodyText(
     modifier: Modifier = Modifier
 ) {
     val context = LocalContext.current
-    val dpi = context.resources.displayMetrics.density
+    val dpi = LocalDensity.current.density
 
     Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier) {
         body.forEach {

app/src/main/java/org/nsh07/wikireader/ui/theme/Color.kt

@@ -5,6 +5,7 @@ import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.TopAppBarColors
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 
 val Purple80 = Color(0xFFD0BCFF)
@@ -17,6 +18,7 @@ val Pink40 = Color(0xFF7D5260)
 
 object CustomTopBarColors {
     var black = false
+
     @OptIn(ExperimentalMaterial3Api::class)
     val topBarColors: TopAppBarColors
         @Composable get() {
@@ -25,4 +27,16 @@ object CustomTopBarColors {
                 scrolledContainerColor = colorScheme.surfaceContainer
             ) else TopAppBarDefaults.topAppBarColors()
         }
+}
+
+object ColorConstants {
+    val colorMatrixInvert: FloatArray
+        @Composable get() = remember {
+            floatArrayOf(
+                -1f, 0f, 0f, 0f, 255f, // Red
+                0f, -1f, 0f, 0f, 255f, // Green
+                0f, 0f, -1f, 0f, 255f, // Blue
+                0f, 0f, 0f, 1f, 0f   // Alpha
+            )
+        }
 }