Added inline image rendering option

app/src/main/java/corewala/buran/ui/GemActivity.kt

@@ -94,6 +94,21 @@ class GemActivity : AppCompatActivity() {
         }
     }
 
+    private val inlineImage: (link: URI, adapterPosition: Int) -> Unit = { uri, position: Int ->
+
+        omniTerm.imageAddress(uri.toString())
+        omniTerm.uri.let{
+            model.requestInlineImage(URI.create(it.toString())){ imageUri ->
+                imageUri?.let{
+                    runOnUiThread {
+                        loadImage(position, imageUri)
+                        loadingView(false)
+                    }
+                }
+            }
+        }
+    }
+
     private fun loadImage(position: Int, uri: Uri) {
         adapter.loadImage(position, uri)
     }
@@ -114,7 +129,7 @@ class GemActivity : AppCompatActivity() {
 
         prefs = PreferenceManager.getDefaultSharedPreferences(this)
 
-        adapter = AbstractGemtextAdapter.getAdapter(onLink)
+        adapter = AbstractGemtextAdapter.getAdapter(onLink, inlineImage)
 
         binding.gemtextRecycler.adapter = adapter
 
@@ -274,6 +289,11 @@ class GemActivity : AppCompatActivity() {
         )
         adapter.inlineIcons(showInlineIcons)
 
+        val showInlineImages = prefs.getBoolean(
+            "show_inline_images",
+            true
+        )
+        adapter.inlineImages(showInlineImages)
 
         model.invalidateDatasource()
     }

app/src/main/java/corewala/buran/ui/gemtext_adapter/AbstractGemtextAdapter.kt

@@ -5,22 +5,28 @@ import androidx.recyclerview.widget.RecyclerView
 import java.net.URI
 
 abstract class AbstractGemtextAdapter(
-    val onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit
+    val onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit,
+    val inlineImage: (link: URI, adapterPosition: Int) -> Unit
 ): RecyclerView.Adapter<GmiViewHolder>() {
 
     var showInlineIcons: Boolean = false
     var hideCodeBlocks: Boolean = false
+    var showInlineImages: Boolean = false
 
     abstract fun render(lines: List<String>)
     abstract fun loadImage(position: Int, cacheUri: Uri)
     abstract fun inlineIcons(visible: Boolean)
+    abstract fun inlineImages(visible: Boolean)
     abstract fun hideCodeBlocks(hideCodeBlocks: Boolean)
 
     abstract fun inferTitle(): String?
 
     companion object{
-        fun getAdapter(onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit): AbstractGemtextAdapter {
-            return GemtextAdapter(onLink)
+        fun getAdapter(
+            onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit,
+            inlineImage: (link: URI, adapterPosition: Int) -> Unit
+        ): AbstractGemtextAdapter {
+            return GemtextAdapter(onLink, inlineImage)
         }
     }
 }

app/src/main/java/corewala/buran/ui/gemtext_adapter/GemtextAdapter.kt

@@ -16,8 +16,9 @@ import corewala.visible
 import java.net.URI
 
 class GemtextAdapter(
-    onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit)
-    : AbstractGemtextAdapter(onLink) {
+    onLink: (link: URI, longTap: Boolean, adapterPosition: Int) -> Unit,
+    inlineImage: (link: URI, adapterPosition: Int) -> Unit
+): AbstractGemtextAdapter(onLink, inlineImage) {
 
     private var lines = mutableListOf<String>()
     private var inlineImages = HashMap<Int, Uri>()
@@ -163,6 +164,7 @@ class GemtextAdapter(
                 }
             }
             is GmiViewHolder.ImageLink -> {
+
                 val linkParts = line.substring(2).trim().split("\\s+".toRegex(), 2)
                 var linkName = linkParts[0]
 
@@ -189,7 +191,15 @@ class GemtextAdapter(
                         holder.itemView.gemtext_inline_image.visible(true)
                         holder.itemView.gemtext_inline_image.setImageURI(inlineImages[position])
                     }
-                    else -> holder.itemView.gemtext_inline_image.visible(false)
+                    else -> {
+                        holder.itemView.gemtext_inline_image.visible(false)
+                        if (showInlineImages){
+                            val uri = getUri(lines[holder.adapterPosition])
+                            println("Inline image rendered: $uri")
+                            inlineImage(uri, holder.adapterPosition)
+                        }
+
+                    }
                 }
 
                 when {
@@ -248,6 +258,11 @@ class GemtextAdapter(
         notifyDataSetChanged()
     }
 
+    override fun inlineImages(visible: Boolean){
+        this.showInlineImages = visible
+        notifyDataSetChanged()
+    }
+
     override fun hideCodeBlocks(hideCodeBlocks: Boolean) {
         this.hideCodeBlocks = hideCodeBlocks
         notifyDataSetChanged()

app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt

@@ -98,6 +98,12 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang
         useCustomTabsPreference.title = getString(R.string.web_content_switch_label)
         webCategory.addPreference(useCustomTabsPreference)
 
+        val showInlineImages = SwitchPreferenceCompat(context)
+        showInlineImages.setDefaultValue(true)
+        showInlineImages.key = "show_inline_images"
+        showInlineImages.title = getString(R.string.show_inline_images)
+        webCategory.addPreference(showInlineImages)
+
     }
 
     private fun buildAppearanceSection(context: Context?, appCategory: PreferenceCategory) {

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

@@ -57,6 +57,7 @@
     <string name="web_content">Contenu Web</string>
     <string name="web_content_label">Ouvrir les sites web en interne en utilisant des \'Onglets Personnalisés\', plutôt que d\'utiliser le navigateur par défaut. Cela pourrait vous aider à rester dans le Geminispace plutôt que d\'être distrait·e par le vaste web. Cela requiert un navigateur par défaut compatible.</string>
     <string name="web_content_switch_label">Ouvrir en interne</string>
+    <string name="show_inline_images">Images en ligne</string>
     <string name="pkcs_notice">Seuls les magasins de clés client PKCS12 sont actuellement supportés</string>
     <string name="client_certificate">Certificat Client</string>
     <string name="tap_to_select_client_certificate">Cliquez pour sélectionner un certificat client</string>

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

@@ -57,6 +57,7 @@
     <string name="web_content">Web Content</string>
     <string name="web_content_label">Open websites internally using \'Custom Tabs\', instead of using the default browser. This might help you stay in Geminispace instead of being distracted by the wider web. Requires compatible default browser.</string>
     <string name="web_content_switch_label">Open internally</string>
+    <string name="show_inline_images">Inline images</string>
     <string name="pkcs_notice">Only PKCS12 client keystores are currently supported</string>
     <string name="client_certificate">Client Certificate</string>
     <string name="tap_to_select_client_certificate">Tap to select client certificate</string>