Merge pull request #163 from hugeBlack/swift

Fix #160 and settings view being too wide on iPad
whoeevee · Jun 2, 2024 · b424e35 · b424e35
2 parents 400a289 + fb5b1d9
commit b424e35
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Sources/EeveeSpotify/Lyrics/Helpers/LyricsHelper.swift b/Sources/EeveeSpotify/Lyrics/Helpers/LyricsHelper.swift
@@ -40,7 +40,7 @@ class LyricsHelper {
                 lyricLines = lines.map { line in
 
                     let match = line.firstMatch(
-                        "\\[(?<minute>\\d{2}):(?<seconds>\\d{2}\\.\\d{2})\\] ?(?<content>.*)"
+                        "\\[(?<minute>\\d{2}):(?<seconds>\\d{2}\\.?\\d*)\\] ?(?<content>.*)"
                     )!
 
                     var captures: [String: String] = [:]

diff --git a/Sources/EeveeSpotify/Models/Extensions/UserDefaults+Extension.swift b/Sources/EeveeSpotify/Models/Extensions/UserDefaults+Extension.swift
@@ -13,7 +13,12 @@ extension UserDefaults {
     static var lyricsSource: LyricsSource {
         get {
             if let rawValue = defaults.object(forKey: lyricsSourceKey) as? Int {
-                return LyricsSource(rawValue: rawValue)!
+                if let source = LyricsSource(rawValue: rawValue) {
+                    return source
+                } else {
+                    return .lrclib
+                }
+
             }
 
             return .lrclib

diff --git a/Sources/EeveeSpotify/Tweak.x.swift b/Sources/EeveeSpotify/Tweak.x.swift
@@ -46,7 +46,7 @@ class ProfileSettingsSectionHook: ClassHook<NSObject> {
                 "RootSettingsViewController"
             )!
 
-            let eeveeSettingsController = EeveeSettingsViewController()
+            let eeveeSettingsController = EeveeSettingsViewController(rootSettingsController.view.bounds)
             eeveeSettingsController.title = "EeveeSpotify"
 
             rootSettingsController.navigationController!.pushViewController(

diff --git a/Sources/EeveeSpotify/Views/EeveeSettingsViewController.swift b/Sources/EeveeSpotify/Views/EeveeSettingsViewController.swift
@@ -2,6 +2,16 @@ import SwiftUI
 import UIKit 
 
 class EeveeSettingsViewController: UIViewController {
+
+    let frame: CGRect
+    init(_ frame: CGRect) {
+        self.frame = frame
+        super.init(nibName: nil, bundle: nil)
+    }
+
+	required init?(coder: NSCoder) {
+		fatalError("init(coder:) has not been implemented")
+	}
 
     override func conforms(to aProtocol: Protocol) -> Bool {
 
@@ -24,7 +34,7 @@ class EeveeSettingsViewController: UIViewController {
         super.viewDidLoad()
 
         let hostingController = UIHostingController(rootView: EeveeSettingsView())
-        hostingController.view.frame = view.bounds
+        hostingController.view.frame = frame
 
         view.addSubview(hostingController.view)
         addChild(hostingController)