From 2024f88bb218b27d2a2766745dedbc263fabf3a3 Mon Sep 17 00:00:00 2001 From: Corewala Date: Mon, 17 Jan 2022 18:56:42 -0500 Subject: [PATCH] Removed code block toggle --- .../java/corewala/buran/ui/GemActivity.kt | 6 --- .../gemtext_adapter/AbstractGemtextAdapter.kt | 2 - .../ui/gemtext_adapter/GemtextAdapter.kt | 46 ------------------- .../buran/ui/settings/SettingsFragment.kt | 12 ----- .../main/res/layout/gemtext_code_block.xml | 17 +------ app/src/main/res/values-fr/strings.xml | 4 -- app/src/main/res/values/strings.xml | 4 -- 7 files changed, 1 insertion(+), 90 deletions(-) diff --git a/app/src/main/java/corewala/buran/ui/GemActivity.kt b/app/src/main/java/corewala/buran/ui/GemActivity.kt index 96a4255..1ee8be6 100644 --- a/app/src/main/java/corewala/buran/ui/GemActivity.kt +++ b/app/src/main/java/corewala/buran/ui/GemActivity.kt @@ -274,12 +274,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..b099678 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 @@ -10,7 +10,6 @@ abstract class AbstractGemtextAdapter( ): RecyclerView.Adapter() { var showInlineIcons: Boolean = false - var hideCodeBlocks: Boolean = false var showLinkButtons: Boolean = false var showInlineImages: Boolean = false @@ -18,7 +17,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 254a5ee..a7cab5b 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 @@ -95,27 +95,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 -> { @@ -280,26 +259,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] @@ -337,9 +296,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 6897f61..187b46d 100644 --- a/app/src/main/res/layout/gemtext_code_block.xml +++ b/app/src/main/res/layout/gemtext_code_block.xml @@ -9,27 +9,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - - + android:layout_marginBottom="@dimen/def_quarter"> 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 8149dd5..ba5c61e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -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