Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[media.ccc.de] Fix service color #5258

Merged
merged 1 commit into from
Dec 23, 2020
Merged

[media.ccc.de] Fix service color #5258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
<data android:mimeType="text/plain" />
</intent-filter>

<!-- MediaCCC filter -->
<!-- media.ccc.de filter -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ protected void onCreate(final Bundle 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) {
TLSSocketFactoryCompat.setAsDefault();
}
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/values-v21/styles_services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<style name="BlackTheme.YouTube" parent="BlackTheme">
<item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
</style>

<!-- SoundCloud -->
<style name="LightTheme.SoundCloud" parent="LightTheme">
<item name="colorPrimary">@color/light_soundcloud_primary_color</item>
Expand Down Expand Up @@ -50,20 +51,20 @@
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>

<!-- Media.ccc -->
<style name="LightTheme.MediaCCC" parent="LightTheme">
<!-- media.ccc.de -->
<style name="LightTheme.media.ccc.de" parent="LightTheme">
<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">
<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>
</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="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors_services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<color name="dark_peertube_accent_color">#FFFFFF</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_dark_color">#616161</color>
<color name="light_media_ccc_accent_color">#000000</color>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/values/styles_services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>

<!-- Media.ccc -->
<style name="LightTheme.MediaCCC" parent="LightTheme">
<!-- media.ccc.de -->
<style name="LightTheme.media.ccc.de" parent="LightTheme">
<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">
<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>
</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="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
Expand Down