default language & white popup background fix

whoeevee · Jul 13, 2024 · c407874 · c407874
1 parent 98f6f9e
commit c407874
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/Sources/EeveeSpotify/DarkPopUps.x.swift b/Sources/EeveeSpotify/DarkPopUps.x.swift
@@ -27,15 +27,17 @@ class EncoreLabelHook: ClassHook<UIView> {
     }
 }
 
-class SPTEncorePopUpDialogHook: ClassHook<NSObject> {
+class SPTEncorePopUpContainerHook: ClassHook<UIViewController> {
 
     typealias Group = DarkPopUps
-    static let targetName = "SPTEncorePopUpDialog"
-
-    func uiView() -> UIView {
-        let view = orig.uiView()
-        view.backgroundColor = UIColor(Color(hex: "#242424"))
-
-        return view
+    static let targetName = "SPTEncorePopUpContainer"
+
+    func containedView() -> SPTEncorePopUpDialog {
+        return orig.containedView()
+    }
+
+    func supportedInterfaceOrientations() -> UIInterfaceOrientationMask {
+        containedView().uiView().backgroundColor = UIColor(Color(hex: "#242424"))
+        return orig.supportedInterfaceOrientations()
     }
 }
diff --git a/Sources/EeveeSpotify/Models/Extensions/UserDefaults+Extension.swift b/Sources/EeveeSpotify/Models/Extensions/UserDefaults+Extension.swift
@@ -53,7 +53,10 @@ extension UserDefaults {
                 return lyricsOptions
             }
 
-            return LyricsOptions(romanization: false, musixmatchLanguage: "")
+            return LyricsOptions(
+                romanization: false,
+                musixmatchLanguage: Locale.current.languageCode ?? ""
+            )
         }
         set (lyricsOptions) {
             defaults.set(try! JSONEncoder().encode(lyricsOptions), forKey: lyricsOptionsKey)

diff --git a/Sources/EeveeSpotify/Models/Headers/SPTEncorePopUpDialog.swift b/Sources/EeveeSpotify/Models/Headers/SPTEncorePopUpDialog.swift
@@ -1,7 +1,8 @@
-import Foundation
+import UIKit
 
 @objc protocol SPTEncorePopUpDialog {
     func `init`() -> SPTEncorePopUpDialog
+    func uiView() -> UIView
     func update(_ popUpModel: SPTEncorePopUpDialogModel)
     func setEventHandler(_ handler: @escaping (_ state: ClickState) -> Void)
 }