mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 08:30:44 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5258 from TeamNewPipe/media.ccc.de_serviceColor

Browse Source 
[media.ccc.de] Fix service color
This commit is contained in:
bopol 2020-12-23 20:02:25 +01:00 committed by GitHub
commit d7cab6a8d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -266,7 +266,7 @@
<data android:mimeType="text/plain" /> <data android:mimeType="text/plain" />
</intent-filter> </intent-filter>
<!-- MediaCCC filter --> <!-- media.ccc.de filter -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" /> <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />

2
app/src/main/java/org/schabi/newpipe/MainActivity.java
View File

@ -129,7 +129,7 @@ public class MainActivity extends AppCompatActivity {
+ "savedInstanceState = [" + savedInstanceState + "]"); + "savedInstanceState = [" + savedInstanceState + "]");
} }
// enable TLS1.1/1.2 for kitkat devices, to fix download and play for mediaCCC sources // enable TLS1.1/1.2 for kitkat devices, to fix download and play for media.ccc.de sources
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
TLSSocketFactoryCompat.setAsDefault(); TLSSocketFactoryCompat.setAsDefault();
} }

9
app/src/main/res/values-v21/styles_services.xml
View File

@ -12,6 +12,7 @@
<style name="BlackTheme.YouTube" parent="BlackTheme"> <style name="BlackTheme.YouTube" parent="BlackTheme">
<item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item> <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
</style> </style>
<!-- SoundCloud --> <!-- SoundCloud -->
<style name="LightTheme.SoundCloud" parent="LightTheme"> <style name="LightTheme.SoundCloud" parent="LightTheme">
<item name="colorPrimary">@color/light_soundcloud_primary_color</item> <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
@ -50,20 +51,20 @@
<item name="colorAccent">@color/dark_peertube_accent_color</item> <item name="colorAccent">@color/dark_peertube_accent_color</item>
</style> </style>
<!-- Media.ccc --> <!-- media.ccc.de -->
<style name="LightTheme.MediaCCC" parent="LightTheme"> <style name="LightTheme.media.ccc.de" parent="LightTheme">
<item name="colorPrimary">@color/light_media_ccc_primary_color</item> <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item> <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/light_media_ccc_accent_color</item> <item name="colorAccent">@color/light_media_ccc_accent_color</item>
</style> </style>
<style name="DarkTheme.MediaCCC" parent="DarkTheme"> <style name="DarkTheme.media.ccc.de" parent="DarkTheme">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item> <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item> <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item> <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style> </style>
<style name="BlackTheme.MediaCCC" parent="BlackTheme"> <style name="BlackTheme.media.ccc.de" parent="BlackTheme">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item> <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item> <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item> <item name="colorAccent">@color/dark_media_ccc_accent_color</item>

2
app/src/main/res/values/colors_services.xml
View File

@ -33,7 +33,7 @@
<color name="dark_peertube_accent_color">#FFFFFF</color> <color name="dark_peertube_accent_color">#FFFFFF</color>
<color name="dark_peertube_statusbar_color">#ff6f00</color> <color name="dark_peertube_statusbar_color">#ff6f00</color>
<!-- Media.CCC --> <!-- media.ccc.de -->
<color name="light_media_ccc_primary_color">#9e9e9e</color> <color name="light_media_ccc_primary_color">#9e9e9e</color>
<color name="light_media_ccc_dark_color">#616161</color> <color name="light_media_ccc_dark_color">#616161</color>
<color name="light_media_ccc_accent_color">#000000</color> <color name="light_media_ccc_accent_color">#000000</color>

8
app/src/main/res/values/styles_services.xml
View File

@ -51,20 +51,20 @@
<item name="colorAccent">@color/dark_peertube_accent_color</item> <item name="colorAccent">@color/dark_peertube_accent_color</item>
</style> </style>
<!-- Media.ccc --> <!-- media.ccc.de -->
<style name="LightTheme.MediaCCC" parent="LightTheme"> <style name="LightTheme.media.ccc.de" parent="LightTheme">
<item name="colorPrimary">@color/light_media_ccc_primary_color</item> <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item> <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/light_media_ccc_accent_color</item> <item name="colorAccent">@color/light_media_ccc_accent_color</item>
</style> </style>
<style name="DarkTheme.MediaCCC" parent="DarkTheme"> <style name="DarkTheme.media.ccc.de" parent="DarkTheme">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item> <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item> <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item> <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
</style> </style>
<style name="BlackTheme.MediaCCC" parent="BlackTheme"> <style name="BlackTheme.media.ccc.de" parent="BlackTheme">
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item> <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
<item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item> <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item> <item name="colorAccent">@color/dark_media_ccc_accent_color</item>