diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29bb..000000000 diff --git a/README.ko.md b/README.ko.md index a86eae8d9..b5e0d2aa1 100644 --- a/README.ko.md +++ b/README.ko.md @@ -6,7 +6,7 @@

- + diff --git a/app/build.gradle b/app/build.gradle index d45c5727a..71f97569f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { resValue "string", "app_name", "NewPipe" minSdkVersion 19 targetSdkVersion 29 - versionCode 961 - versionName "0.20.7" + versionCode 962 + versionName "0.20.8" multiDexEnabled true @@ -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:deb9af7bf53b3f8fd9d32322adae02df78d985ea' 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 43d70acfd..753c19f06 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 7a6ec3411..151cc74bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -711,6 +711,7 @@ Playlist page Show thumbnail Use thumbnail for both lock screen background and notifications + Recent SponsorBlock View Website diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 626c30f36..ff26e7c32 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 @@ -158,6 +159,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 diff --git a/fastlane/metadata/android/en-US/changelogs/962.txt b/fastlane/metadata/android/en-US/changelogs/962.txt new file mode 100644 index 000000000..9551cda23 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/962.txt @@ -0,0 +1,2 @@ +Added "recent" videos to media.ccc.de service. +Added live streams to media.ccc.de service and also live stream support. \ No newline at end of file diff --git a/fastlane/metadata/android/eu/changelogs/961.txt b/fastlane/metadata/android/eu/changelogs/961.txt new file mode 100644 index 000000000..c5a02831f --- /dev/null +++ b/fastlane/metadata/android/eu/changelogs/961.txt @@ -0,0 +1,12 @@ +• [YouTube] Mix bateragarritasuna +• [YouTube] Erakutsi emisore publikoei eta Covid-19ri buruzko informazioa +• [media.ccc.de] Azken bideoak gehitu dira +• Somaliar itzulpena gehitu da + +• Barne hobekuntza ugari + +• Erreproduzitzailetik bideoak partekatzea konpondu da +• ReCaptcha web ikuspegi hutsa konpondu da +• Zerrenda batetik jario bat kentzean gertatutako kraskadura konpondu da +• [PeerTube] Konpondu erlazionatutako jarioak +• [YouTube] YouTube Music bilaketa konpondu da diff --git a/fastlane/metadata/android/zh_Hans/changelogs/961.txt b/fastlane/metadata/android/zh_Hans/changelogs/961.txt new file mode 100644 index 000000000..0bd58c19a --- /dev/null +++ b/fastlane/metadata/android/zh_Hans/changelogs/961.txt @@ -0,0 +1,12 @@ +- [YouTube] Mix支持 +- [YouTube]显示关于公共广播和Covid-19的信息 +- [media.cc.de] 添加了「最近的视频」。 +- 新增 索马里语翻译 + +- 大量内部改进 + +- 修正 在播放器内分享视频时出错 +- 修正 ReCaptcha网页视图一片空白 +- 修正 在列表中删除视频时崩溃 +- [PeerTube]修复 相关视频播放 +- [YouTube] 修正 YouTube音乐搜索