diff --git a/app/src/main/java/corewala/buran/ui/GemActivity.kt b/app/src/main/java/corewala/buran/ui/GemActivity.kt
index 024f7c1..d09d04b 100644
--- a/app/src/main/java/corewala/buran/ui/GemActivity.kt
+++ b/app/src/main/java/corewala/buran/ui/GemActivity.kt
@@ -276,12 +276,6 @@ class GemActivity : AppCompatActivity() {
else -> hideClientCertShield()
}
- val hideCodeBlocks = prefs.getBoolean(
- "collapse_code_blocks",
- false
- )
- adapter.hideCodeBlocks(hideCodeBlocks)
-
val showInlineIcons = prefs.getBoolean(
"show_inline_icons",
true
diff --git a/app/src/main/java/corewala/buran/ui/gemtext_adapter/AbstractGemtextAdapter.kt b/app/src/main/java/corewala/buran/ui/gemtext_adapter/AbstractGemtextAdapter.kt
index 2a3b77c..e66e936 100644
--- a/app/src/main/java/corewala/buran/ui/gemtext_adapter/AbstractGemtextAdapter.kt
+++ b/app/src/main/java/corewala/buran/ui/gemtext_adapter/AbstractGemtextAdapter.kt
@@ -18,7 +18,6 @@ abstract class AbstractGemtextAdapter(
abstract fun loadImage(position: Int, cacheUri: Uri)
abstract fun inlineIcons(visible: Boolean)
abstract fun inlineImages(visible: Boolean)
- abstract fun hideCodeBlocks(hideCodeBlocks: Boolean)
abstract fun linkButtons(visible: Boolean)
abstract fun inferTitle(): String?
diff --git a/app/src/main/java/corewala/buran/ui/gemtext_adapter/GemtextAdapter.kt b/app/src/main/java/corewala/buran/ui/gemtext_adapter/GemtextAdapter.kt
index dd65264..30561cc 100644
--- a/app/src/main/java/corewala/buran/ui/gemtext_adapter/GemtextAdapter.kt
+++ b/app/src/main/java/corewala/buran/ui/gemtext_adapter/GemtextAdapter.kt
@@ -93,27 +93,6 @@ class GemtextAdapter(
}else{
holder.itemView.gemtext_text_monospace_textview.text = line.substring(3)
}
-
- if(hideCodeBlocks){
- holder.itemView.show_code_block.setText(R.string.show_code)//reset for recycling
- altText?.let{
- holder.itemView.show_code_block.append(": $altText")
- }
- holder.itemView.show_code_block.visible(true)
- holder.itemView.show_code_block.paint.isUnderlineText = true
- holder.itemView.show_code_block.setOnClickListener {
- setupCodeBlockToggle(holder, altText)
- }
- holder.itemView.gemtext_text_monospace_textview.visible(false)
-
- when {
- showInlineIcons -> holder.itemView.show_code_block.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.vector_code, 0)
- else -> holder.itemView.show_code_block.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
- }
- }else{
- holder.itemView.show_code_block.visible(false)
- holder.itemView.gemtext_text_monospace_textview.visible(true)
- }
}
is GmiViewHolder.Quote -> holder.itemView.gemtext_text_monospace_textview.text = line.substring(1).trim()
is GmiViewHolder.H1 -> {
@@ -281,26 +260,6 @@ class GemtextAdapter(
}
}
- private fun setupCodeBlockToggle(holder: GmiViewHolder.Code, altText: String?) {
- //val adapterPosition = holder.adapterPosition
- when {
- holder.itemView.gemtext_text_monospace_textview.isVisible -> {
- holder.itemView.show_code_block.setText(R.string.show_code)
- holder.itemView.gemtext_text_monospace_textview.visible(false)
- altText?.let{
- holder.itemView.show_code_block.append(": $altText")
- }
- }
- else -> {
- holder.itemView.show_code_block.setText(R.string.hide_code)
- holder.itemView.gemtext_text_monospace_textview.visible(true)
- altText?.let{
- holder.itemView.show_code_block.append(": $altText")
- }
- }
- }
- }
-
private fun getLink(line: String): String{
val linkParts = line.substring(2).trim().split("\\s+".toRegex(), 2)
return linkParts[0]
@@ -338,9 +297,4 @@ class GemtextAdapter(
this.showInlineImages = visible
notifyDataSetChanged()
}
-
- override fun hideCodeBlocks(hideCodeBlocks: Boolean) {
- this.hideCodeBlocks = hideCodeBlocks
- notifyDataSetChanged()
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt
index ff1c8df..e4e6a57 100644
--- a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt
@@ -179,18 +179,6 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang
accessibilityCategory.title = getString(R.string.accessibility)
screen.addPreference(accessibilityCategory)
- //Accessibility - code blocks
- val aboutCodeBlocksPref = Preference(context)
- aboutCodeBlocksPref.summary = getString(R.string.collapse_code_blocks_about)
- aboutCodeBlocksPref.isPersistent = false
- aboutCodeBlocksPref.isSelectable = false
- accessibilityCategory.addPreference(aboutCodeBlocksPref)
-
- val collapseCodeBlocksPreference = SwitchPreferenceCompat(context)
- collapseCodeBlocksPreference.key = "collapse_code_blocks"
- collapseCodeBlocksPreference.title = getString(R.string.collapse_code_blocks)
- accessibilityCategory.addPreference(collapseCodeBlocksPreference)
-
//Accessibility - inline icons
val showInlineIconsPreference = SwitchPreferenceCompat(context)
showInlineIconsPreference.setDefaultValue(true)
diff --git a/app/src/main/res/layout/gemtext_code_block.xml b/app/src/main/res/layout/gemtext_code_block.xml
index 65caf13..62559e8 100644
--- a/app/src/main/res/layout/gemtext_code_block.xml
+++ b/app/src/main/res/layout/gemtext_code_block.xml
@@ -9,28 +9,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
+ android:layout_marginBottom="@dimen/def_quarter">
Contenu Web
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.
Ouvrir en interne
- Images en ligne
+ Images locales en ligne
Seuls les magasins de clés client PKCS12 sont actuellement supportés
Certificat Client
Cliquez pour sélectionner un certificat client
@@ -73,10 +73,6 @@
Importer des marque-pages
Exporter des marque-pages
Accessibilité
- Cacher les rectangles pleins
- Montrer le code
- Cacher le code
- Les capsules Gemini utilisent malheureusement souvent des en-têtes en ascii-art rendus avec des rectangles pleins à largeur fixe. Quand les rectangles pleins sont cachés, ils nécessitent un clic pour être affichés, ce qui améliore l\'ergonomie en cas d\'utilisation d\'un lecteur d\'écran.
Utiliser une couleur d\'arrière-plan personnalisée
Couleur d\'arrière-plan
Couleur d\'arrière-plan
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88148d3..b90146b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,7 +57,7 @@
Web Content
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.
Open internally
- Inline images
+ Inline local images
Only PKCS12 client keystores are currently supported
Client Certificate
Tap to select client certificate
@@ -73,10 +73,6 @@
Import bookmarks
Export bookmarks
Accessibility
- Hide code blocks
- Show code
- Hide code
- Gemini capsules unfortunately often use ascii-art headers rendered in monospaced code blocks. When code blocks are hidden they require a tap to expand which improves usability when using a screen reader.
Use custom page background colour
Page Background Colour
Page Background Colour