From dbb86d25e177c7cd02764d1aa20844830ade4bc3 Mon Sep 17 00:00:00 2001 From: Stypox Date: Fri, 2 Oct 2020 16:03:43 +0200 Subject: [PATCH] Fix video detail controls visibility set inconsistently --- .../fragments/detail/VideoDetailFragment.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index cf993ccbb..28a67173b 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -1550,22 +1550,16 @@ public class VideoDetailFragment 0); } - switch (info.getStreamType()) { - case LIVE_STREAM: - case AUDIO_LIVE_STREAM: - detailControlsDownload.setVisibility(View.GONE); - break; - default: - if (info.getAudioStreams().isEmpty()) { - detailControlsBackground.setVisibility(View.GONE); - } - if (!info.getVideoStreams().isEmpty() || !info.getVideoOnlyStreams().isEmpty()) { - break; - } - detailControlsPopup.setVisibility(View.GONE); - thumbnailPlayButton.setImageResource(R.drawable.ic_headset_shadow); - break; - } + detailControlsDownload.setVisibility(info.getStreamType() == StreamType.LIVE_STREAM + || info.getStreamType() == StreamType.AUDIO_LIVE_STREAM ? View.GONE : View.VISIBLE); + detailControlsBackground.setVisibility(info.getAudioStreams().isEmpty() + ? View.GONE : View.VISIBLE); + + final boolean noVideoStreams = + info.getVideoStreams().isEmpty() && info.getVideoOnlyStreams().isEmpty(); + detailControlsPopup.setVisibility(noVideoStreams ? View.GONE : View.VISIBLE); + thumbnailPlayButton.setImageResource( + noVideoStreams ? R.drawable.ic_headset_shadow : R.drawable.ic_play_arrow_shadow); } private void hideAgeRestrictedContent() {