Revert "feat(settings): add toggle to disable auto-play next episode"

This reverts commit d1b15a9dde.

components/settings/PlaybackControlsSettings.tsx

@@ -211,23 +211,7 @@ export const PlaybackControlsSettings: React.FC = () => {
           />
         </ListItem>
 
-        <ListItem
+        <ListItem title={t("home.settings.other.max_auto_play_episode_count")}>
-          title={t("home.settings.other.auto_play_next_episode")}
-          disabled={pluginSettings?.autoPlayNextEpisode?.locked}
-        >
-          <Switch
-            value={settings.autoPlayNextEpisode}
-            disabled={pluginSettings?.autoPlayNextEpisode?.locked}
-            onValueChange={(autoPlayNextEpisode) =>
-              updateSettings({ autoPlayNextEpisode })
-            }
-          />
-        </ListItem>
-
-        <ListItem
-          title={t("home.settings.other.max_auto_play_episode_count")}
-          disabled={!settings.autoPlayNextEpisode}
-        >
           <PlatformDropdown
             groups={autoPlayEpisodeOptions}
             trigger={

components/video-player/controls/BottomControls.tsx

@@ -148,22 +148,21 @@ export const BottomControls: FC<BottomControlsProps> = ({
             onPress={skipCredit}
             buttonText='Skip Credits'
           />
-          {settings.autoPlayNextEpisode !== false &&
+          {(settings.maxAutoPlayEpisodeCount.value === -1 ||
-            (settings.maxAutoPlayEpisodeCount.value === -1 ||
+            settings.autoPlayEpisodeCount <
-              settings.autoPlayEpisodeCount <
+              settings.maxAutoPlayEpisodeCount.value) && (
-                settings.maxAutoPlayEpisodeCount.value) && (
+            <NextEpisodeCountDownButton
-              <NextEpisodeCountDownButton
+              show={
-                show={
+                !nextItem
-                  !nextItem
+                  ? false
-                    ? false
+                  : // Show during credits if no content after, OR near end of video
-                    : // Show during credits if no content after, OR near end of video
+                    (showSkipCreditButton && !hasContentAfterCredits) ||
-                      (showSkipCreditButton && !hasContentAfterCredits) ||
+                    remainingTime < 10000
-                      remainingTime < 10000
+              }
-                }
+              onFinish={handleNextEpisodeAutoPlay}
-                onFinish={handleNextEpisodeAutoPlay}
+              onPress={handleNextEpisodeManual}
-                onPress={handleNextEpisodeManual}
+            />
-              />
+          )}
-            )}
         </View>
       </View>
       <View

translations/en.json

@@ -278,7 +278,6 @@
         "disable_haptic_feedback": "Disable Haptic Feedback",
         "default_quality": "Default Quality",
         "default_playback_speed": "Default Playback Speed",
-        "auto_play_next_episode": "Auto-play Next Episode",
         "max_auto_play_episode_count": "Max Auto Play Episode Count",
         "disabled": "Disabled"
       },

utils/atoms/settings.ts

@@ -180,7 +180,6 @@ export type Settings = {
   enableH265ForChromecast: boolean;
   maxAutoPlayEpisodeCount: MaxAutoPlayEpisodeCount;
   autoPlayEpisodeCount: number;
-  autoPlayNextEpisode: boolean;
   // Playback speed settings
   defaultPlaybackSpeed: number;
   playbackSpeedPerMedia: Record<string, number>;
@@ -265,7 +264,6 @@ export const defaultValues: Settings = {
   enableH265ForChromecast: false,
   maxAutoPlayEpisodeCount: { key: "3", value: 3 },
   autoPlayEpisodeCount: 0,
-  autoPlayNextEpisode: true,
   // Playback speed defaults
   defaultPlaybackSpeed: 1.0,
   playbackSpeedPerMedia: {},