From 458052c22fe3a0b4017b2c130f7a50a5a8367fd1 Mon Sep 17 00:00:00 2001 From: Fahim Masud Choudhury Date: Mon, 27 Jan 2025 17:46:32 +0600 Subject: [PATCH] feat: format F-Droid and PWA apps' description with correct style F-Droid and PWA apps' description come as plain text whereas Google Play apps' description are in HTML. These descriptions are now formatted based on their source - either HTML or plain text. --- .../e/apps/ui/application/ApplicationFragment.kt | 13 ++++++++++--- .../ui/application/subFrags/DescriptionFragment.kt | 4 +--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt index f5ee3f476..12fe6c4c4 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt @@ -267,12 +267,19 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { } private fun updateAppDescriptionText(it: Application) { - binding.appDescription.text = - Html.fromHtml(it.description, Html.FROM_HTML_MODE_COMPACT) + val description = + if (it.isFDroidApp || it.is_pwa) { + it.description + } else { + Html.fromHtml(it.description, Html.FROM_HTML_MODE_COMPACT) + } + binding.appDescription.text = description binding.appDescriptionMore.setOnClickListener { view -> val action = - ApplicationFragmentDirections.actionApplicationFragmentToDescriptionFragment(it.description) + ApplicationFragmentDirections.actionApplicationFragmentToDescriptionFragment( + description.toString() + ) view.findNavController().navigate(action) } } diff --git a/app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt index 590f27d81..d0bc079be 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/subFrags/DescriptionFragment.kt @@ -1,7 +1,6 @@ package foundation.e.apps.ui.application.subFrags import android.os.Bundle -import android.text.Html import android.view.View import androidx.fragment.app.Fragment import androidx.navigation.findNavController @@ -27,8 +26,7 @@ class DescriptionFragment : Fragment(R.layout.fragment_description) { view.findNavController().navigateUp() } } - - binding.descriptionTV.text = Html.fromHtml(args.description, Html.FROM_HTML_MODE_COMPACT) + binding.descriptionTV.text = args.description } override fun onDestroyView() { -- GitLab