Fix deprecations + remove dead code

NYPL-Simplified · Feb 5, 2024 · 585651b · 585651b
1 parent 851bcc5
commit 585651b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 46 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/NYPLAudiobookToolkit.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/NYPLAudiobookToolkit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/NYPLAudiobookToolkit/DRM/FeedbookDRMProcessor.swift b/NYPLAudiobookToolkit/DRM/FeedbookDRMProcessor.swift
@@ -135,9 +135,8 @@ class FeedbookDRMProcessor {
 
             guard status == noErr else {
                 if #available(iOS 11.3, *) {
-                    var errorMessage = ""
-                    SecCopyErrorMessageString(status, &errorMessage)
-                    ATLog(.error, "Failed to verify data - \(errorMessage)")
+                    let err = SecCopyErrorMessageString(status, nil) ?? "" as CFString
+                    ATLog(.error, "Failed to verify data - status: \(status.description) - error: \(err)")
                 } else {
                     ATLog(.error, "Failed to verify data - \(status.description)")
                 }

diff --git a/NYPLAudiobookToolkit/Network/OverdriveDownloadTask.swift b/NYPLAudiobookToolkit/Network/OverdriveDownloadTask.swift
@@ -16,7 +16,7 @@ final class OverdriveDownloadTask: DownloadTask {
 
     /// For monitoring download task with long download time.
     private var fetchStartTime: Date?
-    /// Timer for monitoring the duration of the download task takes to complete.
+    /// Timer for monitoring how long the download task takes to complete.
     /// We log a warning statement by calling the delegates
     /// when the download task reaches 30s and 180s marks.
     private var monitoringTimer: NYPLRepeatingTimer?

diff --git a/NYPLAudiobookToolkit/UI/AudiobookCoverImageView.swift b/NYPLAudiobookToolkit/UI/AudiobookCoverImageView.swift
@@ -13,9 +13,7 @@ public class AudiobookCoverImageView: UIImageView {
         contentMode = .scaleAspectFill
         isAccessibilityElement = true
         accessibilityLabel = NSLocalizedString("Cover", bundle: Bundle.audiobookToolkit()!, value: "Cover", comment:"The art on an album cover.")
-        if #available(iOS 11.0, *) {
-            accessibilityIgnoresInvertColors = true
-        }
+        accessibilityIgnoresInvertColors = true
     }
 
     required init?(coder aDecoder: NSCoder) {

diff --git a/NYPLAudiobookToolkit/UI/AudiobookPlayerViewController.swift b/NYPLAudiobookToolkit/UI/AudiobookPlayerViewController.swift
@@ -331,24 +331,7 @@ private let tocImageName = "table_of_contents"
     }
 
     func audioRoutingBarButtonItem() -> UIBarButtonItem {
-        let view: UIView
-        if #available(iOS 11.0, *) {
-            view = AVRoutePickerView()
-        } else {
-            let volumeView = MPVolumeView()
-            volumeView.showsVolumeSlider = false
-            volumeView.showsRouteButton = true
-            // Set tint of route button: https://stackoverflow.com/a/33016391
-            for view in volumeView.subviews {
-                if view.isKind(of: UIButton.self) {
-                    let buttonOnVolumeView = view as! UIButton
-                    volumeView.setRouteButtonImage(buttonOnVolumeView.currentImage?.withRenderingMode(.alwaysTemplate), for: .normal)
-                    break
-                }
-            }
-            volumeView.sizeToFit()
-            view = volumeView
-        }
+        let view = AVRoutePickerView()
         let buttonItem = UIBarButtonItem(customView: view)
         buttonItem.width = audioRouteButtonWidth
         buttonItem.isAccessibilityElement = true

diff --git a/NYPLAudiobookToolkit/Utils/NYPLColor.swift b/NYPLAudiobookToolkit/Utils/NYPLColor.swift
@@ -22,8 +22,7 @@ class NYPLColor {
         if #available(iOS 13.0, *),
            UIScreen.main.traitCollection.userInterfaceStyle == .light {
             return .systemBackground
-        } else if #available(iOS 11.0, *),
-          let color = UIColor(named: ColorAsset.primaryBackground.rawValue) {
+        } else if let color = UIColor(named: ColorAsset.primaryBackground.rawValue) {
             return color
         }
 
@@ -34,8 +33,7 @@ class NYPLColor {
         if #available(iOS 13.0, *),
            UIScreen.main.traitCollection.userInterfaceStyle == .light {
             return .label
-        } else if #available(iOS 11.0, *),
-          let color = UIColor(named: ColorAsset.primaryText.rawValue) {
+        } else if let color = UIColor(named: ColorAsset.primaryText.rawValue) {
             return color
         }
 
@@ -46,8 +44,7 @@ class NYPLColor {
         if #available(iOS 13.0, *),
            UIScreen.main.traitCollection.userInterfaceStyle == .light {
             return .secondarySystemBackground
-        } else if #available(iOS 11.0, *),
-          let color = UIColor(named: ColorAsset.secondaryBackground.rawValue) {
+        } else if let color = UIColor(named: ColorAsset.secondaryBackground.rawValue) {
             return color
         }
 
@@ -58,29 +55,18 @@ class NYPLColor {
         if #available(iOS 13.0, *),
            UIScreen.main.traitCollection.userInterfaceStyle == .light {
             return .link
-        } else if #available(iOS 11.0, *),
-          let color = UIColor(named: ColorAsset.action.rawValue) {
+        } else if let color = UIColor(named: ColorAsset.action.rawValue) {
             return color
         }
 
         return .systemBlue
     }
 
     static var disabledFieldTextColor: UIColor {
-        if #available(iOS 11.0, *),
-           let color = UIColor(named: ColorAsset.disabledFieldText.rawValue) {
-            return color
-        }
-
-        return .lightGray
+        UIColor(named: ColorAsset.disabledFieldText.rawValue) ?? .lightGray
     }
 
     static var progressBarBackgroundColor: UIColor {
-        if #available(iOS 11.0, *),
-           let color = UIColor(named: ColorAsset.progressBarBackground.rawValue) {
-            return color
-        }
-
-        return .darkGray
+        UIColor(named: ColorAsset.progressBarBackground.rawValue) ?? .darkGray
     }
 }