From f8ef06dc649122a050d276b3289a15d87f99f478 Mon Sep 17 00:00:00 2001 From: KingLucius Date: Sun, 25 Feb 2024 14:38:47 +0200 Subject: [PATCH] use no focus tag from strings --- app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt | 3 ++- .../com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt | 2 +- app/src/main/res/layout/fragment_home_head_tv.xml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt index fd8892d1..732c77fd 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt @@ -61,6 +61,7 @@ import com.lagradost.cloudstream3.APIHolder.apis import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings import com.lagradost.cloudstream3.APIHolder.initAll import com.lagradost.cloudstream3.APIHolder.updateHasTrailers +import com.lagradost.cloudstream3.AcraApplication.Companion.context import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey @@ -1185,7 +1186,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener { if(isTrueTvSettings()) { newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus -> - if (newFocus?.tag == "tv_no_focus_tag") return@addOnGlobalFocusChangeListener + if (newFocus?.tag == context?.getString(R.string.tv_no_focus_tag)) return@addOnGlobalFocusChangeListener centerView(newFocus) } } 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 5793edae..4f880286 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 @@ -253,7 +253,7 @@ class ResultFragmentTv : Fragment() { val leftListener: View.OnFocusChangeListener = View.OnFocusChangeListener { view, hasFocus -> if (!hasFocus) return@OnFocusChangeListener - if (view?.tag == "tv_no_focus_tag"){ + if (view?.tag == context?.getString(R.string.tv_no_focus_tag)){ resultFinishLoading.scrollTo(0,0) } toggleEpisodes(false) diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml index de06eccd..2c15ca2d 100644 --- a/app/src/main/res/layout/fragment_home_head_tv.xml +++ b/app/src/main/res/layout/fragment_home_head_tv.xml @@ -157,7 +157,7 @@ android:id="@+id/home_preview_hidden_prev_focus" android:layout_width="1dp" android:layout_height="1dp" - android:tag="tv_no_focus_tag" + android:tag="@string/tv_no_focus_tag" android:focusable="false" />