baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

SponsorBlock: Merge branch 'dev' into sponsorblock

Browse source 
# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/res/values/attrs.xml
#	app/src/main/res/values/strings.xml
This commit is contained in:
polymorphicshade 2020-12-28 13:43:26 -07:00
commit 991c12c539
13 changed files with 53 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
.gitmodules vendored
View file

2
README.ko.md
View file

@ -6,7 +6,7 @@
<p align="center">
<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
<a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>

6
app/build.gradle
View file

@ -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"

3
app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
View file

@ -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));

7
app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
View file

@ -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;
}

5
app/src/main/res/drawable/ic_live_tv_black_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="?attr/colorControlNormal" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/black" android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
</vector>

5
app/src/main/res/drawable/ic_live_tv_white_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#FFFFFF" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
</vector>

1
app/src/main/res/values/attrs.xml
View file

@ -82,6 +82,7 @@
<attr name="ic_sort" format="reference" />
<attr name="ic_help" format="reference" />
<attr name="ic_arrow_back" format="reference" />
<attr name="ic_live_tv" format="reference" />
<attr name="ic_sponsor_block_enable" format="reference"/>
<attr name="ic_sponsor_block_disable" format="reference"/>

1
app/src/main/res/values/strings.xml
View file

@ -711,6 +711,7 @@
<string name="playlist_page_summary">Playlist page</string>
<string name="show_thumbnail_title">Show thumbnail</string>
<string name="show_thumbnail_summary">Use thumbnail for both lock screen background and notifications</string>
<string name="recent">Recent</string>
<!-- SponsorBlock -->
<string name="sponsor_block">SponsorBlock</string>
<string name="sponsor_block_home_page_title">View Website</string>

2
app/src/main/res/values/styles.xml
View file

@ -48,6 +48,7 @@
<item name="ic_kiosk_local">@drawable/ic_home_black_24dp</item>
<item name="ic_kiosk_recent">@drawable/ic_add_circle_outline_black_24dp</item>
<item name="ic_channel">@drawable/ic_tv_black_24dp</item>
<item name="ic_live_tv">@drawable/ic_live_tv_black_24dp</item>
<item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item>
<item name="ic_playlist_add">@drawable/ic_playlist_add_black_24dp</item>
<item name="ic_playlist_check">@drawable/ic_playlist_add_check_black_24dp</item>
@ -158,6 +159,7 @@
<item name="ic_kiosk_local">@drawable/ic_home_white_24dp</item>
<item name="ic_kiosk_recent">@drawable/ic_add_circle_outline_white_24dp</item>
<item name="ic_channel">@drawable/ic_tv_white_24dp</item>
<item name="ic_live_tv">@drawable/ic_live_tv_white_24dp</item>
<item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
<item name="ic_playlist_add">@drawable/ic_playlist_add_white_24dp</item>
<item name="ic_playlist_check">@drawable/ic_playlist_add_check_white_24dp</item>

2
fastlane/metadata/android/en-US/changelogs/962.txt Normal file
View file

@ -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.

12
fastlane/metadata/android/eu/changelogs/961.txt Normal file
View file

@ -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

12
fastlane/metadata/android/zh_Hans/changelogs/961.txt Normal file
View file

@ -0,0 +1,12 @@
- [YouTube] Mix支持
- [YouTube]显示关于公共广播和Covid-19的信息
- [media.cc.de] 添加了「最近的视频」。
- 新增 索马里语翻译
- 大量内部改进
- 修正 在播放器内分享视频时出错
- 修正 ReCaptcha网页视图一片空白
- 修正 在列表中删除视频时崩溃
- [PeerTube]修复 相关视频播放
- [YouTube] 修正 YouTube音乐搜索