Analytics audit: Add missing sleep timer settings

podcasts/Analytics/AnalyticsEvent.swift

@@ -395,6 +395,7 @@ enum AnalyticsEvent: String {
     case playerSleepTimerExtended
     case playerSleepTimerCancelled
     case playerSleepTimerRestarted
+    case playerSleepTimerSettingsTapped
 
     // MARK: - Player: Shelf
 

podcasts/GeneralSettingsViewController.swift

@@ -8,9 +8,11 @@ class GeneralSettingsViewController: PCViewController, UITableViewDelegate, UITa
     private let switchCellId = "SwitchCell"
     private let disclosureCellId = "DisclosureCell"
 
+    var scrollToRow: TableRow?
+
     let debounce = Debounce(delay: Constants.defaultDebounceTime)
 
-    private enum TableRow { case skipForward, skipBack, keepScreenAwake, openPlayer, intelligentPlaybackResumption, defaultRowAction, extraMediaActions, defaultAddToUpNextSwipe, defaultGrouping, defaultArchive, playUpNextOnTap, legacyBluetooth, multiSelectGesture, openLinksInBrowser, publishChapterTitles, autoplay, autoRestartSleepTimer, shakeToRestartSleepTimer, isLockScreenScrubberDisabled }
+    enum TableRow { case skipForward, skipBack, keepScreenAwake, openPlayer, intelligentPlaybackResumption, defaultRowAction, extraMediaActions, defaultAddToUpNextSwipe, defaultGrouping, defaultArchive, playUpNextOnTap, legacyBluetooth, multiSelectGesture, openLinksInBrowser, publishChapterTitles, autoplay, autoRestartSleepTimer, shakeToRestartSleepTimer, isLockScreenScrubberDisabled }
     private var tableData: [[TableRow]] = [[.defaultRowAction, .defaultGrouping, .defaultArchive, .defaultAddToUpNextSwipe, .openLinksInBrowser], [.skipForward, .skipBack, .keepScreenAwake, .openPlayer, .isLockScreenScrubberDisabled, .intelligentPlaybackResumption], [.autoRestartSleepTimer], [.shakeToRestartSleepTimer], [.playUpNextOnTap], [.extraMediaActions], [.legacyBluetooth], [.multiSelectGesture], [.publishChapterTitles], [.autoplay]]
 
     @IBOutlet var settingsTable: UITableView! {
@@ -29,6 +31,10 @@ class GeneralSettingsViewController: PCViewController, UITableViewDelegate, UITa
         insetAdjuster.setupInsetAdjustmentsForMiniPlayer(scrollView: settingsTable)
 
         Analytics.track(.settingsGeneralShown)
+
+        if let scrollToRow {
+            self.scrollToRow(scrollToRow)
+        }
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -43,6 +49,14 @@ class GeneralSettingsViewController: PCViewController, UITableViewDelegate, UITa
         }
     }
 
