Skip to content

Commit 0e933ed

Browse files
author
hop
committed
clear-media.ccc.de
1 parent 79767f9 commit 0e933ed

5 files changed

Lines changed: 37 additions & 38 deletions

File tree

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -353,23 +353,14 @@
353353
</intent-filter>
354354

355355
<!-- media.ccc.de filter -->
356-
<intent-filter>
357-
<action android:name="android.intent.action.VIEW" />
358-
<action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
359-
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
360-
361-
<category android:name="android.intent.category.DEFAULT" />
362-
<category android:name="android.intent.category.BROWSABLE" />
363-
364-
<data android:scheme="http" />
365-
<data android:scheme="https" />
366-
<data android:host="media.ccc.de" />
367-
<!-- video prefix -->
368-
<data android:pathPrefix="/v/" />
369-
<!-- channel prefix-->
370-
<data android:pathPrefix="/c/" />
371-
<data android:pathPrefix="/b/" />
372-
</intent-filter>
356+
<!-- <intent-filter android:autoVerify="true">-->
357+
<!-- <action android:name="android.intent.action.VIEW" />-->
358+
<!-- <category android:name="android.intent.category.DEFAULT" />-->
359+
<!-- <category android:name="android.intent.category.BROWSABLE" />-->
360+
<!-- <data android:scheme="http" />-->
361+
<!-- <data android:scheme="https" />-->
362+
<!-- <data android:host="media.ccc.de" />-->
363+
<!-- </intent-filter>-->
373364

374365
<!-- PeerTube filter -->
375366
<intent-filter>

app/src/main/java/org/schabi/newpipe/MainActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,10 @@ private void toggleServices() {
439439

440440
private void showServices() {
441441
for (final StreamingService s : NewPipe.getServices()) {
442+
// Skip media.ccc.de
443+
if (s.getServiceId() == 2) {
444+
continue;
445+
}
442446
final String title = s.getServiceInfo().getName();
443447

444448
final MenuItem menuItem = drawerLayoutBinding.navigation.getMenu()

app/src/main/java/org/schabi/newpipe/util/ServiceHelper.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ object ServiceHelper {
2727
fun getIcon(serviceId: Int): Int {
2828
return when (serviceId) {
2929
0 -> R.drawable.ic_smart_display
30+
3031
1 -> R.drawable.ic_cloud
31-
2 -> R.drawable.ic_placeholder_media_ccc
32+
33+
// 2 -> R.drawable.ic_placeholder_media_ccc
3234
3 -> R.drawable.ic_placeholder_peertube
35+
3336
4 -> R.drawable.ic_placeholder_bandcamp
37+
3438
else -> R.drawable.ic_circle
3539
}
3640
}

app/src/main/res/values/colors_services.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<color name="dark_peertube_accent_color">#FFFFFF</color>
2323

2424
<!-- media.ccc.de -->
25-
<color name="light_media_ccc_primary_color">#9e9e9e</color>
26-
<color name="light_media_ccc_accent_color">#000000</color>
25+
<!-- <color name="light_media_ccc_primary_color">#9e9e9e</color>-->
26+
<!-- <color name="light_media_ccc_accent_color">#000000</color>-->
2727

28-
<color name="dark_media_ccc_primary_color">#878787</color>
29-
<color name="dark_media_ccc_accent_color">#FFFFFF</color>
28+
<!-- <color name="dark_media_ccc_primary_color">#878787</color>-->
29+
<!-- <color name="dark_media_ccc_accent_color">#FFFFFF</color>-->
3030

3131
<!-- Bandcamp -->
3232
<color name="light_bandcamp_primary_color">#17a0c4</color>

app/src/main/res/values/styles_services.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,24 @@
5757
<item name="colorAccent">@color/dark_peertube_accent_color</item>
5858
</style>
5959

60-
<!-- media.ccc.de -->
61-
<style name="LightTheme.media.ccc.de" parent="LightTheme" tools:keep="@style/LightTheme_media_ccc_de">
62-
<item name="colorPrimary">@color/light_media_ccc_primary_color</item>
63-
<item name="colorPrimaryDark">@color/light_media_ccc_primary_color</item>
64-
<item name="colorAccent">@color/light_media_ccc_accent_color</item>
65-
</style>
60+
<!-- &lt;!&ndash; media.ccc.de &ndash;&gt;-->
61+
<!-- <style name="LightTheme.media.ccc.de" parent="LightTheme" tools:keep="@style/LightTheme_media_ccc_de">-->
62+
<!-- <item name="colorPrimary">@color/light_media_ccc_primary_color</item>-->
63+
<!-- <item name="colorPrimaryDark">@color/light_media_ccc_primary_color</item>-->
64+
<!-- <item name="colorAccent">@color/light_media_ccc_accent_color</item>-->
65+
<!-- </style>-->
6666

67-
<style name="DarkTheme.media.ccc.de" parent="DarkTheme" tools:keep="@style/DarkTheme_media_ccc_de">
68-
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
69-
<item name="colorPrimaryDark">@color/dark_media_ccc_primary_color</item>
70-
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
71-
</style>
67+
<!-- <style name="DarkTheme.media.ccc.de" parent="DarkTheme" tools:keep="@style/DarkTheme_media_ccc_de">-->
68+
<!-- <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>-->
69+
<!-- <item name="colorPrimaryDark">@color/dark_media_ccc_primary_color</item>-->
70+
<!-- <item name="colorAccent">@color/dark_media_ccc_accent_color</item>-->
71+
<!-- </style>-->
7272

73-
<style name="BlackTheme.media.ccc.de" parent="BlackTheme" tools:keep="@style/BlackTheme_media_ccc_de">
74-
<item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
75-
<item name="colorPrimaryDark">@color/dark_media_ccc_primary_color</item>
76-
<item name="colorAccent">@color/dark_media_ccc_accent_color</item>
77-
</style>
73+
<!-- <style name="BlackTheme.media.ccc.de" parent="BlackTheme" tools:keep="@style/BlackTheme_media_ccc_de">-->
74+
<!-- <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>-->
75+
<!-- <item name="colorPrimaryDark">@color/dark_media_ccc_primary_color</item>-->
76+
<!-- <item name="colorAccent">@color/dark_media_ccc_accent_color</item>-->
77+
<!-- </style>-->
7878

7979
<!-- Bandcamp -->
8080
<style name="LightTheme.Bandcamp" parent="LightTheme" tools:keep="@style/LightTheme_Bandcamp">

0 commit comments

Comments
 (0)