From 805158ad14dd873ea3e1a5259a8df89a05d81109 Mon Sep 17 00:00:00 2001
From: Lag <>
Date: Tue, 7 Mar 2023 17:29:25 +0100
Subject: [PATCH] Better quality selection

---
 .../res/layout/player_prioritize_item.xml     |  5 +++--
 .../layout/player_quality_profile_item.xml    |  2 +-
 .../layout/player_select_source_and_subs.xml  | 19 ++++++++++---------
 .../layout/player_select_source_priority.xml  | 16 ++++++++--------
 app/src/main/res/values/strings.xml           |  3 +++
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/layout/player_prioritize_item.xml b/app/src/main/res/layout/player_prioritize_item.xml
index 513d413f..b78863f8 100644
--- a/app/src/main/res/layout/player_prioritize_item.xml
+++ b/app/src/main/res/layout/player_prioritize_item.xml
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingHorizontal="15dp"
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
@@ -11,8 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_toStartOf="@+id/subtract_button"
-        android:paddingStart="25dp"
-        android:paddingEnd="25dp"
         tools:text="hello" />
 
     <ImageView
@@ -21,6 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toStartOf="@id/priority_number"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
         android:src="@drawable/baseline_remove_24" />
 
@@ -41,6 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
         android:src="@drawable/ic_baseline_add_24" />
 
diff --git a/app/src/main/res/layout/player_quality_profile_item.xml b/app/src/main/res/layout/player_quality_profile_item.xml
index faff71ca..ad2a29a0 100644
--- a/app/src/main/res/layout/player_quality_profile_item.xml
+++ b/app/src/main/res/layout/player_quality_profile_item.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:textSize="16sp"
         android:padding="10dp"
-        tools:text="Mobile data" />
+        tools:text="@string/mobile_data" />
 
     <TextView
         android:id="@+id/text_is_wifi"
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index dc6b0684..4aefb5cb 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -29,35 +29,36 @@
                 android:background="@drawable/outline_drawable_less"
                 android:foreground="?attr/selectableItemBackgroundBorderless"
                 android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingTop="10dp"
-                android:paddingBottom="10dp">
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                    android:paddingTop="10dp"
                     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                    android:paddingBottom="10dp"
                     android:text="@string/pick_source"
                     android:textColor="?attr/textColor"
                     android:textSize="20sp"
                     android:textStyle="bold" />
 
                 <TextView
-                    tools:text="Profile 1"
-                    android:minWidth="140dp"
                     android:id="@+id/source_settings_btt"
                     android:layout_width="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
                     android:layout_height="match_parent"
                     android:layout_gravity="center"
-                    android:gravity="center"
-                    android:paddingHorizontal="10dp"
+                    android:background="@drawable/outline_drawable"
+                    android:foreground="?attr/selectableItemBackgroundBorderless"
                     android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:minWidth="140dp"
+                    android:paddingHorizontal="10dp"
                     android:textColor="?attr/textColor"
                     android:textSize="15sp"
-                    app:drawableEndCompat="@drawable/ic_outline_settings_24" />
+                    app:drawableEndCompat="@drawable/ic_outline_settings_24"
+                    tools:text="@string/profile_number" />
             </LinearLayout>
 
             <ListView
diff --git a/app/src/main/res/layout/player_select_source_priority.xml b/app/src/main/res/layout/player_select_source_priority.xml
index 2379fb25..d8cf3bca 100644
--- a/app/src/main/res/layout/player_select_source_priority.xml
+++ b/app/src/main/res/layout/player_select_source_priority.xml
@@ -71,18 +71,16 @@
                     android:layout_height="wrap_content"
                     android:layout_rowWeight="1"
                     android:layout_marginTop="10dp"
-                    android:background="@drawable/outline_drawable_less"
-                    android:foreground="?attr/selectableItemBackgroundBorderless"
                     android:orientation="horizontal">
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
                         android:paddingTop="10dp"
                         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                         android:paddingBottom="10dp"
-                        android:layout_weight="1"
                         android:text="@string/qualities"
                         android:textColor="?attr/textColor"
                         android:textSize="20sp"
@@ -90,11 +88,12 @@
 
                     <ImageView
                         android:id="@+id/help_btt"
-                        android:padding="12dp"
                         android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:padding="12dp"
                         android:src="@drawable/baseline_help_outline_24"
-                        android:layout_height="50dp">
-                    </ImageView>
+                        android:contentDescription="@string/help" />
 
                 </LinearLayout>
 
@@ -146,7 +145,8 @@
             android:textColor="?attr/textColor"
             android:textSize="20sp"
             android:textStyle="bold"
-            tools:text="Profile 1" />
+            tools:text="@string/profile_number"
+            android:autofillHints="username" />
         <!--        <ImageView-->
         <!--            android:layout_width="50dp"-->
         <!--            android:layout_height="50dp"-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a094e10..989ee818 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -668,6 +668,9 @@
     <string name="quality_profile_help">
         Here you can change how the sources are ordered. If a video has a higher priority it will appear higher in the source selection.
         The sum of the source priority and the quality priority is the video priority.
+        \n\nSource A: 3
+        \nQuality B: 7
+        \nWill have a combined video priority of 10.
 
         \n\nNOTE: If the sum is 10 or more the player will automatically skip loading when that link is loaded!
     </string>