Readd anchor image handling

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -115,9 +115,9 @@
     <string name="empty_onboarding_title">Još nema Izvora</string>
     <string name="empty_onboarding_prompt">Započni sa dodavanjem Izvora</string>
     <string name="article_style_options">Font Opcije</string>
-    <string name="font_option_vollkorn">Volokorn</string>
-    <string name="font_option_atkinson_hyperlegible">Atkinson Hiperčitko</string>
-    <string name="font_option_poppins">Popins</string>
+    <string name="font_option_vollkorn">Vollkorn</string>
+    <string name="font_option_atkinson_hyperlegible">Atkinson Hyperlegible</string>
+    <string name="font_option_poppins">Poppins</string>
     <string name="font_option_system_default">Sistemski podrazumevano</string>
     <string name="article_font_menu_label">Font</string>
     <string name="article_font_scale_label">Veličina Teksta</string>

app/src/main/res/values-cs/strings.xml

@@ -121,7 +121,7 @@
     <string name="settings_article_list_summary">Souhrn</string>
     <string name="article_style_options">Nastavení fontu</string>
     <string name="font_option_vollkorn">Vollkorn</string>
-    <string name="font_option_atkinson_hyperlegible">Atkinson Hyperčitelný</string>
+    <string name="font_option_atkinson_hyperlegible">Atkinson Hyperlegible</string>
     <string name="font_option_poppins">Poppins</string>
     <string name="article_font_menu_label">Font</string>
     <string name="article_byline">%1$s krát %2$s krát %3$s</string>

app/src/main/res/values/strings.xml

@@ -130,9 +130,9 @@
     <string name="empty_onboarding_title">No feeds yet</string>
     <string name="empty_onboarding_prompt">Start by adding a feed</string>
     <string name="article_style_options">Font style options</string>
-    <string name="font_option_vollkorn">Vollkorn</string>
-    <string name="font_option_atkinson_hyperlegible">Atkinson Hyperlegible</string>
-    <string name="font_option_poppins">Poppins</string>
+    <string name="font_option_vollkorn" translatable="false">Vollkorn</string>
+    <string name="font_option_atkinson_hyperlegible" translatable="false">Atkinson Hyperlegible</string>
+    <string name="font_option_poppins" translatable="false">Poppins</string>
     <string name="font_option_system_default">System default</string>
     <string name="article_font_menu_label">Font</string>
     <string name="article_font_scale_label">Font scale</string>

capy/src/main/java/com/jocmp/capy/articles/CleanLinks.kt

@@ -3,7 +3,7 @@ package com.jocmp.capy.articles
 import org.jsoup.nodes.Element
 
 internal fun cleanLinks(element: Element) {
-    element.getElementsByTag("img").forEachIndexed{ index, child ->
+    element.getElementsByTag("img").forEachIndexed { index, child ->
         child.attr("src", child.absUrl("src"))
 
         if (index > 0) {
@@ -14,4 +14,26 @@ internal fun cleanLinks(element: Element) {
     element.select("img[data-src]").forEach { child ->
         child.attr("src", child.absUrl("data-src"))
     }
+
+    extractChildImages(element)
+}
+
+private fun extractChildImages(document: Element) {
+    document.select("a img").forEach {
+        attachImageToAnchorParent(it)
+    }
+}
+
+private fun attachImageToAnchorParent(img: Element) {
+    val parent = img.parentNode() as Element?
+    if (parent == null || parent.tagName() == "body") {
+        return;
+    } else if (parent.tagName() == "a") {
+        (parent.parentNode() as Element?)?.apply {
+            appendChild(img)
+        }
+        parent.remove()
+    } else {
+        attachImageToAnchorParent(img)
+    }
 }

capy/src/main/java/com/jocmp/capy/articles/FontOption.kt

@@ -20,8 +20,8 @@ enum class FontOption {
         val sorted: List<FontOption>
             get() = listOf(
                 SYSTEM_DEFAULT,
-                POPPINS,
                 ATKINSON_HYPERLEGIBLE,
+                POPPINS,
                 VOLLKORN
             )
     }

capy/src/test/java/com/jocmp/capy/articles/CleanLinksTest.kt

@@ -0,0 +1,65 @@
+package com.jocmp.capy.articles
+
+import com.jocmp.capy.articles.HtmlHelpers.html
+import kotlin.test.Test
+
+class CleanLinksTest {
+    @Test
+    fun `makes all subsequent links lazy loaded`() {
+        val document = html {
+           """
+           <img src="https://example.com/1.png">
+           <img src="https://example.com/2.png">
+           <img src="https://example.com/3.png">
+           """
+        }
+
+        cleanLinks(document)
+
+        HtmlHelpers.assertEquals(document) {
+            """
+            <img src="https://example.com/1.png">
+            <img src="https://example.com/2.png" loading="lazy">
+            <img src="https://example.com/3.png" loading="lazy">
+            """
+        }
+    }
+
+    @Test
+    fun `moves lazy-loaded src to src attribute`() {
+        val document = html {
+            """
+            <img data-src="https://example.com/1.png">
+            """
+        }
+
+        cleanLinks(document)
+
+        HtmlHelpers.assertEquals(document) {
+            """
+            <img data-src="https://example.com/1.png" src="https://example.com/1.png">
+           """
+        }
+    }
+
+    @Test
+    fun `pulls nested images out of links`() {
+        val document = html {
+            """
+            <img src="https://example.com/1.png">
+            <a href=""https://example.com/nested.png">
+                <img src="https://example.com/nested.png">
+            </a>
+            """
+        }
+
+        cleanLinks(document)
+
+        HtmlHelpers.assertEquals(document) {
+            """
+            <img src="https://example.com/1.png">
+            <img src="https://example.com/nested.png" loading="lazy">
+            """
+        }
+    }
+}

capy/src/test/java/com/jocmp/capy/articles/HtmlHelpers.kt

@@ -0,0 +1,28 @@
+package com.jocmp.capy.articles
+
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import kotlin.test.assertEquals
+
+object HtmlHelpers {
+    fun html(content: () -> String): Document {
+        val documentString = """
+        <html>
+        <body>
+        ${content()}
+        </body>
+        </html>
+    """.trimIndent()
+
+        val doc = Jsoup.parse(documentString)
+        return doc
+    }
+
+    fun assertEquals(actual: Document, expected: () -> String) {
+        assertEquals(expected = snapshot(expected()), actual = actual.body().html())
+    }
+
+    private fun snapshot(content: String): String {
+        return content.trimIndent().lines().joinToString(" ")
+    }
+}