Improve code block formatting (#367)

jocmp · Sep 17, 2024 · e2cc462 · e2cc462
1 parent 7ca47eb
commit e2cc462
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 28 deletions.
diff --git a/app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleTemplateColors.kt b/app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleTemplateColors.kt
@@ -7,16 +7,18 @@ import androidx.compose.ui.graphics.toArgb
 import com.jocmp.capy.articles.TemplateColors
 
 @Composable
-fun articleTemplateColors() = TemplateColors(
-    onPrimaryContainer = colorScheme.onPrimaryContainer.toHTMLColor(),
-    onSurface = colorScheme.onSurface.toHTMLColor(),
-    onSurfaceVariant = colorScheme.onSurfaceVariant.toHTMLColor(),
-    primary = colorScheme.primary.toHTMLColor(),
-    primaryContainer = colorScheme.primaryContainer.toHTMLColor(),
-    surface = colorScheme.surface.toHTMLColor(),
-    surfaceContainerHighest = colorScheme.surfaceContainerHighest.toHTMLColor(),
-    surfaceVariant = colorScheme.surfaceVariant.toHTMLColor(),
-)
+fun articleTemplateColors() =
+    TemplateColors(
+        onPrimaryContainer = colorScheme.onPrimaryContainer.toHTMLColor(),
+        onSurface = colorScheme.onSurface.toHTMLColor(),
+        onSurfaceVariant = colorScheme.onSurfaceVariant.toHTMLColor(),
+        primary = colorScheme.primary.toHTMLColor(),
+        primaryContainer = colorScheme.primaryContainer.toHTMLColor(),
+        surface = colorScheme.surface.toHTMLColor(),
+        surfaceContainerHighest = colorScheme.surfaceContainerHighest.toHTMLColor(),
+        surfaceVariant = colorScheme.surfaceVariant.toHTMLColor(),
+        surfaceContainer = colorScheme.surfaceContainer.toHTMLColor()
+    ).asMap()
 
 
 private fun Color.toHTMLColor(): String {

diff --git a/app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleView.kt b/app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleView.kt
@@ -55,8 +55,7 @@ fun ArticleView(
     val snapshotList = articles.collectAsLazyPagingItems().itemSnapshotList
     val relations = remember(article, snapshotList) { ArticleRelations.from(article, snapshotList) }
     val articleID = article.id
-    val templateColors = articleTemplateColors()
-    val colors = templateColors.asMap()
+    val colors = articleTemplateColors()
     val webViewState = rememberSaveableWebViewState(key = articleID)
     val byline = article.byline(context = LocalContext.current)
     val showBars = canShowTopBar(webViewState)

diff --git a/capy/src/main/assets/stylesheet.css b/capy/src/main/assets/stylesheet.css
diff --git a/capy/src/main/java/com/jocmp/capy/articles/TemplateColors.kt b/capy/src/main/java/com/jocmp/capy/articles/TemplateColors.kt
@@ -1,13 +1,12 @@
 package com.jocmp.capy.articles
 
-import org.json.JSONObject
-
 data class TemplateColors(
     val onPrimaryContainer: String,
     val onSurface: String,
     val onSurfaceVariant: String,
     val primary: String,
     val primaryContainer: String,
+    val surfaceContainer: String,
     val surface: String,
     val surfaceContainerHighest: String,
     val surfaceVariant: String,
@@ -20,19 +19,7 @@ data class TemplateColors(
         "color_primary_container" to primaryContainer,
         "color_surface" to surface,
         "color_surface_container_highest" to surfaceContainerHighest,
+        "color_surface_container" to surfaceContainer,
         "color_surface_variant" to surfaceVariant,
     )
-
-    fun toJSON() = JSONObject(
-        mapOf(
-            "--color-on-surface" to onSurface,
-            "--color-on-primary-container" to onPrimaryContainer,
-            "--color-on-surface-variant" to onSurfaceVariant,
-            "--color-primary" to primary,
-            "--color-primary-container" to primaryContainer,
-            "--color-surface" to surface,
-            "--color-surface-container-highest" to surfaceContainerHighest,
-            "--color-surface-variant" to surfaceVariant,
-        )
-    )
 }
diff --git a/capy/src/main/res/raw/template.html b/capy/src/main/res/raw/template.html