From 16a382c6b5e003e3ef2e45b315fdb3d06f8950d9 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Mon, 7 Oct 2024 21:41:39 +0200 Subject: [PATCH 1/2] Fix video player not closing when fragment is stopped (cherry picked from commit c522f09cc2c4e7e9355e54c819457fe629b96d11) --- .../androidtv/ui/playback/CustomPlaybackOverlayFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java index b30cd44900..b08e3ef45e 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java @@ -727,6 +727,8 @@ public void onStop() { Timber.d("this fragment belongs to the current session, ending it"); playbackControllerContainer.getValue().getPlaybackController().endPlayback(); } + + closePlayer(); } public void show() { From fe7f0c62d3a8e3e86a74da3f064d3b256e3abbe9 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Wed, 9 Oct 2024 22:08:00 +0200 Subject: [PATCH 2/2] Restore forced aspect ratio for poster types on video items (cherry picked from commit bf4198a8b82c2041146b1abb82c5279808c41879) --- .../org/jellyfin/androidtv/ui/presentation/CardPresenter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/presentation/CardPresenter.java b/app/src/main/java/org/jellyfin/androidtv/ui/presentation/CardPresenter.java index 4565176b6a..389070a1c9 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/presentation/CardPresenter.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/presentation/CardPresenter.java @@ -184,6 +184,8 @@ public void setItem(BaseRowItem m, ImageType imageType, int lHeight, int pHeight case VIDEO: mDefaultCardImage = ContextCompat.getDrawable(mCardView.getContext(), R.drawable.tile_port_video); showProgress = true; + if (imageType.equals(ImageType.POSTER)) + aspect = ImageHelper.ASPECT_RATIO_2_3; break; default: mDefaultCardImage = ContextCompat.getDrawable(mCardView.getContext(), R.drawable.tile_port_video);