Add logic for default zoom mode setting

jellyfin · Sep 24, 2024 · 19b3563 · 19b3563
1 parent 70654a2
commit 19b3563
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt b/app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
@@ -200,6 +200,12 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 * Whether items shown in the screensaver are required to have an age rating set.
 		 */
 		var screensaverAgeRatingRequired = booleanPreference("screensaver_agerating_required", true)
+
+		/**
+		 * Preferred behavior for zoom mode.
+		 */
+
+		var zoomMode = intPreference("zoom_mode", 0)
 	}
 
 	init {

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
@@ -137,6 +137,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.getZoomMode()));
         mFragment = fragment;
         directStreamLiveTv = userPreferences.getValue().get(UserPreferences.Companion.getLiveTvDirectPlayEnabled());
     }

diff --git a/...ain/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackAdvancedPreferencesScreen.kt b/...ain/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackAdvancedPreferencesScreen.kt
@@ -64,6 +64,21 @@ class PlaybackAdvancedPreferencesScreen : OptionsFragment() {
 				setTitle(R.string.pref_external_player)
 				bind(userPreferences, UserPreferences.useExternalPlayer)
 			}
+
+			@Suppress("MagicNumber")
+			list {
+				setTitle(R.string.lbl_zoom)
+				entries = mapOf(
+					0 to context.getString(R.string.lbl_fit),
+					1 to context.getString(R.string.lbl_auto_crop),
+					2 to context.getString(R.string.lbl_stretch),
+				).mapKeys { it.key.toString() }
+				bind {
+					get { userPreferences[UserPreferences.zoomMode].toString() }
+					set { value -> userPreferences[UserPreferences.zoomMode] = value.toInt() }
+					default { UserPreferences.zoomMode.defaultValue.toString() }
+				}
+			}
 		}
 
 		category {