mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-08-26 20:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Artwork should only show when audio mode is not transitioning out.

Browse source
This commit is contained in:
Koen J 2025-07-21 17:03:00 +02:00
commit 2b8dc41d0d
1 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
View file

@ -939,10 +939,6 @@ class VideoDetailView : ConstraintLayout {
else false; else false;
} ?: false; } ?: false;
if (isLimitedVersion && _player.isAudioMode) {
_player.switchToVideoMode()
}
val buttons = listOf(RoundButton(context, R.drawable.ic_add, context.getString(R.string.add), TAG_ADD) { val buttons = listOf(RoundButton(context, R.drawable.ic_add, context.getString(R.string.add), TAG_ADD) {
(video ?: _searchVideo)?.let { (video ?: _searchVideo)?.let {
_slideUpOverlay = UISlideOverlays.showAddToOverlay(it, _overlayContainer) { _slideUpOverlay = UISlideOverlays.showAddToOverlay(it, _overlayContainer) {
@ -1118,6 +1114,7 @@ class VideoDetailView : ConstraintLayout {
//Requested behavior to leave it in audio mode. leaving it commented if it causes issues, revert? //Requested behavior to leave it in audio mode. leaving it commented if it causes issues, revert?
if(!allowBackground) { if(!allowBackground) {
_player.switchToVideoMode(); _player.switchToVideoMode();
allowBackground = false;
_buttonPins.getButtonByTag(TAG_BACKGROUND)?.text?.text = resources.getString(R.string.background); _buttonPins.getButtonByTag(TAG_BACKGROUND)?.text?.text = resources.getString(R.string.background);
} }
} }
@ -1141,8 +1138,10 @@ class VideoDetailView : ConstraintLayout {
when (Settings.instance.playback.backgroundPlay) { when (Settings.instance.playback.backgroundPlay) {
0 -> handlePause(); 0 -> handlePause();
1 -> { 1 -> {
if(!(video?.isLive ?: false)) if(!(video?.isLive ?: false)) {
_player.switchToAudioMode(video); _player.switchToAudioMode(video);
allowBackground = true;
}
StatePlayer.instance.startOrUpdateMediaSession(context, video); StatePlayer.instance.startOrUpdateMediaSession(context, video);
} }
} }
@ -1876,19 +1875,30 @@ class VideoDetailView : ConstraintLayout {
if (!isCasting) { if (!isCasting) {
setCastEnabled(false); setCastEnabled(false);
val thumbnail = video.thumbnails.getHQThumbnail(); val isLimitedVersion = StatePlatform.instance.getContentClientOrNull(video.url)?.let {
if ((videoSource == null || _player.isAudioMode) && !thumbnail.isNullOrBlank()) if (it is JSClient)
Glide.with(context).asBitmap().load(thumbnail) return@let it.config.reduceFunctionsInLimitedVersion && BuildConfig.IS_PLAYSTORE_BUILD
.into(object: CustomTarget<Bitmap>() { else false;
override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) { } ?: false;
_player.setArtwork(BitmapDrawable(resources, resource));
} if (isLimitedVersion && _player.isAudioMode) {
override fun onLoadCleared(placeholder: Drawable?) { _player.switchToVideoMode()
_player.setArtwork(null); allowBackground = false;
} } else {
}); val thumbnail = video.thumbnails.getHQThumbnail();
else if ((videoSource == null || _player.isAudioMode) && !thumbnail.isNullOrBlank())
_player.setArtwork(null); Glide.with(context).asBitmap().load(thumbnail)
.into(object: CustomTarget<Bitmap>() {
override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
_player.setArtwork(BitmapDrawable(resources, resource));
}
override fun onLoadCleared(placeholder: Drawable?) {
_player.setArtwork(null);
}
});
else
_player.setArtwork(null);
}
_player.setSource(videoSource, audioSource, _playWhenReady, false, resume = resumePositionMs > 0); _player.setSource(videoSource, audioSource, _playWhenReady, false, resume = resumePositionMs > 0);
if(subtitleSource != null) if(subtitleSource != null)
_player.swapSubtitles(fragment.lifecycleScope, subtitleSource); _player.swapSubtitles(fragment.lifecycleScope, subtitleSource);