From 19d9034e65ecddd29112eaa1178ab70c200e2625 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:05:53 -0700
Subject: [PATCH] Cleanup

---
 .../cloudstream3/ui/account/AccountAdapter.kt |  1 +
 .../cloudstream3/ui/account/AccountHelper.kt  |  8 +--
 .../main/res/layout/account_edit_dialog.xml   | 55 ++++++----------
 app/src/main/res/layout/account_list_item.xml | 64 +++++++++----------
 .../main/res/layout/account_list_item_add.xml |  5 +-
 .../res/layout/account_list_item_edit.xml     | 10 +--
 .../main/res/layout/account_select_linear.xml | 44 ++++---------
 .../res/layout/activity_account_select.xml    |  3 +-
 8 files changed, 75 insertions(+), 115 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 0d43c39a..644018ac 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
@@ -98,6 +98,7 @@ class AccountAdapter(
                     }
 
                     if (isTv) {
+                        // For emulator but this is fine on TV also
                         root.isFocusableInTouchMode = true
                         if (isLastUsedAccount) {
                             root.requestFocus()
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 d388cd1f..1e2797e3 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
@@ -48,7 +48,7 @@ object AccountHelper {
         var currentEditAccount = account
         val dialog = builder.show()
 
-        if (!isNewAccount) binding.text1.setText(R.string.edit_account)
+        if (!isNewAccount) binding.title.setText(R.string.edit_account)
 
         // Set up the dialog content
         binding.accountName.text = Editable.Factory.getInstance()?.newEditable(account.name)
@@ -98,12 +98,12 @@ object AccountHelper {
         }
 
         // Handle the profile picture and its interactions
-        binding.profilePic.setImage(account.image)
-        binding.profilePic.setOnClickListener {
+        binding.accountImage.setImage(account.image)
+        binding.accountImage.setOnClickListener {
             // Roll the image forwards once
             currentEditAccount =
                 currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % DataStoreHelper.profileImages.size)
-            binding.profilePic.setImage(currentEditAccount.image)
+            binding.accountImage.setImage(currentEditAccount.image)
         }
 
         // Handle applying changes
diff --git a/app/src/main/res/layout/account_edit_dialog.xml b/app/src/main/res/layout/account_edit_dialog.xml
index cd9c07d3..9d39425a 100644
--- a/app/src/main/res/layout/account_edit_dialog.xml
+++ b/app/src/main/res/layout/account_edit_dialog.xml
@@ -15,13 +15,12 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/text1"
+            android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_rowWeight="1"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
-
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
             android:text="@string/create_account"
@@ -31,23 +30,6 @@
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/text2"
-        android:layout_width="match_parent"
-
-        android:layout_height="wrap_content"
-        android:layout_rowWeight="1"
-        android:layout_gravity="center_vertical"
-
-        android:layout_marginBottom="10dp"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:textColor="?attr/grayTextColor"
-        android:textSize="15sp"
-        android:visibility="gone"
-        tools:text="Gogoanime" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -81,56 +63,55 @@
             app:cardCornerRadius="@dimen/rounded_image_radius">
 
             <ImageView
-                android:foreground="@drawable/outline_drawable_forced_round"
-                android:id="@+id/profile_pic"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
+                android:id="@+id/account_image"
+                android:src="@drawable/profile_bg_blue"
                 android:focusable="true"
                 android:contentDescription="@string/preview_background_img_des"
                 android:scaleType="centerCrop"
-                android:src="@drawable/profile_bg_blue" />
+                android:foreground="@drawable/outline_drawable_forced_round"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_gravity="center" />
+
         </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <RelativeLayout
         android:id="@+id/apply_btt_holder"
+        android:orientation="horizontal"
+        android:padding="10dp"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_gravity="bottom"
-        android:layout_marginTop="-60dp"
-        android:orientation="horizontal"
-        android:padding="10dp">
+        android:layout_marginTop="-60dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/delete_btt"
-            style="@style/BlackButton"
+            android:text="@string/delete"
             android:layout_width="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_gravity="center_vertical"
             android:nextFocusRight="@id/apply_btt"
-            android:text="@string/delete" />
+            style="@style/BlackButton" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/apply_btt"
-            style="@style/WhiteButton"
-
+            android:text="@string/sort_apply"
             android:layout_width="wrap_content"
             android:layout_gravity="center_vertical|end"
             android:layout_toStartOf="@+id/cancel_btt"
             android:nextFocusLeft="@id/delete_btt"
             android:nextFocusRight="@id/cancel_btt"
-            android:text="@string/sort_apply" />
+            style="@style/WhiteButton" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_btt"
-            style="@style/BlackButton"
-
+            android:text="@string/sort_cancel"
             android:layout_width="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_gravity="center_vertical|end"
             android:nextFocusLeft="@id/apply_btt"
-            android:text="@string/sort_cancel" />
-    </RelativeLayout>
+            style="@style/BlackButton" />
 
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml
index 3331b85b..f133d6c3 100644
--- a/app/src/main/res/layout/account_list_item.xml
+++ b/app/src/main/res/layout/account_list_item.xml
@@ -9,9 +9,9 @@
     android:animateLayoutChanges="true"
     android:backgroundTint="?attr/primaryGrayBackground"
     android:foreground="?attr/selectableItemBackground"
-    app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="10dp"
     android:focusable="true"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
@@ -19,38 +19,38 @@
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/account_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0.4"
-            android:contentDescription="@string/profile_background_des"
-            android:scaleType="centerCrop" />
+    <ImageView
+        android:id="@+id/account_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.4"
+        android:scaleType="centerCrop" />
 
-        <View
-            android:id="@+id/outline"
-            tools:visibility="visible"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/outline_card"
-            android:visibility="gone" />
+    <View
+        android:id="@+id/outline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/outline_card"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-        <ImageView
-            android:id="@+id/lock_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="top|end"
-            android:layout_margin="4dp"
-            android:src="@drawable/video_locked"
-            android:visibility="gone" />
+    <ImageView
+        android:id="@+id/lock_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="4dp"
+        android:src="@drawable/video_locked"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/account_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:padding="10dp"
-            android:textSize="16sp" />
+    <TextView
+        android:id="@+id/account_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:padding="10dp"
+        android:textSize="16sp" />
 
-    </androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
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 e43417af..dea64484 100644
--- a/app/src/main/res/layout/account_list_item_add.xml
+++ b/app/src/main/res/layout/account_list_item_add.xml
@@ -8,9 +8,9 @@
     android:animateLayoutChanges="true"
     android:backgroundTint="?attr/primaryGrayBackground"
     android:foreground="?attr/selectableItemBackground"
-    app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="10dp"
     android:focusable="true"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
@@ -26,5 +26,4 @@
         android:scaleType="centerCrop"
         android:contentDescription="@string/add_account" />
 
-</androidx.cardview.widget.CardView>
-
+</androidx.cardview.widget.CardView>
\ No newline at end of file
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 4732ae49..0adade19 100644
--- a/app/src/main/res/layout/account_list_item_edit.xml
+++ b/app/src/main/res/layout/account_list_item_edit.xml
@@ -9,9 +9,9 @@
     android:animateLayoutChanges="true"
     android:backgroundTint="?attr/primaryGrayBackground"
     android:foreground="?attr/selectableItemBackground"
-    app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="10dp"
     android:focusable="true"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
@@ -24,16 +24,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:alpha="0.1"
-        android:contentDescription="@string/profile_background_des"
         android:scaleType="centerCrop" />
 
     <View
         android:id="@+id/outline"
-        tools:visibility="visible"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/outline_card"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/lock_icon"
@@ -42,7 +41,8 @@
         android:layout_gravity="top|end"
         android:layout_margin="4dp"
         android:src="@drawable/video_locked"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/pencil_icon"
diff --git a/app/src/main/res/layout/account_select_linear.xml b/app/src/main/res/layout/account_select_linear.xml
index b1594c83..47300273 100644
--- a/app/src/main/res/layout/account_select_linear.xml
+++ b/app/src/main/res/layout/account_select_linear.xml
@@ -1,57 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <TextView
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:layout_marginTop="20dp"
         android:textStyle="bold"
         android:text="@string/switch_account"
         android:textSize="20sp"
         android:textColor="?attr/textColor"
         android:layout_width="match_parent"
         android:layout_rowWeight="1"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:text="@string/history"
-        android:textSize="15sp"
-        android:textColor="?attr/grayTextColor"
-        android:layout_width="match_parent"
-        android:layout_rowWeight="1"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:text="@string/error_bookmarks_text"
-        android:textSize="15sp"
-        android:textColor="?attr/grayTextColor"
-        android:layout_width="match_parent"
-        android:layout_rowWeight="1"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:layout_marginTop="10dp"
-        android:descendantFocusability="afterDescendants"
         android:id="@+id/account_recycler_view"
+        android:orientation="horizontal"
+        android:descendantFocusability="afterDescendants"
+        android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
-        android:orientation="horizontal"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:itemCount="4"
-        tools:listitem="@layout/account_list_item">
-
-        <requestFocus />
-    </androidx.recyclerview.widget.RecyclerView>
+        tools:listitem="@layout/account_list_item" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/manage_accounts_button"
@@ -63,4 +40,5 @@
         android:textSize="16sp"
         app:icon="@drawable/ic_baseline_edit_24"
         style="@style/Widget.MaterialComponents.Button.TextButton" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index 3bf5e065..bd6007dc 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -44,5 +44,6 @@
             android:layout_gravity="center_horizontal"
             android:paddingLeft="16dp"
             android:paddingRight="16dp" />
+
     </LinearLayout>
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file