Add preference for default zoom mode

app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt

@@ -10,6 +10,7 @@ import org.jellyfin.androidtv.preference.constant.NextUpBehavior
 import org.jellyfin.androidtv.preference.constant.RatingType
 import org.jellyfin.androidtv.preference.constant.RefreshRateSwitchingBehavior
 import org.jellyfin.androidtv.preference.constant.WatchedIndicatorBehavior
+import org.jellyfin.androidtv.preference.constant.ZoomMode
 import org.jellyfin.preference.booleanPreference
 import org.jellyfin.preference.enumPreference
 import org.jellyfin.preference.floatPreference
@@ -210,6 +211,11 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 * The actions to take for each media segment type. Managed by the [MediaSegmentRepository].
 		 */
 		var mediaSegmentActions = stringPreference("media_segment_actions", "")
+
+		/**
+		 * Preferred behavior for player aspect ratio (zoom mode).
+		 */
+		var playerZoomMode = enumPreference("player_zoom_mode", ZoomMode.FIT)
 	}
 
 	init {

app/src/main/java/org/jellyfin/androidtv/preference/constant/ZoomMode.kt

@@ -0,0 +1,24 @@
+package org.jellyfin.androidtv.preference.constant
+
+import org.jellyfin.androidtv.R
+import org.jellyfin.preference.PreferenceEnum
+
+enum class ZoomMode(
+	override val nameRes: Int,
+) : PreferenceEnum {
+	/**
+	 * Sets the zoom mode to normal (fit).
+	 */
+	FIT(R.string.lbl_fit),
+
+	/**
+	 * Sets the zoom mode to auto crop.
+	 */
+	AUTO_CROP(R.string.lbl_auto_crop),
+
+	/**
+	 * Sets the zoom mode to stretch.
+	 */
+	STRETCH(R.string.lbl_stretch),
+}
+

app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java

@@ -23,6 +23,7 @@
 import org.jellyfin.androidtv.preference.constant.AudioBehavior;
 import org.jellyfin.androidtv.preference.constant.NextUpBehavior;
 import org.jellyfin.androidtv.preference.constant.RefreshRateSwitchingBehavior;
+import org.jellyfin.androidtv.preference.constant.ZoomMode;
 import org.jellyfin.androidtv.ui.livetv.TvManager;
 import org.jellyfin.androidtv.util.TimeUtils;
 import org.jellyfin.androidtv.util.Utils;
@@ -137,6 +138,7 @@ public CustomPlaybackOverlayFragment getFragment() {
     public void init(@NonNull VideoManager mgr, @NonNull CustomPlaybackOverlayFragment fragment) {
         mVideoManager = mgr;
         mVideoManager.subscribe(this);
+        mVideoManager.setZoom(userPreferences.getValue().get(UserPreferences.Companion.getPlayerZoomMode()));
         mFragment = fragment;
         directStreamLiveTv = userPreferences.getValue().get(UserPreferences.Companion.getLiveTvDirectPlayEnabled());
     }
@@ -1271,11 +1273,11 @@ public boolean isPaused() {
         return mPlaybackState == PlaybackState.PAUSED;
     }
 
-    public int getZoomMode() {
-        return hasInitializedVideoManager() ? mVideoManager.getZoomMode() : 0;
+    public @NonNull ZoomMode getZoomMode() {
+        return hasInitializedVideoManager() ? mVideoManager.getZoomMode() : ZoomMode.FIT;
     }
 
-    public void setZoom(int mode) {
+    public void setZoom(@NonNull ZoomMode mode) {
         if (hasInitializedVideoManager())
             mVideoManager.setZoom(mode);
     }

app/src/main/java/org/jellyfin/androidtv/ui/playback/VideoManager.java

@@ -42,6 +42,7 @@
 
 import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.preference.UserPreferences;
+import org.jellyfin.androidtv.preference.constant.ZoomMode;
 import org.jellyfin.sdk.model.api.MediaStream;
 import org.koin.java.KoinJavaComponent;
 
@@ -52,12 +53,7 @@
 
 @OptIn(markerClass = UnstableApi.class)
 public class VideoManager {
-    public final static int ZOOM_FIT = 0;
-    public final static int ZOOM_AUTO_CROP = 1;
-    public final static int ZOOM_STRETCH = 2;
-
-    private int mZoomMode = ZOOM_FIT;
-
+    private ZoomMode mZoomMode;
     private Activity mActivity;
     private Equalizer mEqualizer;
     private DynamicsProcessing mDynamicsProcessing;
@@ -215,20 +211,20 @@ public boolean isInitialized() {
         return mExoPlayer != null;
     }
 
-    public int getZoomMode() {
+    public @NonNull ZoomMode getZoomMode() {
         return mZoomMode;
     }
 
-    public void setZoom(int mode) {
+    public void setZoom(@NonNull ZoomMode mode) {
         mZoomMode = mode;
         switch (mode) {
-            case ZOOM_FIT:
+            case FIT:
                 mExoPlayerView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);
                 break;
-            case ZOOM_AUTO_CROP:
+            case AUTO_CROP:
                 mExoPlayerView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_ZOOM);
                 break;
-            case ZOOM_STRETCH:
+            case STRETCH:
                 mExoPlayerView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FILL);
                 break;
         }

app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/ZoomAction.kt

@@ -3,13 +3,12 @@ package org.jellyfin.androidtv.ui.playback.overlay.action
 import android.content.Context
 import android.view.Gravity
 import android.view.View
-import android.widget.PopupMenu
 import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.preference.constant.ZoomMode
 import org.jellyfin.androidtv.ui.playback.PlaybackController
-import org.jellyfin.androidtv.ui.playback.VideoManager
 import org.jellyfin.androidtv.ui.playback.overlay.CustomPlaybackTransportControlGlue
-import org.jellyfin.androidtv.ui.playback.overlay.LeanbackOverlayFragment
 import org.jellyfin.androidtv.ui.playback.overlay.VideoPlayerAdapter
+import org.jellyfin.androidtv.util.popupMenu
 
 class ZoomAction(
 	context: Context,
@@ -26,43 +25,27 @@ class ZoomAction(
 		view: View,
 	) {
 		videoPlayerAdapter.leanbackOverlayFragment.setFading(false)
-		return PopupMenu(context, view, Gravity.END).apply {
-			with(menu) {
-				add(
-					0,
-					VideoManager.ZOOM_AUTO_CROP,
-					VideoManager.ZOOM_AUTO_CROP,
-					context.getString(R.string.lbl_auto_crop)
-				).apply {
-					isChecked = playbackController.zoomMode == VideoManager.ZOOM_AUTO_CROP
-				}
-
-				add(
-					0,
-					VideoManager.ZOOM_FIT,
-					VideoManager.ZOOM_FIT,
-					context.getString(R.string.lbl_fit)
-				).apply {
-					isChecked = playbackController.zoomMode == VideoManager.ZOOM_FIT
-				}
-
-				add(
-					0,
-					VideoManager.ZOOM_STRETCH,
-					VideoManager.ZOOM_STRETCH,
-					context.getString(R.string.lbl_stretch)
-				).apply {
-					isChecked = playbackController.zoomMode == VideoManager.ZOOM_STRETCH
-				}
+		val popup = popupMenu(context, view, Gravity.END) {
+			item(context.getString(R.string.lbl_fit)) {
+				playbackController.setZoom(ZoomMode.FIT)
+			}.apply {
+				isChecked = playbackController.zoomMode == ZoomMode.FIT
+			}
 
-				setGroupCheckable(0, true, true)
+			item(context.getString(R.string.lbl_auto_crop)) {
+				playbackController.setZoom(ZoomMode.AUTO_CROP)
+			}.apply {
+				isChecked = playbackController.zoomMode == ZoomMode.AUTO_CROP
 			}
 
-			setOnDismissListener { videoPlayerAdapter.leanbackOverlayFragment.setFading(true) }
-			setOnMenuItemClickListener { item ->
-				playbackController.setZoom(item.itemId)
-				true
+			item(context.getString(R.string.lbl_stretch)) {
+				playbackController.setZoom(ZoomMode.STRETCH)
+			}.apply {
+				isChecked = playbackController.zoomMode == ZoomMode.STRETCH
 			}
-		}.show()
+		}
+		popup.menu.setGroupCheckable(0, true, true)
+		popup.setOnDismissListener { videoPlayerAdapter.leanbackOverlayFragment.setFading(true) }
+		popup.show()
 	}
 }

app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackAdvancedPreferencesScreen.kt

@@ -5,6 +5,7 @@ import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.constant.getQualityProfiles
 import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.androidtv.preference.constant.RefreshRateSwitchingBehavior
+import org.jellyfin.androidtv.preference.constant.ZoomMode
 import org.jellyfin.androidtv.ui.preference.custom.DurationSeekBarPreference
 import org.jellyfin.androidtv.ui.preference.dsl.OptionsFragment
 import org.jellyfin.androidtv.ui.preference.dsl.checkbox
@@ -78,6 +79,11 @@ class PlaybackAdvancedPreferencesScreen : OptionsFragment() {
 				}
 			}
 
+			enum<ZoomMode> {
+				setTitle(R.string.default_video_zoom)
+				bind(userPreferences, UserPreferences.playerZoomMode)
+			}
+
 			checkbox{
 				setTitle(R.string.pref_external_player)
 				bind(userPreferences, UserPreferences.useExternalPlayer)

app/src/main/res/values/strings.xml

@@ -516,6 +516,7 @@
     <string name="past_24_hours">Past 24 hours</string>
     <string name="prefer_exoplayer_ffmpeg">Prefer FFmpeg for audio playback</string>
     <string name="prefer_exoplayer_ffmpeg_content">Use FFmpeg to decode audio, even if platform codecs are available.</string>
+    <string name="default_video_zoom">Default zoom mode</string>
     <string name="video_start_delay">Video start delay</string>
     <string name="pref_mediasegment_actions">Media segment actions</string>
     <string name="segment_action_ask_to_skip">Ask to skip</string>