From 4644e523b013c1107ed1de1deb88af9107255316 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 30 Oct 2023 11:06:27 -0600
Subject: [PATCH] Fix focus and loadThemes for activity

---
 .../lagradost/cloudstream3/ui/account/AccountAdapter.kt    | 7 +++++--
 .../cloudstream3/ui/account/AccountSelectActivity.kt       | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
index 98bbf08f..72551199 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
@@ -25,8 +25,11 @@ class AccountAdapter(
             binding.lockIcon.isVisible = account.lockPin != null
             binding.outline.isVisible = isLastUsedAccount
 
-            if (isTvSettings() && isLastUsedAccount) {
-                binding.root.requestFocus()
+            if (isTvSettings()) {
+                binding.root.isFocusableInTouchMode = true
+                if (isLastUsedAccount) {
+                    binding.root.requestFocus()
+                }
             }
 
             binding.root.setOnClickListener {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 5f7e2916..0fbe2117 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.CommonActivity.loadThemes
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.ActivityAccountSelectBinding
@@ -21,6 +22,7 @@ class AccountSelectActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         CommonActivity.init(this)
+        loadThemes(this)
 
         val binding = if (isTvSettings()) {
             ActivityAccountSelectTvBinding.inflate(layoutInflater)