Fix(UI): Varius highlight/color changes for better accessibility, Closes #2024

fire-light42 · web-flow · commit fe0475f441c6 · 2025-10-18T20:34:05.000+02:00
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.search
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.ColorStateList
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -25,6 +26,7 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 
 object SearchResultBuilder {
@@ -324,5 +326,8 @@ object SearchResultBuilder {
             }
             boxes[boxes.size - 1].setBackgroundResource(R.drawable.bg_color_bottom)
         }
+        textIsDub?.apply {
+            backgroundTintList = ColorStateList.valueOf(context.colorFromAttribute(R.attr.textColor))
+        }
     }
 }
diff --git a/app/src/main/res/color/black_button_ripple.xml b/app/src/main/res/color/black_button_ripple.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/transparent" android:state_focused="true" />
+    <item android:color="?attr/textColor" />
+</selector>
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
@@ -50,10 +50,10 @@
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
                 android:padding="5dp"
-                android:visibility="gone"
-                tools:visibility="visible"
                 android:src="@drawable/ic_baseline_sort_24"
-                app:tint="?attr/textColor" />
+                android:visibility="gone"
+                app:tint="?attr/textColor"
+                tools:visibility="visible" />
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -78,11 +78,11 @@
 
                     android:nextFocusRight="@id/search_filter"
                     android:paddingStart="-10dp"
+                    app:closeIcon="@drawable/ic_baseline_close_24"
                     app:iconifiedByDefault="false"
                     app:queryBackground="@color/transparent"
                     app:queryHint="@string/search_hint"
                     app:searchIcon="@drawable/search_icon"
-                    app:closeIcon="@drawable/ic_baseline_close_24"
                     tools:ignore="RtlSymmetry">
 
                 </androidx.appcompat.widget.SearchView>
@@ -159,6 +159,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="40dp">
+
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/library_random"
             style="@style/ExtendedFloatingActionButton"
@@ -195,6 +196,7 @@
         app:tabIndicatorGravity="center"
         app:tabIndicatorHeight="30dp"
         app:tabMode="scrollable"
+        app:tabRippleColor="?attr/textColor"
         app:tabSelectedTextColor="?attr/primaryBlackBackground"
         app:tabTextAppearance="@style/TabNoCaps"
         app:tabTextColor="?attr/textColor" />
diff --git a/app/src/main/res/layout/fragment_library_tv.xml b/app/src/main/res/layout/fragment_library_tv.xml
@@ -36,14 +36,14 @@
                 android:layout_height="25dp"
                 android:layout_gravity="end|center_vertical"
                 android:layout_marginStart="10dp"
-                android:padding="2dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
                 android:focusable="true"
                 android:nextFocusLeft="@id/navigation_library"
                 android:nextFocusRight="@id/library_sort"
-                android:tag="@string/tv_no_focus_tag"
+                android:padding="2dp"
                 android:src="@drawable/ic_baseline_extension_24"
+                android:tag="@string/tv_no_focus_tag"
                 app:tint="?attr/textColor" />
 
             <ImageView
@@ -57,24 +57,24 @@
                 android:focusable="true"
                 android:nextFocusLeft="@id/provider_selector"
                 android:nextFocusRight="@id/list_selector"
-                android:tag="@string/tv_no_focus_tag"
                 android:src="@drawable/ic_baseline_sort_24"
+                android:tag="@string/tv_no_focus_tag"
                 app:tint="?attr/textColor" />
 
             <ImageView
                 android:id="@+id/list_selector"
                 android:layout_width="25dp"
                 android:layout_height="25dp"
                 android:layout_gravity="end|center_vertical"
-                android:padding="1dp"
                 android:layout_marginStart="10dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
                 android:focusable="true"
                 android:nextFocusLeft="@id/library_sort"
                 android:nextFocusRight="@id/main_search"
-                android:tag="@string/tv_no_focus_tag"
+                android:padding="1dp"
                 android:src="@drawable/ic_baseline_filter_list_24"
+                android:tag="@string/tv_no_focus_tag"
                 app:tint="?attr/textColor" />
 
             <FrameLayout
@@ -91,19 +91,19 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
 
+                    android:focusable="true"
                     android:iconifiedByDefault="false"
                     android:imeOptions="actionSearch"
                     android:inputType="text"
-                    android:focusable="true"
-                    android:tag="tv_no_focus_tag"
                     android:nextFocusLeft="@id/list_selector"
                     android:nextFocusDown="@id/search_result_root"
                     android:paddingStart="-10dp"
+                    android:tag="tv_no_focus_tag"
+                    app:closeIcon="@drawable/ic_baseline_close_24"
                     app:iconifiedByDefault="false"
                     app:queryBackground="@color/transparent"
                     app:queryHint="@string/search_hint"
                     app:searchIcon="@drawable/search_icon"
-                    app:closeIcon="@drawable/ic_baseline_close_24"
                     tools:ignore="RtlSymmetry">
 
                 </androidx.appcompat.widget.SearchView>
