Follow the establish preference format

intro-skipper · Oct 11, 2024 · f8c4ebd · f8c4ebd
1 parent d180026
commit f8c4ebd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 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
@@ -85,7 +85,7 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		/**
 		 * Configure segment handling behavior (Auto skip, Show skip button, Hide skip button).
 		 */
-		var skipMode = enumPreference<SegmentMode>("skip_mode", SegmentMode.SHOW_SKIP_BUTTON)
+		var skipMode = enumPreference("skip_mode", SegmentMode.SHOW_SKIP_BUTTON)
 
 		/**
 		 * Whether to use an external playback application or not.

diff --git a/...n/java/org/jellyfin/androidtv/ui/playback/overlay/CustomPlaybackTransportControlGlue.java b/...n/java/org/jellyfin/androidtv/ui/playback/overlay/CustomPlaybackTransportControlGlue.java
@@ -203,9 +203,9 @@ private void initActions(Context context) {
         zoomAction.setLabels(new String[]{context.getString(R.string.lbl_zoom)});
         selectSkipAction = new SelectSkipAction(context, this, KoinJavaComponent.get(UserPreferences.class));
         selectSkipAction.setLabels(new String[]{
-                context.getString(SegmentMode.AUTO_SKIP.label()),
-                context.getString(SegmentMode.SHOW_SKIP_BUTTON.label()),
-                context.getString(SegmentMode.HIDE_SKIP_BUTTON.label())
+                context.getString(SegmentMode.AUTO_SKIP.getNameRes()),
+                context.getString(SegmentMode.SHOW_SKIP_BUTTON.getNameRes()),
+                context.getString(SegmentMode.HIDE_SKIP_BUTTON.getNameRes())
         });
         chapterAction = new ChapterAction(context, this);
         chapterAction.setLabels(new String[]{context.getString(R.string.lbl_chapters)});

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/SelectSkipAction.kt b/app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/SelectSkipAction.kt
@@ -31,7 +31,7 @@ class SelectSkipAction(
 		videoPlayerAdapter.leanbackOverlayFragment.setFading(false)
 		PopupMenu(context, view, Gravity.END).apply {
 			SegmentMode.entries.forEach {
-				menu.add(0, it.ordinal, it.ordinal, context.getString(it.label())).apply {
+				menu.add(0, it.ordinal, it.ordinal, context.getString(it.nameRes)).apply {
 					isChecked = preferences[UserPreferences.skipMode] == it
 				}
 			}

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipModes.kt b/app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipModes.kt
@@ -1,21 +1,21 @@
 package org.jellyfin.androidtv.ui.playback.segments
 
 import org.jellyfin.androidtv.R
+import org.jellyfin.preference.PreferenceEnum
 
-enum class SegmentMode {
-	SHOW_SKIP_BUTTON {
+enum class SegmentMode(
+	override val nameRes: Int,
+) : PreferenceEnum {
+
+	SHOW_SKIP_BUTTON(R.string.lbl_show_skip_button) {
 		override fun icon(): Int = R.drawable.ic_select_skip_show_button
-		override fun label(): Int = R.string.lbl_show_skip_button
 	},
-	AUTO_SKIP {
+	AUTO_SKIP(R.string.lbl_auto_skip) {
 		override fun icon(): Int = R.drawable.ic_select_skip_auto_skip
-		override fun label(): Int = R.string.lbl_auto_skip
 	},
-	HIDE_SKIP_BUTTON {
+	HIDE_SKIP_BUTTON(R.string.lbl_hide_skip_button) {
 		override fun icon(): Int = R.drawable.ic_select_skip_hide_button
-		override fun label(): Int = R.string.lbl_hide_skip_button
 	};
 
 	abstract fun icon(): Int
-	abstract fun label(): Int
 }