From 0d38b4b601df08d43378e0fa1693c522a2bb25b1 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Thu, 7 Mar 2024 15:24:45 -0700 Subject: [PATCH] Use maxLines for description Looks nicer in UI and is more reliable --- .../cloudstream3/ui/result/EpisodeAdapter.kt | 5 +---- .../cloudstream3/ui/result/ResultFragmentPhone.kt | 11 +++-------- .../cloudstream3/ui/result/ResultFragmentTv.kt | 9 +++------ app/src/main/res/layout/fragment_result.xml | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt index fa81aa16..b12475bf 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt @@ -253,12 +253,9 @@ class EpisodeAdapter( clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card)) } else { isExpanded = !isExpanded - maxLines = if (isExpanded) { Integer.MAX_VALUE - } else { - 4 - } + } else 4 } } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt index 1dfb62c4..6105e8c9 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt @@ -11,7 +11,6 @@ import android.graphics.Rect import android.os.Build import android.os.Bundle import android.text.Editable -import android.text.InputFilter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -63,14 +62,12 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent import com.lagradost.cloudstream3.ui.search.SearchAdapter import com.lagradost.cloudstream3.ui.search.SearchHelper import com.lagradost.cloudstream3.utils.AppUtils.getNameFull -import com.lagradost.cloudstream3.utils.AppUtils.html import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable import com.lagradost.cloudstream3.utils.AppUtils.loadCache import com.lagradost.cloudstream3.utils.AppUtils.openBrowser import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant -import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogText import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog import com.lagradost.cloudstream3.utils.UIHelper import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute @@ -695,11 +692,9 @@ open class ResultFragmentPhone : FullScreenPlayer() { setTextHtml(d.plotText) setOnClickListener { isExpanded = !isExpanded - filters = if (isExpanded) { - arrayOf(InputFilter.LengthFilter(Integer.MAX_VALUE)) - } else { - arrayOf(InputFilter.LengthFilter(1000)) - } + maxLines = if (isExpanded) { + Integer.MAX_VALUE + } else 10 } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt index 0cafcf42..3801ea21 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt @@ -4,7 +4,6 @@ import android.animation.Animator import android.annotation.SuppressLint import android.app.Dialog import android.os.Bundle -import android.text.InputFilter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -843,11 +842,9 @@ class ResultFragmentTv : Fragment() { setOnClickListener { if (context.isEmulatorSettings()) { isExpanded = !isExpanded - filters = if (isExpanded) { - arrayOf(InputFilter.LengthFilter(Integer.MAX_VALUE)) - } else { - arrayOf(InputFilter.LengthFilter(1000)) - } + maxLines = if (isExpanded) { + Integer.MAX_VALUE + } else 10 } else { view.context?.let { ctx -> val builder: AlertDialog.Builder = diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml index 70461518..961ea52d 100644 --- a/app/src/main/res/layout/fragment_result.xml +++ b/app/src/main/res/layout/fragment_result.xml @@ -409,8 +409,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" + android:maxLines="10" android:foreground="@drawable/outline_drawable" - android:maxLength="1000" android:nextFocusUp="@id/result_back" android:nextFocusDown="@id/result_bookmark_button" android:paddingTop="5dp"