Fix: Some white theme issues with dialog text and quality profiles

fire-light42 · web-flow · commit 993dcd92f00d · 2025-10-28T22:42:34.000+01:00
diff --git a/app/src/main/res/layout/account_edit_dialog.xml b/app/src/main/res/layout/account_edit_dialog.xml
@@ -40,28 +40,28 @@
         <androidx.cardview.widget.CardView
             android:layout_width="@dimen/account_select_linear_item_size"
             android:layout_height="@dimen/account_select_linear_item_size"
-            app:cardCornerRadius="@dimen/rounded_image_radius"
             android:layout_gravity="center"
-            >
+            app:cardCornerRadius="@dimen/rounded_image_radius">
+
             <ImageView
                 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:foreground="@drawable/outline_drawable_forced_round"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_gravity="center" />
+                android:layout_gravity="center"
+                android:contentDescription="@string/preview_background_img_des"
+                android:focusable="true"
+                android:foreground="@drawable/outline_drawable_forced_round"
+                android:scaleType="centerCrop"
+                android:src="@drawable/profile_bg_blue" />
+
             <ImageView
                 android:id="@+id/edit_profile_photo_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_baseline_edit_24"
                 android:layout_gravity="bottom|end"
-                android:padding="5dp"
                 android:background="@color/skipOpTransparent"
-                />
+                android:padding="5dp"
+                android:src="@drawable/ic_baseline_edit_24" />
         </androidx.cardview.widget.CardView>
 
         <EditText
@@ -82,47 +82,49 @@
             android:id="@+id/lockProfileCheckbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/lock_profile" />
+            android:buttonTint="?attr/textColor"
+            android:text="@string/lock_profile"
+            android:textColor="?attr/grayTextColor" />
 
 
     </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:layout_marginTop="-60dp"
+        android:orientation="horizontal"
+        android:padding="10dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/delete_btt"
-            android:text="@string/delete"
+            style="@style/BlackButton"
             android:layout_width="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_gravity="center_vertical"
             android:nextFocusRight="@id/apply_btt"
-            style="@style/BlackButton" />
+            android:text="@string/delete" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/apply_btt"
-            android:text="@string/sort_apply"
+            style="@style/WhiteButton"
             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"
-            style="@style/WhiteButton" />
+            android:text="@string/sort_apply" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_btt"
-            android:text="@string/sort_cancel"
+            style="@style/BlackButton"
             android:layout_width="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_gravity="center_vertical|end"
             android:nextFocusLeft="@id/apply_btt"
-            style="@style/BlackButton" />
+            android:text="@string/sort_cancel" />
 
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/confirm_exit_dialog.xml b/app/src/main/res/layout/confirm_exit_dialog.xml
@@ -5,9 +5,11 @@
     android:orientation="vertical"
     android:paddingHorizontal="16dp"
     android:paddingVertical="8dp">
+
     <CheckBox
         android:id="@+id/checkboxDontShowAgain"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/dont_show_again" />
+        android:text="@string/dont_show_again"
+        android:textColor="?attr/grayTextColor" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/player_quality_profile_item.xml b/app/src/main/res/layout/player_quality_profile_item.xml
@@ -10,14 +10,14 @@
         android:id="@+id/card_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:focusable="true"
-        app:layout_constraintDimensionRatio="1"
         android:layout_marginStart="10dp"
         android:animateLayoutChanges="true"
-        android:backgroundTint="?attr/primaryGrayBackground"
+        android:backgroundTint="@color/primaryGrayBackground"
+        android:focusable="true"
         android:foreground="?attr/selectableItemBackgroundBorderless"
         app:cardCornerRadius="@dimen/rounded_image_radius"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.4"
         app:layout_constraintStart_toStartOf="parent"
@@ -29,7 +29,8 @@
             android:layout_height="match_parent"
             android:alpha="0.4"
             android:contentDescription="@string/profile_background_des"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            tools:src="@drawable/profile_bg_teal" />
 
         <View
             android:id="@+id/outline"
@@ -46,6 +47,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:padding="10dp"
+            android:textColor="@color/textColor"
             android:textSize="16sp"
             tools:text="@string/mobile_data" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -478,6 +478,7 @@
         <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
         <item name="android:windowBackground">@drawable/dialog__window_background</item>
         <item name="textAllCaps">false</item>
+        <item name="android:textColorPrimary">?attr/grayTextColor</item>
 
         <item name="buttonBarPositiveButtonStyle">@style/WhiteButton.Dialog</item>
         <item name="buttonBarNegativeButtonStyle">@style/BlackButton.Dialog</item>
@@ -1034,49 +1035,58 @@
             @drawable/cast_ic_mini_controller_closed_caption
         </item>
     </style>
+
     <style name="RoundedImageView">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">50%</item>
     </style>
+
     <style name="PlayUnderlayProgress">
         <item name="shapeAppearanceOverlay">@style/RoundedImageView</item>
         <item name="android:scaleType">center</item>
         <item name="android:src">@drawable/netflix_play</item>
         <item name="android:layout_gravity">center</item>
     </style>
+
     <style name="CircularProgress">
         <item name="trackThickness">@dimen/circular_progress_thickness</item>
         <item name="android:layout_gravity">center</item>
         <item name="indicatorColor">@color/white</item>
     </style>
+
     <style name="HomePlayUnderlayProgress" parent="PlayUnderlayProgress">
         <item name="tint">@color/white</item>
         <item name="android:layout_width">@dimen/home_poster_progress_size</item>
         <item name="android:layout_height">@dimen/home_poster_progress_size</item>
         <item name="android:background">@color/playIconBackground</item>
     </style>
+
     <style name="HomeCircularProgress" parent="CircularProgress">
         <item name="android:layout_width">@dimen/home_poster_progress_size</item>
         <item name="android:layout_height">@dimen/home_poster_progress_size</item>
         <item name="indicatorSize">@dimen/home_poster_progress_size</item>
     </style>
+
     <style name="EpisodePlayUnderlayProgress" parent="PlayUnderlayProgress">
         <item name="tint">@color/white</item>
         <item name="android:layout_width">40dp</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:background">@color/playIconBackground</item>
     </style>
+
     <style name="EpisodeCircularProgress" parent="CircularProgress">
         <item name="android:layout_width">@dimen/episode_progress_size</item>
         <item name="android:layout_height">@dimen/episode_progress_size</item>
         <item name="indicatorSize">@dimen/episode_progress_size</item>
     </style>
+
     <style name="ContinueWatchingPlayUnderlayProgress">
         <item name="android:layout_width">@dimen/continue_watching_progress_size</item>
         <item name="android:layout_height">@dimen/continue_watching_progress_size</item>
         <item name="android:src">@drawable/play_button_transparent</item>
         <item name="android:layout_gravity">center</item>
     </style>
+
     <style name="ContinueWatchingCircularProgress" parent="CircularProgress">
         <item name="android:layout_width">@dimen/continue_watching_progress_size</item>
         <item name="android:layout_height">@dimen/continue_watching_progress_size</item>
