Skip to content

Commit 4a9c790

Browse files
committed
Merge branch 'master' into dev
2 parents 5a5a24b + 91ca680 commit 4a9c790

7 files changed

Lines changed: 9 additions & 8 deletions

File tree

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ android {
1717
resValue "string", "app_name", "NewPipe"
1818
minSdkVersion 19
1919
targetSdkVersion 29
20-
versionCode 967
21-
versionName "0.21.1"
20+
versionCode 968
21+
versionName "0.21.2"
2222

2323
multiDexEnabled true
2424

@@ -183,7 +183,7 @@ dependencies {
183183
/** NewPipe libraries **/
184184
// You can use a local version by uncommenting a few lines in settings.gradle
185185
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
186-
implementation 'com.github.TeamNewPipe:NewPipeExtractor:6db4bea8ca51ac40a8f831527b274ad50895070e'
186+
implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.2'
187187

188188
/** Checkstyle **/
189189
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ private void showDialog(final List<AdapterChoiceItem> choices) {
372372
final RadioButton radioButton = ListRadioIconItemBinding.inflate(inflater).getRoot();
373373
radioButton.setText(item.description);
374374
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
375-
AppCompatResources.getDrawable(getApplicationContext(), item.icon),
375+
AppCompatResources.getDrawable(themeWrapperContext, item.icon),
376376
null, null, null);
377377
radioButton.setChecked(false);
378378
radioButton.setId(id++);

app/src/main/java/org/schabi/newpipe/player/Player.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,6 +2077,7 @@ private void onBuffering() {
20772077
Log.d(TAG, "onBuffering() called");
20782078
}
20792079
binding.loadingPanel.setBackgroundColor(Color.TRANSPARENT);
2080+
binding.loadingPanel.setVisibility(View.VISIBLE);
20802081

20812082
binding.getRoot().setKeepScreenOn(true);
20822083

app/src/main/res/drawable-night/ic_headset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
android:viewportWidth="24.0"
66
android:viewportHeight="24.0">
77
<path
8-
android:fillColor="#FF000000"
8+
android:fillColor="#FFFFFFFF"
99
android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z" />
1010
</vector>

app/src/main/res/drawable-night/ic_info_outline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
android:viewportWidth="24.0"
66
android:viewportHeight="24.0">
77
<path
8-
android:fillColor="#FF000000"
8+
android:fillColor="#FFFFFFFF"
99
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
1010
</vector>

app/src/main/res/drawable-night/ic_picture_in_picture.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
android:viewportWidth="24.0"
66
android:viewportHeight="24.0">
77
<path
8-
android:fillColor="#FF000000"
8+
android:fillColor="#FFFFFFFF"
99
android:pathData="M19,7h-8v6h8L19,7zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,1.98 2,1.98h18c1.1,0 2,-0.88 2,-1.98L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.98h18v14.03z" />
1010
</vector>

app/src/main/res/drawable-night/ic_play_arrow.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
android:viewportWidth="24.0"
66
android:viewportHeight="24.0">
77
<path
8-
android:fillColor="#FF000000"
8+
android:fillColor="#FFFFFFFF"
99
android:pathData="M8,5v14l11,-7z" />
1010
</vector>

0 commit comments

Comments
 (0)