From b0ea9e5672b21ac61333a6631047dac485f4ad88 Mon Sep 17 00:00:00 2001
From: evermind <evermind@tuxfamily.org>
Date: Wed, 27 Mar 2024 23:38:40 +0100
Subject: [PATCH] BraveNewPipe: move service styles to brave flavor to prevent
 conflicts merging upstream

---
 app/src/brave/res/values/styles_services.xml | 42 ++++++++++++++++++++
 app/src/main/res/values/styles_services.xml  | 38 ------------------
 2 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 app/src/brave/res/values/styles_services.xml

diff --git a/app/src/brave/res/values/styles_services.xml b/app/src/brave/res/values/styles_services.xml
new file mode 100644
index 000000000..6e83fa3e1
--- /dev/null
+++ b/app/src/brave/res/values/styles_services.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- BitChute -->
+    <style name="LightTheme.BitChute" parent="LightTheme" tools:keep="@style/LightTheme_BitChute">
+        <item name="colorPrimary">@color/light_bitchute_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_bitchute_primary_color</item>
+        <item name="colorAccent">@color/light_bitchute_accent_color</item>
+    </style>
+
+    <style name="DarkTheme.BitChute" parent="DarkTheme" tools:keep="@style/DarkTheme_BitChute">
+        <item name="colorPrimary">@color/dark_bitchute_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_bitchute_primary_color</item>
+        <item name="colorAccent">@color/dark_bitchute_accent_color</item>
+    </style>
+
+    <style name="BlackTheme.BitChute" parent="BlackTheme" tools:keep="@style/BlackTheme_BitChute">
+        <item name="colorPrimary">@color/dark_bitchute_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_bitchute_primary_color</item>
+        <item name="colorAccent">@color/dark_bitchute_accent_color</item>
+    </style>
+
+    <!-- Rumble -->
+    <style name="LightTheme.Rumble" parent="LightTheme" tools:keep="@style/LightTheme_Rumble">
+        <item name="colorPrimary">@color/light_rumble_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_rumble_primary_color</item>
+        <item name="colorAccent">@color/light_rumble_accent_color</item>
+    </style>
+
+    <style name="DarkTheme.Rumble" parent="DarkTheme" tools:keep="@style/DarkTheme_Rumble">
+        <item name="colorPrimary">@color/dark_rumble_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_rumble_primary_color</item>
+        <item name="colorAccent">@color/dark_rumble_accent_color</item>
+    </style>
+
+    <style name="BlackTheme.Rumble" parent="BlackTheme" tools:keep="@style/BlackTheme_Rumble">
+        <item name="colorPrimary">@color/dark_rumble_primary_color</item>
+        <item name="colorPrimaryDark">@color/dark_rumble_primary_color</item>
+        <item name="colorAccent">@color/dark_rumble_accent_color</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/styles_services.xml b/app/src/main/res/values/styles_services.xml
index 829b66385..db1fba397 100644
--- a/app/src/main/res/values/styles_services.xml
+++ b/app/src/main/res/values/styles_services.xml
@@ -57,44 +57,6 @@
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
-    <!-- BitChute -->
-    <style name="LightTheme.BitChute" parent="LightTheme" tools:keep="@style/LightTheme_BitChute">
-        <item name="colorPrimary">@color/light_bitchute_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_bitchute_primary_color</item>
-        <item name="colorAccent">@color/light_bitchute_accent_color</item>
-    </style>
-
-    <style name="DarkTheme.BitChute" parent="DarkTheme" tools:keep="@style/DarkTheme_BitChute">
-        <item name="colorPrimary">@color/dark_bitchute_primary_color</item>
-        <item name="colorPrimaryDark">@color/dark_bitchute_primary_color</item>
-        <item name="colorAccent">@color/dark_bitchute_accent_color</item>
-    </style>
-
-    <style name="BlackTheme.BitChute" parent="BlackTheme" tools:keep="@style/BlackTheme_BitChute">
-        <item name="colorPrimary">@color/dark_bitchute_primary_color</item>
-        <item name="colorPrimaryDark">@color/dark_bitchute_primary_color</item>
-        <item name="colorAccent">@color/dark_bitchute_accent_color</item>
-    </style>
-
-    <!-- Rumble -->
-    <style name="LightTheme.Rumble" parent="LightTheme" tools:keep="@style/LightTheme_Rumble">
-        <item name="colorPrimary">@color/light_rumble_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_rumble_primary_color</item>
-        <item name="colorAccent">@color/light_rumble_accent_color</item>
-    </style>
-
-    <style name="DarkTheme.Rumble" parent="DarkTheme" tools:keep="@style/DarkTheme_Rumble">
-        <item name="colorPrimary">@color/dark_rumble_primary_color</item>
-        <item name="colorPrimaryDark">@color/dark_rumble_primary_color</item>
-        <item name="colorAccent">@color/dark_rumble_accent_color</item>
-    </style>
-
-    <style name="BlackTheme.Rumble" parent="BlackTheme" tools:keep="@style/BlackTheme_Rumble">
-        <item name="colorPrimary">@color/dark_rumble_primary_color</item>
-        <item name="colorPrimaryDark">@color/dark_rumble_primary_color</item>
-        <item name="colorAccent">@color/dark_rumble_accent_color</item>
-    </style>
-
     <!-- media.ccc.de -->
     <style name="LightTheme.media.ccc.de" parent="LightTheme" tools:keep="@style/LightTheme_media_ccc_de">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>