+    private func scrollToRow(_ row: TableRow) {
+        for (sectionIndex, section) in tableData.enumerated() {
+            if let row = section.firstIndex(of: row) {
+                settingsTable.scrollToRow(at: IndexPath(row: row, section: sectionIndex), at: .middle, animated: true)
+            }
+        }
+    }
+
     // MARK: - UITableView Methods
 
     func numberOfSections(in tableView: UITableView) -> Int {

podcasts/MainTabBarController.swift

@@ -6,6 +6,7 @@ import Combine
 import PocketCastsUtils
 
 class MainTabBarController: UITabBarController, NavigationProtocol {
+
     enum Tab { case podcasts, filter, discover, profile, upNext }
 
     var pcTabs = [Tab]()
@@ -158,7 +159,7 @@ class MainTabBarController: UITabBarController, NavigationProtocol {
 
     private func fixTarBarTraitCollectionOnIpadForiOS18() {
         if #available(iOS 18.0, *),
-            UIDevice.current.userInterfaceIdiom == .pad {
+           UIDevice.current.userInterfaceIdiom == .pad {
             traitOverrides.horizontalSizeClass = .compact
             if let rootHorizontalSizeClass = view.window?.traitCollection.horizontalSizeClass {
                 tabBar.traitOverrides.horizontalSizeClass = rootHorizontalSizeClass
@@ -478,6 +479,24 @@ class MainTabBarController: UITabBarController, NavigationProtocol {
         }
     }
 
+    func showGeneralSettings(row: GeneralSettingsViewController.TableRow?) {
+        let state = NavigationManager.sharedManager.miniPlayer?.playerOpenState
+
+        // Dismiss any presented views if the player is not already open/dismissing since it will dismiss itself
+        if state != .open, state != .animating {
+            dismissPresentedViewController()
+        }
+
+        switchToTab(.profile)
+        if let navController = selectedViewController as? UINavigationController {
+            navController.popToRootViewController(animated: false)
+            navController.pushViewController(SettingsViewController(), animated: false)
+            let generalSettingsController = GeneralSettingsViewController()
+            generalSettingsController.scrollToRow = row
+            navController.pushViewController(generalSettingsController, animated: true)
+        }
+    }
+
     func showSupporterSignIn(podcastInfo: PodcastInfo) {
         let supporterVC = SupporterGratitudeViewController(podcastInfo: podcastInfo)
         let controller = view.window?.rootViewController

podcasts/NavigationManager.swift

@@ -61,6 +61,9 @@ class NavigationManager {
     static let endOfYearStories = "endOfYearStories"
     static let onboardingFlow = "onboardingFlow"
 
+    static let settingsGeneralKey = "generalSettingsPage"
+    static let settingsGeneralRowKey = "generalSettingsRow"
+
     static let sharedManager = NavigationManager()
 
     private weak var mainController: NavigationProtocol?
@@ -210,6 +213,8 @@ class NavigationManager {
         } else if place == NavigationManager.onboardingFlow {
             let flow: OnboardingFlow.Flow? = data?["flow"] as? OnboardingFlow.Flow
             mainController?.showOnboardingFlow(flow: flow)
+        } else if place == NavigationManager.settingsGeneralKey {
+            mainController?.showGeneralSettings(row: data?[NavigationManager.settingsGeneralRowKey] as? GeneralSettingsViewController.TableRow)
         }
     }
 }

podcasts/NavigationProtocol.swift

@@ -32,6 +32,7 @@ protocol NavigationProtocol: AnyObject {
     func showPromotionFinishedAcknowledge()
     func showProfilePage()
     func showHeadphoneSettings()
+    func showGeneralSettings(row: GeneralSettingsViewController.TableRow?)
     func showRedeemGuestPass(url: URL)
 
     func showSupporterSignIn(podcastInfo: PodcastInfo)

podcasts/SleepTimerViewController.swift

@@ -2,6 +2,9 @@ import PocketCastsUtils
 import UIKit
 
 class SleepTimerViewController: SimpleNotificationsViewController {
+
+    @IBOutlet var settingsBtn: UIButton!
+
     @IBOutlet var plusFiveBtn: UIButton! {
         didSet {
             plusFiveBtn.setTitle(L10n.sleepTimerAdd5Mins, for: .normal)
@@ -210,6 +213,8 @@ class SleepTimerViewController: SimpleNotificationsViewController {
 
         customTimeStepper.tintColor = ThemeColor.playerContrast01()
         customEpisodeStepper.tintColor = ThemeColor.playerContrast01()
+
+        settingsBtn.tintColor = ThemeColor.playerContrast02()
     }
 
     private func updateSleepRemainingTime() {
@@ -272,6 +277,11 @@ class SleepTimerViewController: SimpleNotificationsViewController {
 
     // MARK: - Sleep Timer Actions
 
+    @IBAction func settingsTapped(_ sender: Any) {
+        Analytics.track(.playerSleepTimerSettingsTapped)
+        NavigationManager.sharedManager.navigateTo(NavigationManager.settingsGeneralKey, data: [NavigationManager.settingsGeneralRowKey: GeneralSettingsViewController.TableRow.autoRestartSleepTimer])
+    }
+
     @IBAction func fiveMinutesTapped(_ sender: Any) {
         PlaybackManager.shared.setSleepTimerInterval(5.minutes)
         dismiss(animated: true, completion: nil)