add theming to mediaccc

hrshtein · Jan 29, 2019 · e88a90f · e88a90f
1 parent 1ae54f6
commit e88a90f
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 12 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@@ -24,9 +24,11 @@ public static int getIcon(int serviceId) {
             case 0:
                 return R.drawable.place_holder_youtube;
             case 1:
-                return R.drawable.place_holder_circle;
+                return R.drawable.place_holder_cloud;
+            case 2:
+                return R.drawable.place_holder_gadse;
             default:
-                return R.drawable.service;
+                return R.drawable.place_holder_circle;
         }
     }
 

diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@@ -137,7 +137,9 @@ public static int getThemeForService(Context context, int serviceId) {
         else if (selectedTheme.equals(darkTheme)) themeName = "DarkTheme";
 
         themeName += "." + service.getServiceInfo().getName();
-        int resourceId = context.getResources().getIdentifier(themeName, "style", context.getPackageName());
+        int resourceId = context
+                .getResources()
+                .getIdentifier(themeName, "style", context.getPackageName());
 
         if (resourceId > 0) {
             return resourceId;

diff --git a/app/src/main/res/drawable-nodpi/place_holder_cloud.png b/app/src/main/res/drawable-nodpi/place_holder_cloud.png
diff --git a/app/src/main/res/drawable-nodpi/place_holder_gadse.png b/app/src/main/res/drawable-nodpi/place_holder_gadse.png
diff --git a/app/src/main/res/values-v21/styles_services.xml b/app/src/main/res/values-v21/styles_services.xml
@@ -31,4 +31,22 @@
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
     </style>
 
+    <!-- Media.ccc -->
+    <style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
+        <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>
+    </style>
+
+    <style name="DarkTheme.MediaCCC" parent="DarkTheme.Switchable">
+        <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>
+    </style>
+
+    <style name="BlackTheme.MediaCCC" parent="BlackTheme.Switchable">
+        <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>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/colors_services.xml b/app/src/main/res/values/colors_services.xml
@@ -22,15 +22,15 @@
     <color name="dark_soundcloud_accent_color">#FFFFFF</color>
     <color name="dark_soundcloud_statusbar_color">#ff9100</color>
 
-    <!-- MediaCCC -->
-    <color name="light_mediaccc_primary_color">#888888</color>
-    <color name="light_mediaccc_dark_color">#555555</color>
-    <color name="light_mediaccc_accent_color">#000000</color>
-    <color name="light_mediaccc_statusbar_color">#777777</color>
+    <!-- Media.CCC -->
+    <color name="light_media_ccc_primary_color">#9e9e9e</color>
+    <color name="light_media_ccc_dark_color">#616161</color>
+    <color name="light_media_ccc_accent_color">#000000</color>
+    <color name="light_media_ccc_statusbar_color">#afafaf</color>
 
-    <color name="dark_mediaccc_primary_color">#888888</color>
-    <color name="dark_mediaccc_dark_color">#555555</color>
-    <color name="dark_mediaccc_accent_color">#FFFFFF</color>
-    <color name="dark_mediaccc_statusbar_color">#777777</color>
+    <color name="dark_media_ccc_primary_color">#9e9e9e</color>
+    <color name="dark_media_ccc_dark_color">#616161</color>
+    <color name="dark_media_ccc_accent_color">#FFFFFF</color>
+    <color name="dark_media_ccc_statusbar_color">#afafaf</color>
 
 </resources>
diff --git a/app/src/main/res/values/styles_services.xml b/app/src/main/res/values/styles_services.xml
@@ -9,6 +9,7 @@
 
     <style name="BlackTheme.YouTube" parent="BlackTheme.Switchable">
     </style>
+
     <!-- SoundCloud -->
     <style name="LightTheme.SoundCloud" parent="LightTheme.Switchable">
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
@@ -28,4 +29,23 @@
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
     </style>
 
+    <!-- Media.ccc -->
+    <style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
+        <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>
+    </style>
+
+    <style name="DarkTheme.MediaCCC" parent="DarkTheme.Switchable">
+        <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>
+    </style>
+
+    <style name="BlackTheme.MediaCCC" parent="BlackTheme.Switchable">
+        <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>
+    </style>
+
 </resources>
diff --git a/assets/media_gadse.svg b/assets/media_gadse.svg