From 1aebf5977e691b6fad223274f4d36e767c1b6668 Mon Sep 17 00:00:00 2001
From: ByAyzen <189399597+ByAyzen@users.noreply.github.com>
Date: Sat, 26 Sep 2026 22:09:47 +0300
Subject: [PATCH] Fix: Bug fixes for account

---
 .../cloudstream3/ui/account/AccountAdapter.kt         |  6 ++++--
 .../cloudstream3/ui/account/AccountHelper.kt          | 11 ++++++-----
 app/src/main/res/drawable/rounded_outline.xml         |  1 +
 app/src/main/res/layout/account_list_item.xml         |  6 ++++--
 app/src/main/res/layout/account_list_item_add.xml     |  2 ++
 app/src/main/res/layout/account_list_item_edit.xml    |  6 ++++--
 app/src/main/res/layout/activity_account_select.xml   |  1 +
 app/src/main/res/layout/bottom_input_dialog.xml       | 11 ++++++++---
 8 files changed, 30 insertions(+), 14 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 0b87509c49b..f7045828573 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
@@ -57,8 +57,9 @@ class AccountAdapter(
                 accountName.text = item.name
                 accountImage.loadImage(item.image)
                 lockIcon.isVisible = item.lockPin != null
+                root.isSelected = isLastUsedAccount
+                cardView.isSelected = isLastUsedAccount
 
-                if (isTv && isLastUsedAccount) root.requestFocus()
                 if (!isTv) cardView.setRippleForeground()
 
                 if (!isTv) {
@@ -86,8 +87,9 @@ class AccountAdapter(
                 accountName.text = item.name
                 accountImage.loadImage(item.image)
                 lockIcon.isVisible = item.lockPin != null
+                root.isSelected = isLastUsedAccount
+                cardView.isSelected = isLastUsedAccount
 
-                if (isTv && isLastUsedAccount) root.requestFocus()
                 if (!isTv) cardView.setRippleForeground()
 
                 root.setOnClickListener {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
index 15c87deac2d..c88f70a7395 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
@@ -177,10 +177,11 @@ object AccountHelper {
         canSetPin = true
 
         binding.editProfilePhotoButtonHolder.setOnClickListener {
-            val bottomSheetDialog = BottomSheetDialog(context)
+            val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
             val sheetBinding = BottomInputDialogBinding.inflate(LayoutInflater.from(context))
-            bottomSheetDialog.setContentView(sheetBinding.root)
-            bottomSheetDialog.show()
+            builder.setView(sheetBinding.root)
+            val dialog = builder.create()
+            dialog.show()
 
             sheetBinding.apply {
                 text1.text = context.getString(R.string.edit_profile_image_title)
@@ -205,7 +206,7 @@ object AccountHelper {
                                     R.string.edit_profile_image_success,
                                     Toast.LENGTH_SHORT
                                 )
-                                bottomSheetDialog.dismissSafe()
+                                dialog.dismissSafe()
                             },
                             onError = { _, _ ->
                                 showToast(
@@ -222,7 +223,7 @@ object AccountHelper {
                     imageLoader.enqueue(request)
                 }
                 sheetBinding.cancelBtt.setOnClickListener {
-                    bottomSheetDialog.dismissSafe()
+                    dialog.dismissSafe()
                 }
             }
         }
diff --git a/app/src/main/res/drawable/rounded_outline.xml b/app/src/main/res/drawable/rounded_outline.xml
index 117506429fe..752cd78235b 100644
--- a/app/src/main/res/drawable/rounded_outline.xml
+++ b/app/src/main/res/drawable/rounded_outline.xml
@@ -2,6 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true" android:drawable="@drawable/oval_stroke_focus" />
     <item android:state_hovered="true" android:drawable="@drawable/oval_stroke_focus" />
+    <item android:state_pressed="true" android:drawable="@drawable/oval_stroke_focus" />
     <item>
         <shape android:shape="oval">
             <stroke android:width="2dp" android:color="?attr/account_unselected_stroke" />
diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml
index 2108b888d2b..9b3cef349c6 100644
--- a/app/src/main/res/layout/account_list_item.xml
+++ b/app/src/main/res/layout/account_list_item.xml
@@ -9,6 +9,8 @@
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:layout_margin="10dp"
+    android:focusable="true"
+    android:clickable="true"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:defaultFocusHighlightEnabled="false">
@@ -17,8 +19,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:clipChildren="false"
-        android:clipToPadding="false">
+        android:clipToPadding="false"
+        android:duplicateParentState="true">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_view"
diff --git a/app/src/main/res/layout/account_list_item_add.xml b/app/src/main/res/layout/account_list_item_add.xml
index 90089f7500e..7f91f6580c8 100644
--- a/app/src/main/res/layout/account_list_item_add.xml
+++ b/app/src/main/res/layout/account_list_item_add.xml
@@ -9,6 +9,8 @@
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:layout_margin="10dp"
+    android:focusable="true"
+    android:clickable="true"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:defaultFocusHighlightEnabled="false">
diff --git a/app/src/main/res/layout/account_list_item_edit.xml b/app/src/main/res/layout/account_list_item_edit.xml
index 71f0351d82c..d1dbef2ef40 100644
--- a/app/src/main/res/layout/account_list_item_edit.xml
+++ b/app/src/main/res/layout/account_list_item_edit.xml
@@ -9,6 +9,8 @@
     android:orientation="vertical"
     android:gravity="center_horizontal"
     android:layout_margin="10dp"
+    android:focusable="true"
+    android:clickable="true"
     android:clipChildren="false"
     android:clipToPadding="false"
     android:defaultFocusHighlightEnabled="false">
@@ -17,8 +19,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:clipChildren="false"
-        android:clipToPadding="false">
+        android:clipToPadding="false"
+        android:duplicateParentState="true">
 
         <androidx.cardview.widget.CardView
             android:id="@+id/card_view"
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index c91071fe491..444a04a18f9 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -43,6 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:descendantFocusability="afterDescendants"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/bottom_input_dialog.xml b/app/src/main/res/layout/bottom_input_dialog.xml
index bfb72805208..63f5e876de2 100644
--- a/app/src/main/res/layout/bottom_input_dialog.xml
+++ b/app/src/main/res/layout/bottom_input_dialog.xml
@@ -4,7 +4,7 @@
     android:nextFocusDown="@id/nginx_text_input"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/text1"
@@ -24,13 +24,13 @@
         android:id="@+id/nginx_text_input"
         android:nextFocusRight="@id/cancel_btt"
         android:nextFocusLeft="@id/apply_btt"
+        android:nextFocusDown="@id/apply_btt"
         android:layout_marginBottom="60dp"
         android:layout_marginHorizontal="10dp"
         android:paddingTop="10dp"
         android:requiresFadingEdge="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_rowWeight="1"
+        android:layout_height="wrap_content"
         android:autofillHints="no"
         android:inputType="text"
         tools:text="nginx.com"
@@ -42,6 +42,7 @@
         android:layout_gravity="bottom"
         android:gravity="bottom|end"
         android:layout_marginTop="-60dp"
+        android:padding="10dp"
         android:layout_width="match_parent"
         android:layout_height="60dp">
 
@@ -50,6 +51,8 @@
             android:layout_gravity="center_vertical|end"
             android:text="@string/sort_apply"
             android:id="@+id/apply_btt"
+            android:nextFocusUp="@id/nginx_text_input"
+            android:nextFocusRight="@id/cancel_btt"
             style="@style/WhiteButton" />
 
         <com.google.android.material.button.MaterialButton
@@ -57,6 +60,8 @@
             android:layout_gravity="center_vertical|end"
             android:text="@string/sort_cancel"
             android:id="@+id/cancel_btt"
+            android:nextFocusUp="@id/nginx_text_input"
+            android:nextFocusLeft="@id/apply_btt"
             style="@style/BlackButton" />
     </LinearLayout>
 </LinearLayout>