lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed conflicts/build

This commit is contained in:
litetex 2022-07-15 19:53:48 +02:00
parent 3890d0abdb
commit 3ba04f179f
5 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
View File

@ -1,7 +1,5 @@
package org.schabi.newpipe; package org.schabi.newpipe;
import static org.schabi.newpipe.MainActivity.DEBUG;
import android.content.Context; import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

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

@ -1555,8 +1555,8 @@ public final class VideoDetailFragment
binding.detailUploaderThumbnailView.setVisibility(View.GONE); binding.detailUploaderThumbnailView.setVisibility(View.GONE);
} }
final Drawable buddyDrawable final Drawable buddyDrawable =
= AppCompatResources.getDrawable(activity, R.drawable.placeholder_person); AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable); binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable); binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
@ -2030,6 +2030,7 @@ public final class VideoDetailFragment
} }
// Listener implementation // Listener implementation
@Override
public void hideSystemUiIfNeeded() { public void hideSystemUiIfNeeded() {
if (isFullscreen() if (isFullscreen()
&& bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) { && bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {

39
app/src/main/java/org/schabi/newpipe/player/notification/NotificationConstants.java
View File

@ -30,25 +30,26 @@ public final class NotificationConstants {
// Intent actions // Intent actions
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
public static final String ACTION_CLOSE private static final String BASE_ACTION =
= App.PACKAGE_NAME + ".player.MainPlayer.CLOSE"; App.PACKAGE_NAME + ".player.MainPlayer.";
public static final String ACTION_PLAY_PAUSE public static final String ACTION_CLOSE =
= App.PACKAGE_NAME + ".player.MainPlayer.PLAY_PAUSE"; BASE_ACTION + "CLOSE";
public static final String ACTION_REPEAT public static final String ACTION_PLAY_PAUSE =
= App.PACKAGE_NAME + ".player.MainPlayer.REPEAT"; BASE_ACTION + ".player.MainPlayer.PLAY_PAUSE";
public static final String ACTION_PLAY_NEXT public static final String ACTION_REPEAT =
= App.PACKAGE_NAME + ".player.MainPlayer.ACTION_PLAY_NEXT"; BASE_ACTION + ".player.MainPlayer.REPEAT";
public static final String ACTION_PLAY_PREVIOUS public static final String ACTION_PLAY_NEXT =
= App.PACKAGE_NAME + ".player.MainPlayer.ACTION_PLAY_PREVIOUS"; BASE_ACTION + ".player.MainPlayer.ACTION_PLAY_NEXT";
public static final String ACTION_FAST_REWIND public static final String ACTION_PLAY_PREVIOUS =
= App.PACKAGE_NAME + ".player.MainPlayer.ACTION_FAST_REWIND"; BASE_ACTION + ".player.MainPlayer.ACTION_PLAY_PREVIOUS";
public static final String ACTION_FAST_FORWARD public static final String ACTION_FAST_REWIND =
= App.PACKAGE_NAME + ".player.MainPlayer.ACTION_FAST_FORWARD"; BASE_ACTION + ".player.MainPlayer.ACTION_FAST_REWIND";
public static final String ACTION_SHUFFLE public static final String ACTION_FAST_FORWARD =
= App.PACKAGE_NAME + ".player.MainPlayer.ACTION_SHUFFLE"; BASE_ACTION + ".player.MainPlayer.ACTION_FAST_FORWARD";
public static final String ACTION_RECREATE_NOTIFICATION public static final String ACTION_SHUFFLE =
= App.PACKAGE_NAME + ".player.MainPlayer.ACTION_RECREATE_NOTIFICATION"; BASE_ACTION + ".player.MainPlayer.ACTION_SHUFFLE";
public static final String ACTION_RECREATE_NOTIFICATION =
BASE_ACTION + ".player.MainPlayer.ACTION_RECREATE_NOTIFICATION";
public static final int NOTHING = 0; public static final int NOTHING = 0;

18
app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
View File

@ -534,8 +534,8 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
binding.brightnessProgressBar.setMax(maxGestureLength); binding.brightnessProgressBar.setMax(maxGestureLength);
setInitialGestureValues(); setInitialGestureValues();
binding.itemsListPanel.getLayoutParams().height binding.itemsListPanel.getLayoutParams().height =
= height - binding.itemsListPanel.getTop(); height - binding.itemsListPanel.getTop();
} }
} }
@ -710,8 +710,9 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
} }
int nearestPosition = 0; int nearestPosition = 0;
final List<StreamSegment> segments final List<StreamSegment> segments = player.getCurrentStreamInfo()
= player.getCurrentStreamInfo().get().getStreamSegments(); .get()
.getStreamSegments();
for (int i = 0; i < segments.size(); i++) { for (int i = 0; i < segments.size(); i++) {
if (segments.get(i).getStartTimeSeconds() * 1000L > playbackPosition) { if (segments.get(i).getStartTimeSeconds() * 1000L > playbackPosition) {
@ -912,8 +913,8 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "toggleFullscreen() called"); Log.d(TAG, "toggleFullscreen() called");
} }
final PlayerServiceEventListener fragmentListener final PlayerServiceEventListener fragmentListener = player.getFragmentListener()
= player.getFragmentListener().orElse(null); .orElse(null);
if (fragmentListener == null || player.exoPlayerIsNull()) { if (fragmentListener == null || player.exoPlayerIsNull()) {
return; return;
} }
@ -939,8 +940,9 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
public void checkLandscape() { public void checkLandscape() {
// check if landscape is correct // check if landscape is correct
final boolean videoInLandscapeButNotInFullscreen final boolean videoInLandscapeButNotInFullscreen = isLandscape()
= isLandscape() && !isFullscreen && !player.isAudioOnly(); && !isFullscreen
&& !player.isAudioOnly();
final boolean notPaused = player.getCurrentState() != STATE_COMPLETED final boolean notPaused = player.getCurrentState() != STATE_COMPLETED
&& player.getCurrentState() != STATE_PAUSED; && player.getCurrentState() != STATE_PAUSED;

7
app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java
View File

@ -226,8 +226,8 @@ public abstract class VideoPlayerUi extends PlayerUi
// PlaybackControlRoot already consumed window insets but we should pass them to // PlaybackControlRoot already consumed window insets but we should pass them to
// player_overlays and fast_seek_overlay too. Without it they will be off-centered. // player_overlays and fast_seek_overlay too. Without it they will be off-centered.
onLayoutChangeListener onLayoutChangeListener =
= (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
binding.playerOverlays.setPadding( binding.playerOverlays.setPadding(
v.getPaddingLeft(), v.getPaddingLeft(),
v.getPaddingTop(), v.getPaddingTop(),
@ -1053,8 +1053,7 @@ public abstract class VideoPlayerUi extends PlayerUi
} }
qualityPopupMenu.getMenu().removeGroup(POPUP_MENU_ID_QUALITY); qualityPopupMenu.getMenu().removeGroup(POPUP_MENU_ID_QUALITY);
@Nullable final List<VideoStream> availableStreams final List<VideoStream> availableStreams = Optional.ofNullable(player.getCurrentMetadata())
= Optional.ofNullable(player.getCurrentMetadata())
.flatMap(MediaItemTag::getMaybeQuality) .flatMap(MediaItemTag::getMaybeQuality)
.map(MediaItemTag.Quality::getSortedVideoStreams) .map(MediaItemTag.Quality::getSortedVideoStreams)
.orElse(null); .orElse(null);