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

In player hide kodi button if service unsupported

Browse source
This commit is contained in:
Stypox 2020-05-07 09:08:52 +02:00
parent 9ca6cfd637
commit 5c711322d4
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
View file

@ -593,9 +593,6 @@ public final class MainVideoPlayer extends AppCompatActivity
titleTextView.setSelected(true); titleTextView.setSelected(true);
channelTextView.setSelected(true); channelTextView.setSelected(true);
boolean showKodiButton = PreferenceManager.getDefaultSharedPreferences(this.context)
.getBoolean(this.context.getString(R.string.show_play_with_kodi_key), false);
kodiButton.setVisibility(showKodiButton ? View.VISIBLE : View.GONE);
getRootView().setKeepScreenOn(true); getRootView().setKeepScreenOn(true);
} }
@ -712,6 +709,13 @@ public final class MainVideoPlayer extends AppCompatActivity
protected void onMetadataChanged(@NonNull final MediaSourceTag tag) { protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
super.onMetadataChanged(tag); super.onMetadataChanged(tag);
// show kodi button if it supports the current service and it is enabled in settings
final boolean showKodiButton =
KoreUtil.isServiceSupportedByKore(tag.getMetadata().getServiceId())
&& PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
kodiButton.setVisibility(showKodiButton ? View.VISIBLE : View.GONE);
titleTextView.setText(tag.getMetadata().getName()); titleTextView.setText(tag.getMetadata().getName());
channelTextView.setText(tag.getMetadata().getUploaderName()); channelTextView.setText(tag.getMetadata().getUploaderName());
} }
@ -725,13 +729,12 @@ public final class MainVideoPlayer extends AppCompatActivity
public void onKodiShare() { public void onKodiShare() {
onPause(); onPause();
try { try {
NavigationHelper.playWithKore(this.context, NavigationHelper.playWithKore(context, Uri.parse(playerImpl.getVideoUrl()));
Uri.parse(playerImpl.getVideoUrl().replace("https", "http")));
} catch (Exception e) { } catch (Exception e) {
if (DEBUG) { if (DEBUG) {
Log.i(TAG, "Failed to start kore", e); Log.i(TAG, "Failed to start kore", e);
} }
KoreUtil.showInstallKoreDialog(this.context); KoreUtil.showInstallKoreDialog(context);
} }
} }

3
app/src/main/res/layout-large-land/activity_main_player.xml
View file

@ -325,8 +325,9 @@
android:src="@drawable/ic_cast_white_24dp" android:src="@drawable/ic_cast_white_24dp"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:contentDescription="@string/play_with_kodi_title" android:contentDescription="@string/play_with_kodi_title"
android:visibility="gone"
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
android:visibility="visible"/> tools:visibility="visible"/>
<ImageButton <ImageButton
android:id="@+id/share" android:id="@+id/share"

3
app/src/main/res/layout/activity_main_player.xml
View file

@ -317,8 +317,9 @@
android:src="@drawable/ic_cast_white_24dp" android:src="@drawable/ic_cast_white_24dp"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:contentDescription="@string/play_with_kodi_title" android:contentDescription="@string/play_with_kodi_title"
android:visibility="gone"
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
android:visibility="visible"/> tools:visibility="visible"/>
<ImageButton <ImageButton
android:id="@+id/share" android:id="@+id/share"