From f47ae3668facec7df00b6f46a63059dc9bcbd907 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Tue, 8 Jun 2021 20:08:51 +0200
Subject: [PATCH 1/4] [Bandcamp Add v21 styles

---
 .../main/res/values-v21/styles_services.xml   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/main/res/values-v21/styles_services.xml b/app/src/main/res/values-v21/styles_services.xml
index c495a9a31..c094bccb5 100644
--- a/app/src/main/res/values-v21/styles_services.xml
+++ b/app/src/main/res/values-v21/styles_services.xml
@@ -70,4 +70,23 @@
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
     </style>
 
+    <!-- Bandcamp -->
+    <style name="LightTheme.Bandcamp" parent="LightTheme">
+        <item name="colorPrimary">@color/light_bandcamp_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_bandcamp_statusbar_color</item>
+        <item name="colorAccent">@color/light_bandcamp_accent_color</item>
+    </style>
+
+    <style name="DarkTheme.Bandcamp" parent="DarkTheme">
+        <item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
+        <item name="colorAccent">@color/dark_bandcamp_accent_color</item>
+    </style>
+
+    <style name="BlackTheme.Bandcamp" parent="BlackTheme">
+        <item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
+        <item name="colorAccent">@color/dark_bandcamp_accent_color</item>
+    </style>
+
 </resources>

From 060f09ff55077d4099138a7477e76459d54aeb65 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Tue, 8 Jun 2021 20:09:51 +0200
Subject: [PATCH 2/4] Apply service color to switches

---
 app/src/main/res/values-v21/styles_services.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/res/values-v21/styles_services.xml b/app/src/main/res/values-v21/styles_services.xml
index c094bccb5..38ea216f8 100644
--- a/app/src/main/res/values-v21/styles_services.xml
+++ b/app/src/main/res/values-v21/styles_services.xml
@@ -3,14 +3,17 @@
     <!-- YouTube -->
     <style name="LightTheme.YouTube" parent="LightTheme">
         <item name="colorPrimaryDark">@color/light_youtube_statusbar_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.YouTube" parent="DarkTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.YouTube" parent="BlackTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- SoundCloud -->
@@ -18,18 +21,21 @@
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/light_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/light_soundcloud_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.SoundCloud" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.SoundCloud" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- PeerTube -->
@@ -37,18 +43,21 @@
         <item name="colorPrimary">@color/light_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_peertube_statusbar_color</item>
         <item name="colorAccent">@color/light_peertube_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.PeerTube" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.PeerTube" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- media.ccc.de -->
@@ -56,18 +65,21 @@
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/light_media_ccc_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.media.ccc.de" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.media.ccc.de" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- Bandcamp -->
@@ -75,18 +87,21 @@
         <item name="colorPrimary">@color/light_bandcamp_primary_color</item>
         <item name="colorPrimaryDark">@color/light_bandcamp_statusbar_color</item>
         <item name="colorAccent">@color/light_bandcamp_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.Bandcamp" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
         <item name="colorAccent">@color/dark_bandcamp_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.Bandcamp" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
         <item name="colorAccent">@color/dark_bandcamp_accent_color</item>
+        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
 </resources>

From 6ab4787e9707daf851b6c897024fede673e3f255 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 9 Jun 2021 13:04:21 +0200
Subject: [PATCH 3/4] Use SwitchCompat to make switch uniform across versions

Also just use colorControlActivated in the base V19 theme, instead of using the prefix android: in each V21 service theme
---
 app/src/main/res/layout/related_items_header.xml |  2 +-
 app/src/main/res/values-v21/styles_services.xml  | 15 ---------------
 app/src/main/res/values/styles.xml               |  1 +
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/related_items_header.xml b/app/src/main/res/layout/related_items_header.xml
index c23adc339..922d2ba2c 100644
--- a/app/src/main/res/layout/related_items_header.xml
+++ b/app/src/main/res/layout/related_items_header.xml
@@ -17,7 +17,7 @@
         android:textSize="12sp"
         tools:ignore="RtlHardcoded" />
 
-    <Switch
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/autoplay_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-v21/styles_services.xml b/app/src/main/res/values-v21/styles_services.xml
index 38ea216f8..c094bccb5 100644
--- a/app/src/main/res/values-v21/styles_services.xml
+++ b/app/src/main/res/values-v21/styles_services.xml
@@ -3,17 +3,14 @@
     <!-- YouTube -->
     <style name="LightTheme.YouTube" parent="LightTheme">
         <item name="colorPrimaryDark">@color/light_youtube_statusbar_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.YouTube" parent="DarkTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.YouTube" parent="BlackTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- SoundCloud -->
@@ -21,21 +18,18 @@
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/light_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/light_soundcloud_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.SoundCloud" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.SoundCloud" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- PeerTube -->
@@ -43,21 +37,18 @@
         <item name="colorPrimary">@color/light_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_peertube_statusbar_color</item>
         <item name="colorAccent">@color/light_peertube_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.PeerTube" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.PeerTube" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- media.ccc.de -->
@@ -65,21 +56,18 @@
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/light_media_ccc_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.media.ccc.de" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.media.ccc.de" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <!-- Bandcamp -->
@@ -87,21 +75,18 @@
         <item name="colorPrimary">@color/light_bandcamp_primary_color</item>
         <item name="colorPrimaryDark">@color/light_bandcamp_statusbar_color</item>
         <item name="colorAccent">@color/light_bandcamp_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="DarkTheme.Bandcamp" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
         <item name="colorAccent">@color/dark_bandcamp_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
     <style name="BlackTheme.Bandcamp" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_bandcamp_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_bandcamp_statusbar_color</item>
         <item name="colorAccent">@color/dark_bandcamp_accent_color</item>
-        <item name="android:colorControlActivated">?attr/colorPrimary</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c543044ca..95368b572 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,6 +17,7 @@
         <item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
         <item name="toolbarSearchColor">@color/white</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="colorControlActivated">?attr/colorPrimary</item>
     </style>
     <style name="Base" parent="Base.V19"/>
 

From 272d58951818da65351d91b4b9ab1b21db652adb Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Wed, 9 Jun 2021 13:10:26 +0200
Subject: [PATCH 4/4] Convert related_items_header to ConstraintLayout

---
 .../main/res/layout/related_items_header.xml  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/related_items_header.xml b/app/src/main/res/layout/related_items_header.xml
index 922d2ba2c..231db7bc9 100644
--- a/app/src/main/res/layout/related_items_header.xml
+++ b/app/src/main/res/layout/related_items_header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/channel_header_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,25 +8,28 @@
 
     <TextView
         android:id="@+id/next_stream_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/autoplay_switch"
-        android:layout_marginLeft="12dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:text="@string/exo_controls_next_description"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="12sp"
-        tools:ignore="RtlHardcoded" />
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/autoplay_switch"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/autoplay_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:paddingRight="5dp"
-        android:switchPadding="5dp"
+        android:layout_marginEnd="16dp"
         android:text="@string/auto_queue_toggle"
         android:textColor="@android:color/tab_indicator_text"
-        android:textSize="12sp" />
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>