diff --git a/app/build.gradle b/app/build.gradle index 36bce9456..370bb4e8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -179,7 +179,7 @@ dependencies { // NewPipe dependencies // You can use a local version by uncommenting a few lines in settings.gradle - implementation 'com.github.TeamNewPipe:NewPipeExtractor:b2837698f55296e00aeca5cb1847755dd1174af4' + implementation 'com.github.TeamNewPipe:NewPipeExtractor:b4e191397117447364d137791ec4b1ca3672d75b' implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751" implementation "org.jsoup:jsoup:1.13.1" diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java index c0096ed10..12eab4734 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java @@ -70,7 +70,8 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder { } else { itemProgressView.setVisibility(View.GONE); } - } else if (item.getStreamType() == StreamType.LIVE_STREAM) { + } else if (item.getStreamType() == StreamType.LIVE_STREAM + || item.getStreamType() == StreamType.AUDIO_LIVE_STREAM) { itemDurationView.setText(R.string.duration_live); itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.live_duration_background_color)); diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java index ccd4d13fc..d2daaf6cc 100644 --- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java +++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java @@ -44,6 +44,10 @@ public final class KioskTranslator { return c.getString(R.string.most_liked); case "conferences": return c.getString(R.string.conferences); + case "recent": + return c.getString(R.string.recent); + case "live": + return c.getString(R.string.duration_live); default: return kioskId; } @@ -59,9 +63,12 @@ public final class KioskTranslator { case "Local": return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_local); case "Recently added": + case "recent": return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent); case "Most liked": return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up); + case "live": + return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_live_tv); default: return 0; } diff --git a/app/src/main/res/drawable/ic_live_tv_black_24dp.xml b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml new file mode 100644 index 000000000..1f7957c4a --- /dev/null +++ b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_live_tv_white_24dp.xml b/app/src/main/res/drawable/ic_live_tv_white_24dp.xml new file mode 100644 index 000000000..303858f9d --- /dev/null +++ b/app/src/main/res/drawable/ic_live_tv_white_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index ab415508f..42fc7660e 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -82,6 +82,7 @@ + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7d790dfdc..c70b56e97 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -691,4 +691,5 @@ Playlist page Show thumbnail Use thumbnail for both lock screen background and notifications + Recent \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5c402b751..d7e7ab1dc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -48,6 +48,7 @@ @drawable/ic_home_black_24dp @drawable/ic_add_circle_outline_black_24dp @drawable/ic_tv_black_24dp + @drawable/ic_live_tv_black_24dp @drawable/ic_bookmark_black_24dp @drawable/ic_playlist_add_black_24dp @drawable/ic_playlist_add_check_black_24dp @@ -156,6 +157,7 @@ @drawable/ic_home_white_24dp @drawable/ic_add_circle_outline_white_24dp @drawable/ic_tv_white_24dp + @drawable/ic_live_tv_white_24dp @drawable/ic_bookmark_white_24dp @drawable/ic_playlist_add_white_24dp @drawable/ic_playlist_add_check_white_24dp