mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-06-27 15:43:07 +00:00
Code Issues Releases Wiki Activity

VideoDetailFragment: apply more IDE suggestions

Browse Source
This commit is contained in:
Profpatsch 2024-12-26 16:51:11 +01:00
parent 83486402df
commit ab8a9ae11c
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View File

@ -438,18 +438,15 @@ public final class VideoDetailFragment
@Override @Override
public void onActivityResult(final int requestCode, final int resultCode, final Intent data) { public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { if (requestCode == ReCaptchaActivity.RECAPTCHA_REQUEST) {
case ReCaptchaActivity.RECAPTCHA_REQUEST:
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
NavigationHelper.openVideoDetailFragment(requireContext(), getFM(), NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
serviceId, url, title, null, false); serviceId, url, title, null, false);
} else { } else {
Log.e(TAG, "ReCaptcha failed"); Log.e(TAG, "ReCaptcha failed");
} }
break; } else {
default:
Log.e(TAG, "Request code from activity not supported [" + requestCode + "]"); Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
break;
} }
} }
@ -1138,7 +1135,7 @@ public final class VideoDetailFragment
} }
private void openMainPlayer() { private void openMainPlayer() {
if (!isPlayerServiceAvailable()) { if (noPlayerServiceAvailable()) {
playerHolder.startService(autoPlayEnabled, this); playerHolder.startService(autoPlayEnabled, this);
return; return;
} }
@ -1163,7 +1160,7 @@ public final class VideoDetailFragment
*/ */
private void hideMainPlayerOnLoadingNewStream() { private void hideMainPlayerOnLoadingNewStream() {
final var root = getRoot(); final var root = getRoot();
if (!isPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) { if (noPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
return; return;
} }
@ -1347,13 +1344,13 @@ public final class VideoDetailFragment
this.playQueue = newPlayQueue; this.playQueue = newPlayQueue;
} }
private void setErrorImage(final int imageResource) { private void setErrorImage() {
if (binding == null || activity == null) { if (binding == null || activity == null) {
return; return;
} }
binding.detailThumbnailImageView.setImageDrawable( binding.detailThumbnailImageView.setImageDrawable(
AppCompatResources.getDrawable(requireContext(), imageResource)); AppCompatResources.getDrawable(requireContext(), R.drawable.not_available_monkey));
animate(binding.detailThumbnailImageView, false, 0, AnimationType.ALPHA, animate(binding.detailThumbnailImageView, false, 0, AnimationType.ALPHA,
0, () -> animate(binding.detailThumbnailImageView, true, 500)); 0, () -> animate(binding.detailThumbnailImageView, true, 500));
} }
@ -1361,7 +1358,7 @@ public final class VideoDetailFragment
@Override @Override
public void handleError() { public void handleError() {
super.handleError(); super.handleError();
setErrorImage(R.drawable.not_available_monkey); setErrorImage();
if (binding.relatedItemsLayout != null) { // hide related streams for tablets if (binding.relatedItemsLayout != null) { // hide related streams for tablets
binding.relatedItemsLayout.setVisibility(View.INVISIBLE); binding.relatedItemsLayout.setVisibility(View.INVISIBLE);
@ -1776,8 +1773,7 @@ public final class VideoDetailFragment
final PlaybackParameters parameters) { final PlaybackParameters parameters) {
setOverlayPlayPauseImage(player != null && player.isPlaying()); setOverlayPlayPauseImage(player != null && player.isPlaying());
switch (state) { if (state == Player.STATE_PLAYING) {
case Player.STATE_PLAYING:
if (binding.positionView.getAlpha() != 1.0f if (binding.positionView.getAlpha() != 1.0f
&& player.getPlayQueue() != null && player.getPlayQueue() != null
&& player.getPlayQueue().getItem() != null && player.getPlayQueue().getItem() != null
@ -1785,7 +1781,6 @@ public final class VideoDetailFragment
animate(binding.positionView, true, 100); animate(binding.positionView, true, 100);
animate(binding.detailPositionView, true, 100); animate(binding.detailPositionView, true, 100);
} }
break;
} }
} }
@ -2444,8 +2439,8 @@ public final class VideoDetailFragment
return player != null; return player != null;
} }
boolean isPlayerServiceAvailable() { boolean noPlayerServiceAvailable() {
return playerService != null; return playerService == null;
} }
boolean isPlayerAndPlayerServiceAvailable() { boolean isPlayerAndPlayerServiceAvailable() {