@@ -116,16 +116,17 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="top"
-            android:nextFocusDown="@id/search_result_root"
             android:background="?attr/primaryGrayBackground"
-            android:paddingHorizontal="5dp"
             android:focusable="true"
+            android:nextFocusDown="@id/search_result_root"
+            android:paddingHorizontal="5dp"
             app:tabGravity="center"
             app:tabIndicator="@drawable/indicator_background"
             app:tabIndicatorColor="?attr/white"
             app:tabIndicatorGravity="center"
             app:tabIndicatorHeight="30dp"
             app:tabMode="scrollable"
+            app:tabRippleColor="?attr/textColor"
             app:tabSelectedTextColor="?attr/primaryBlackBackground"
             app:tabTextAppearance="@style/TabNoCaps"
             app:tabTextColor="?attr/textColor" />
@@ -136,23 +137,23 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <androidx.viewpager2.widget.ViewPager2
-                android:id="@+id/viewpager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:paddingBottom="40dp"
-                android:focusable="true"
-                android:tag="@string/tv_no_focus_tag"
-                tools:listitem="@layout/library_viewpager_page" />
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:focusable="true"
+            android:paddingBottom="40dp"
+            android:tag="@string/tv_no_focus_tag"
+            tools:listitem="@layout/library_viewpager_page" />
 
         <LinearLayout
             android:id="@+id/library_loading_overlay"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="?attr/primaryBlackBackground"
             android:focusable="false"
             android:tag="@string/tv_no_focus_tag"
-            android:background="?attr/primaryBlackBackground"
             android:visibility="gone"
             tools:visibility="visible">
 
@@ -162,10 +163,10 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:layout_margin="2dp"
-                app:shimmer_auto_start="true"
-                app:shimmer_base_alpha="0.2"
                 android:focusable="false"
                 android:tag="@string/tv_no_focus_tag"
+                app:shimmer_auto_start="true"
+                app:shimmer_base_alpha="0.2"
                 app:shimmer_duration="@integer/loading_time"
                 app:shimmer_highlight_alpha="0.3">
 
@@ -174,11 +175,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
+                    android:focusable="false"
                     android:gravity="center"
                     android:horizontalSpacing="10dp"
                     android:numColumns="3"
                     android:paddingBottom="120dp"
-                    android:focusable="false"
                     android:tag="@string/tv_no_focus_tag"
                     android:verticalSpacing="10dp"
                     tools:listitem="@layout/loading_poster_dynamic" />
@@ -190,6 +191,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="40dp">
+
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/library_random"
             style="@style/ExtendedFloatingActionButton"
@@ -207,9 +209,9 @@
             android:text="@string/sort"
             android:textColor="?attr/textColor"
             android:visibility="gone"
-            tools:visibility="visible"
             app:icon="@drawable/ic_baseline_sort_24"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:visibility="visible" />
     </FrameLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -140,6 +140,9 @@
 
     <style name="DubButton" parent="@style/SearchBox">
         <item name="android:text">@string/app_dubbed_text</item>
+        <!-- Background is set programmatically -->
+        <item name="textColor">?attr/primaryGrayBackground</item>
+        <item name="android:textColor">?attr/primaryGrayBackground</item>
     </style>
 
     <style name="SubButton" parent="@style/SearchBox">
@@ -741,7 +744,7 @@
         <item name="backgroundTint">?attr/iconGrayBackground</item>
         <item name="iconTint">?attr/textColor</item>
         <item name="android:textColor">?attr/textColor</item>
-        <item name="rippleColor">?attr/textColor</item>
+        <item name="rippleColor">@color/black_button_ripple</item>
     </style>
 
     <style name="SmallBlackButton" parent="BlackButton">

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.search`
`2`	`2`
`3`	`3`	`import android.annotation.SuppressLint`
`4`	`4`	`import android.content.Context`
	`5`	`+import android.content.res.ColorStateList`
`5`	`6`	`import android.view.View`
`6`	`7`	`import android.widget.ImageView`
`7`	`8`	`import android.widget.ProgressBar`
`@@ -25,6 +26,7 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper`
`25`	`26`	`import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual`
`26`	`27`	`import com.lagradost.cloudstream3.utils.ImageLoader.loadImage`
`27`	`28`	`import com.lagradost.cloudstream3.utils.SubtitleHelper`
	`29`	`+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute`
`28`	`30`	`import com.lagradost.cloudstream3.utils.getImageFromDrawable`
`29`	`31`
`30`	`32`	`object SearchResultBuilder {`
`@@ -324,5 +326,8 @@ object SearchResultBuilder {`
`324`	`326`	`}`
`325`	`327`	`boxes[boxes.size - 1].setBackgroundResource(R.drawable.bg_color_bottom)`
`326`	`328`	`}`
	`329`	`+ textIsDub?.apply {`
	`330`	`+ backgroundTintList = ColorStateList.valueOf(context.colorFromAttribute(R.attr.textColor))`
	`331`	`+ }`
`327`	`332`	`}`
`328`	`333`	`}`